Merge pull request #19317 from siyuanfoundation/downgrade-robust-1

Remove some HealthInterval to reduce the time to run DowngradeUpgradeMembers

Author: serathius

Diff for: tests/framework/e2e/downgrade.go

@@ -28,7 +28,6 @@ import (
 	"go.uber.org/zap"
 
 	"go.etcd.io/etcd/api/v3/version"
-	"go.etcd.io/etcd/server/v3/etcdserver"
 	"go.etcd.io/etcd/tests/v3/framework/testutils"
 )
 
@@ -78,9 +77,6 @@ func DowngradeUpgradeMembers(t *testing.T, lg *zap.Logger, clus *EtcdProcessClus
 	membersToChange := rand.Perm(len(clus.Procs))[:numberOfMembersToChange]
 	lg.Info(fmt.Sprintf("Test %s members", opString), zap.Any("members", membersToChange))
 
-	// Need to wait health interval for cluster to prepare for downgrade/upgrade
-	time.Sleep(etcdserver.HealthInterval)
-
 	for _, memberID := range membersToChange {
 		member := clus.Procs[memberID]
 		if member.Config().ExecPath == newExecPath {

Diff for: tests/robustness/failpoint/cluster.go

@@ -226,8 +226,6 @@ func (f memberDowngradeUpgrade) Inject(ctx context.Context, t *testing.T, lg *za
 	}
 	defer cc.Close()
 
-	// Need to wait health interval for cluster to accept changes
-	time.Sleep(etcdserver.HealthInterval)
 	e2e.DowngradeEnable(t, clus, lastVersion)
 	// downgrade all members first
 	err = e2e.DowngradeUpgradeMembers(t, lg, clus, len(clus.Procs), currentVersion, lastVersion)