github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

RC already being deleted shouldn't fail DeleteRC

Browse Source
This commit is contained in:
Clayton Coleman 2015-08-19 13:55:10 -04:00
parent 611530889f
commit dcdbc646ed
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/e2e/util.go
View File

@ -1453,16 +1453,32 @@ func waitForPodsWithLabel(c *client.Client, ns string, label labels.Selector) (p
// Delete a Replication Controller and all pods it spawned // Delete a Replication Controller and all pods it spawned
func DeleteRC(c *client.Client, ns, name string) error { func DeleteRC(c *client.Client, ns, name string) error {
By(fmt.Sprintf("%v Deleting replication controller %s in namespace %s", time.Now(), name, ns)) By(fmt.Sprintf("%v Deleting replication controller %s in namespace %s", time.Now(), name, ns))
rc, err := c.ReplicationControllers(ns).Get(name)
if err != nil {
if apierrs.IsNotFound(err) {
Logf("RC %s was already deleted: %v", name, err)
return nil
}
return err
}
reaper, err := kubectl.ReaperForReplicationController(c, 10*time.Minute) reaper, err := kubectl.ReaperForReplicationController(c, 10*time.Minute)
if err != nil { if err != nil {
if apierrs.IsNotFound(err) {
Logf("RC %s was already deleted: %v", name, err)
return nil
}
return err return err
} }
startTime := time.Now() startTime := time.Now()
_, err = reaper.Stop(ns, name, 0, api.NewDeleteOptions(0)) _, err = reaper.Stop(ns, name, 0, api.NewDeleteOptions(0))
if apierrs.IsNotFound(err) {
Logf("RC %s was already deleted: %v", name, err)
return nil
}
deleteRCTime := time.Now().Sub(startTime) deleteRCTime := time.Now().Sub(startTime)
Logf("Deleting RC took: %v", deleteRCTime) Logf("Deleting RC took: %v", deleteRCTime)
if err == nil { if err == nil {
err = waitForRCPodsGone(c, ns, name) err = waitForRCPodsGone(c, rc)
} }
terminatePodTime := time.Now().Sub(startTime) - deleteRCTime terminatePodTime := time.Now().Sub(startTime) - deleteRCTime
Logf("Terminating RC pods took: %v", terminatePodTime) Logf("Terminating RC pods took: %v", terminatePodTime)
@ -1471,13 +1487,9 @@ func DeleteRC(c *client.Client, ns, name string) error {
// waitForRCPodsGone waits until there are no pods reported under an RC's selector (because the pods // waitForRCPodsGone waits until there are no pods reported under an RC's selector (because the pods
// have completed termination). // have completed termination).
func waitForRCPodsGone(c *client.Client, ns, name string) error { func waitForRCPodsGone(c *client.Client, rc *api.ReplicationController) error {
rc, err := c.ReplicationControllers(ns).Get(name)
if err != nil {
return err
}
return wait.Poll(poll, singleCallTimeout, func() (bool, error) { return wait.Poll(poll, singleCallTimeout, func() (bool, error) {
if pods, err := c.Pods(ns).List(labels.SelectorFromSet(rc.Spec.Selector), fields.Everything()); err == nil && len(pods.Items) == 0 { if pods, err := c.Pods(rc.Namespace).List(labels.SelectorFromSet(rc.Spec.Selector), fields.Everything()); err == nil && len(pods.Items) == 0 {
return true, nil return true, nil
} }
return false, nil return false, nil