fix: redis node upgrade optimize (#1218)

* fix: redis node upgrade optimize

* fix: redis service CheckRedisOnlineOk method

* fix: redis - replicas upgrate optimize

* fix: redis - replica add first

* fix: redis - replica update testcase expected

* fix: redis destroy logic

* fix: redis backup - check destroy logic

* fix: TestGetRemoveNodes

Author: Kagashino

tencentcloud/commom_test.go

@@ -112,6 +112,63 @@ func TestGetListIncrement(t *testing.T) {
 
 }
 
+func TestGetListDiffs(t *testing.T) {
+	var (
+		o1           = []int{1, 2, 3, 4, 5}
+		n1           = []int{1, 2, 3, 5, 6}
+		expectAdds1  = []int{6}
+		expectLacks1 = []int{4}
+	)
+
+	adds1, lacks1 := GetListDiffs(o1, n1)
+	assert.Contains(t, expectAdds1, adds1[0])
+	assert.Contains(t, expectLacks1, lacks1[0])
+
+	var (
+		o2           = []int{1, 1, 3, 4, 5}
+		n2           = []int{4, 1, 1, 5, 3}
+		expectAdds2  = make([]int, 0)
+		expectLacks2 = make([]int, 0)
+	)
+
+	adds2, lacks2 := GetListDiffs(o2, n2)
+	assert.Equalf(t, len(expectAdds2), len(adds2), "adds2 should be %v, got %v", expectAdds2, adds2)
+	assert.Equalf(t, len(expectLacks2), len(lacks2), "lacks2 should be %v, got %v", expectLacks2, lacks2)
+
+	// TODO
+	var (
+		o3           = []int{1, 3, 3, 4, 4}
+		n3           = []int{4, 3, 1, 7, 3, 6}
+		expectAdds3  = []int{6, 7}
+		expectLacks3 = []int{4}
+	)
+
+	adds3, lacks3 := GetListDiffs(o3, n3)
+	assert.Contains(t, expectAdds3, adds3[0])
+	assert.Contains(t, expectAdds3, adds3[1])
+	assert.Equalf(t, expectLacks3, lacks3, "lacks3 should be %v, got %v", expectLacks3, lacks3)
+
+	var (
+		o4           = []int{1, 2, 3, 4, 5}
+		n4           = []int{4}
+		expectAdds4  = make([]int, 0)
+		expectLacks4 = []int{1, 2, 3, 5}
+	)
+
+	adds4, lacks4 := GetListDiffs(o4, n4)
+	assert.Equalf(t, len(expectAdds4), len(adds4), "adds4 should be %v, got %v", expectAdds4, adds4)
+	assert.Contains(t, expectLacks4, lacks4[0])
+	assert.Contains(t, expectLacks4, lacks4[1])
+	assert.Contains(t, expectLacks4, lacks4[2])
+	assert.Contains(t, expectLacks4, lacks4[3])
+
+	adds5, lacks5 := GetListDiffs([]int{100003, 100004}, []int{100003, 100003, 100004})
+	assert.Equalf(t, 1, len(adds5), "")
+	assert.Equalf(t, 0, len(lacks5), "")
+	assert.Contains(t, []int{100003, 100003, 100004}, adds5[0])
+
+}
+
 func TestIsExpectError(t *testing.T) {
 
 	err := sdkErrors.NewTencentCloudSDKError("ClientError.NetworkError", "", "")

tencentcloud/common.go

@@ -321,6 +321,31 @@ func GetListIncrement(o []int, n []int) (result []int, err error) {
 	return
 }
 
+func GetListDiffs(o []int, n []int) (adds []int, lacks []int) {
+	fillArr := func(arr []int, v int, count int) []int {
+		for i := 0; i < count; i++ {
+			arr = append(arr, v)
+		}
+		return arr
+	}
+	diffs := map[int]int{}
+	for _, v := range o {
+		diffs[v] -= 1
+	}
+	for _, v := range n {
+		diffs[v] += 1
+	}
+	log.Printf("DIFFS: %v", diffs)
+	for num, count := range diffs {
+		if count < 0 {
+			lacks = fillArr(lacks, num, -count)
+		} else if count > 0 {
+			adds = fillArr(adds, num, count)
+		}
+	}
+	return
+}
+
 //GoRoutine Limit
 type GoRoutineLimit struct {
 	Count int

tencentcloud/resource_tc_redis_backup_config_test.go

@@ -78,17 +78,14 @@ func testAccTencentCloudRedisBackupConfigDestroy(s *terraform.State) error {
 			continue
 		}
 		time.Sleep(5 * time.Second)
-		_, _, info, err := service.CheckRedisOnlineOk(ctx, rs.Primary.ID)
-
-		if info != nil {
-			if *info.Status == REDIS_STATUS_ISOLATE || *info.Status == REDIS_STATUS_TODELETE {
-				return nil
-			}
-		}
+		has, isolated, err := service.CheckRedisDestroyOk(ctx, rs.Primary.ID)
 		if err != nil {
 			return err
 		}
-
+		if !has || isolated {
+			return nil
+		}
+		return fmt.Errorf("instance %s still exists", rs.Primary.ID)
 	}
 	return nil
 }