test(e2e): retry twice and enable PDReadyAPI (#6496)

Author: liubog2008

cmd/testing-workload/pd_region.go

@@ -38,7 +38,7 @@ const (
 	defaultGRPCKeepAliveTimeout = 3 * time.Second
 	defaultPDServerTimeout      = 3 * time.Second
 
-	defaultLeaderTransferTime = 200 * time.Millisecond
+	defaultLeaderTransferTime = 100 * time.Millisecond
 )
 
 func NewPDClient(pdAddrs []string) (pd.Client, error) {
@@ -129,9 +129,9 @@ func PDRegionAccess(ctx context.Context) error {
 func accessPDAPI(ctx context.Context, client pd.Client) error {
 	// retry once
 	var lastErr error
-	for range 2 {
+	for range 3 {
 		if lastErr != nil {
-			fmt.Println("retry because of ", lastErr)
+			fmt.Printf("[%s] retry because of %v\n", time.Now().String(), lastErr)
 		}
 
 		_, _, err1 := client.GetTS(ctx)
@@ -146,13 +146,13 @@ func accessPDAPI(ctx context.Context, client pd.Client) error {
 		}
 
 		if err1 != nil {
-			lastErr = err1
+			lastErr = fmt.Errorf("get ts failed: %w", err1)
 			if !strings.Contains(err1.Error(), "not leader") {
 				break
 			}
 		}
 		if err2 != nil {
-			lastErr = err2
+			lastErr = fmt.Errorf("scan region failed: %w", err2)
 			// only retry for not leader err
 			if !strings.Contains(err2.Error(), "not leader") {
 				break

tests/e2e/suite/availability/pd.go

@@ -44,9 +44,9 @@ var _ = ginkgo.Describe("PD Availability Test", label.PD, label.KindAvail, label
 		})
 	})
 
-	ginkgo.Context("NextGen PDMS", label.KindNextGen, label.P0, label.Features(metav1alpha1.UseTSOReadyAPI), func() {
+	ginkgo.Context("NextGen PDMS", label.KindNextGen, label.P0, label.Features(metav1alpha1.UseTSOReadyAPI, metav1alpha1.UsePDReadyAPI), func() {
 		workload := f.SetupWorkload()
-		f.SetupCluster(data.WithFeatureGates(metav1alpha1.UseTSOReadyAPI))
+		f.SetupCluster(data.WithFeatureGates(metav1alpha1.UseTSOReadyAPI, metav1alpha1.UsePDReadyAPI))
 		// TODO: wait until the pr is merged
 		ginkgo.It("No error when rolling update pd in next-gen", label.KindNextGen, func(ctx context.Context) {
 			f.MustCreateS3(ctx)