github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

to add tests for RC selector overlapping and fix few comments

Browse Source
This commit is contained in:
Salvatore Dario Minonne
2015-08-12 15:33:08 +02:00
parent 4d10def14f
commit 8e4d74988a
3 changed files with 245 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/replication/replication_controller.go
View File

@@ -202,10 +202,10 @@ func (rm *ReplicationManager) getPodController(pod *api.Pod) *api.ReplicationCon
return nil
}
// In theory, overlapping controllers is user error. This sorting will not prevent
// osciallation of replicas in all cases, eg:
// rc1 (older rc): [(k1:v1)], replicas=1 rc2: [(k2:v2), (k1:v1)], replicas=2
// pod: [(k1:v1)] will wake both rc1 and rc2, and we will sync rc1.
// pod: [(k2:v2), (k1:v1)] will wake rc2 which creates a new replica.
// oscillation of replicas in all cases, eg:
// rc1 (older rc): [(k1=v1)], replicas=1 rc2: [(k2=v2)], replicas=2
// pod: [(k1:v1), (k2:v2)] will wake both rc1 and rc2, and we will sync rc1.
// pod: [(k2:v2)] will wake rc2 which creates a new replica.
sort.Sort(overlappingControllers(controllers))
return &controllers[0]
}