From 2850826a52969652592301bbe39c8c8ba1b3234f Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Fri, 13 Dec 2019 13:48:47 -0800 Subject: [PATCH] Improve logging of cluster revalidation --- pkg/instancegroups/instancegroups.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkg/instancegroups/instancegroups.go b/pkg/instancegroups/instancegroups.go index 0de9c23c8a..280e24afeb 100644 --- a/pkg/instancegroups/instancegroups.go +++ b/pkg/instancegroups/instancegroups.go @@ -251,6 +251,12 @@ func (r *RollingUpdateInstanceGroup) validateClusterWithDuration(rollingUpdateDa func (r *RollingUpdateInstanceGroup) tryValidateCluster(rollingUpdateData *RollingUpdateCluster, duration time.Duration, tickDuration time.Duration) bool { result, err := rollingUpdateData.ClusterValidator.Validate() + if err == nil && len(result.Failures) == 0 && rollingUpdateData.ValidateSuccessDuration > 0 { + klog.Infof("Cluster validated; revalidating in %s to make sure it does not flap.", rollingUpdateData.ValidateSuccessDuration) + time.Sleep(rollingUpdateData.ValidateSuccessDuration) + result, err = rollingUpdateData.ClusterValidator.Validate() + } + if err != nil { klog.Infof("Cluster did not validate, will try again in %q until duration %q expires: %v.", tickDuration, duration, err) return false @@ -262,15 +268,8 @@ func (r *RollingUpdateInstanceGroup) tryValidateCluster(rollingUpdateData *Rolli klog.Infof("Cluster did not pass validation, will try again in %q until duration %q expires: %s.", tickDuration, duration, strings.Join(messages, ", ")) return false } else { - klog.Info("Cluster validated, revalidating to make sure it does not flap.") - time.Sleep(rollingUpdateData.ValidateSuccessDuration) - result, err = rollingUpdateData.ClusterValidator.Validate() - if err == nil && len(result.Failures) == 0 { - klog.Info("Cluster validated.") - return true - } - klog.Info("Cluster did not revalidate.") - return false + klog.Info("Cluster validated.") + return true } }