Merge pull request #43865 from kargakis/deflake-recreate-test

Automatic merge from submit-queue (batch tested with PRs 43133, 43865) Log replica sets/pods for recreate test Dumps info for debugging https://github.com/kubernetes/kubernetes/issues/43864

Merge pull request #43865 from kargakis/deflake-recreate-test
e907742d · Kubernetes Submit Queue · GitHub · 232860cd · e1e2d702 · e907742d
Commit e907742d authored Mar 31, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 31, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

util.go test/e2e/framework/util.go +7 -0

No files found.
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -3388,6 +3388,13 @@ func WatchRecreateDeployment(c clientset.Interface, d *extensions.Deployment) er
 		status = d.Status
 		if d.Status.UpdatedReplicas > 0 && d.Status.Replicas != d.Status.UpdatedReplicas {
+			_, allOldRSs, err := deploymentutil.GetOldReplicaSets(d, c)
+			newRS, nerr := deploymentutil.GetNewReplicaSet(d, c)
+			if err == nil && nerr == nil {
+				Logf("%+v", d)
+				logReplicaSetsOfDeployment(d, allOldRSs, newRS)
+				logPodsOfDeployment(c, d, append(allOldRSs, newRS), false)
+			}
 			return false, fmt.Errorf("deployment %q is running new pods alongside old pods: %#v", d.Name, status)
 		}