Merge pull request #19348 from gangli113/downgradetest

increase timeout for MemberDowngradeUpgrade test

tests/robustness/failpoint/cluster.go

@@ -261,6 +261,10 @@ func (f memberDowngradeUpgrade) Available(config e2e.EtcdProcessClusterConfig, m
 	return v.Compare(v3_6) >= 0 && (config.Version == e2e.CurrentVersion && member.Config().ExecPath == e2e.BinPath.Etcd)
 }
 
+func (f memberDowngradeUpgrade) Timeout() time.Duration {
+	return 120 * time.Second
+}
+
 func getID(ctx context.Context, cc *clientv3.Client, name string) (id uint64, found bool, err error) {
 	// Ensure linearized MemberList by first making a linearized Get request from the same member.
 	// This is required for v3.4 support as it doesn't support linearized MemberList https://github.com/etcd-io/etcd/issues/18929

tests/robustness/failpoint/failpoint.go

@@ -80,7 +80,11 @@ func Validate(clus *e2e.EtcdProcessCluster, failpoint Failpoint, profile traffic
 }
 
 func Inject(ctx context.Context, t *testing.T, lg *zap.Logger, clus *e2e.EtcdProcessCluster, failpoint Failpoint, baseTime time.Time, ids identity.Provider) (*report.FailpointReport, error) {
-	ctx, cancel := context.WithTimeout(ctx, triggerTimeout)
+	timeout := triggerTimeout
+	if timeoutObj, ok := failpoint.(TimeoutInterface); ok {
+		timeout = timeoutObj.Timeout()
+	}
+	ctx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
 	var err error
 
@@ -147,3 +151,7 @@ type Failpoint interface {
 type AvailabilityChecker interface {
 	Available(e2e.EtcdProcessClusterConfig, e2e.EtcdProcess, traffic.Profile) bool
 }
+
+type TimeoutInterface interface {
+	Timeout() time.Duration
+}