fix: support window switch (#2429)

* fix: support window seitch

* support wait switch

* feat: add 2429 changelog

* fix: modify switch

Author: gitmkn

.changelog/2429.txt

@@ -0,0 +1,11 @@
+```release-note:enhancement
+tencentcloud_mysql_instance: Support upgrade switching during window period
+```
+
+```release-note:enhancement
+tencentcloud_redis_instance: Support upgrade switching during window period
+```
+
+```release-note:enhancement
+tencentcloud_mysql_readonly_instance: Fix read-only instance `slave_deploy_mode` problem
+```

tencentcloud/services/cdb/resource_tc_mysql_instance.go

@@ -22,6 +22,8 @@ import (
 
 var importMysqlFlag = false
 
+const InWindow = 1
+
 func TencentMsyqlBasicInfo() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"instance_name": {
@@ -166,6 +168,11 @@ func TencentMsyqlBasicInfo() map[string]*schema.Schema {
 			Default:     false,
 			Description: "Indicate whether to delete instance directly or not. Default is `false`. If set true, the instance will be deleted instead of staying recycle bin. Note: only works for `PREPAID` instance. When the main mysql instance set true, this para of the readonly mysql instance will not take effect.",
 		},
+		"wait_switch": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Switch the method of accessing new instances, default is `0`. Supported values include: `0` - switch immediately, `1` - switch in time window.",
+		},
 		// Computed values
 		"intranet_ip": {
 			Type:        schema.TypeString,
@@ -1149,6 +1156,7 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 		engineVersion := ""
 		var upgradeSubversion int64
 		var maxDelayTime int64
+		var waitSwitch int64 = 0
 		if v, ok := d.GetOk("engine_version"); ok {
 			engineVersion = v.(string)
 		}
@@ -1158,37 +1166,65 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 		if v, ok := d.GetOk("max_deay_time"); ok {
 			maxDelayTime = int64(v.(int))
 		}
+		if v, ok := d.GetOkExists("wait_switch"); ok {
+			waitSwitch = int64(v.(int))
+		}
 
-		asyncRequestId, err := mysqlService.UpgradeDBInstanceEngineVersion(ctx, d.Id(), engineVersion, upgradeSubversion, maxDelayTime)
+		asyncRequestId, err := mysqlService.UpgradeDBInstanceEngineVersion(ctx, d.Id(), engineVersion, upgradeSubversion, maxDelayTime, waitSwitch)
 		if err != nil {
 			return err
 		}
 
-		err = resource.Retry(6*time.Hour, func() *resource.RetryError {
-			taskStatus, message, err := mysqlService.DescribeAsyncRequestInfo(ctx, asyncRequestId)
+		if waitSwitch != InWindow {
+			err = resource.Retry(6*time.Hour, func() *resource.RetryError {
+				taskStatus, message, err := mysqlService.DescribeAsyncRequestInfo(ctx, asyncRequestId)
 
-			if err != nil {
-				if _, ok := err.(*errors.TencentCloudSDKError); !ok {
-					return resource.RetryableError(err)
-				} else {
-					return resource.NonRetryableError(err)
+				if err != nil {
+					if _, ok := err.(*errors.TencentCloudSDKError); !ok {
+						return resource.RetryableError(err)
+					} else {
+						return resource.NonRetryableError(err)
+					}
 				}
-			}
 
-			if taskStatus == MYSQL_TASK_STATUS_SUCCESS {
-				return nil
+				if taskStatus == MYSQL_TASK_STATUS_SUCCESS {
+					return nil
+				}
+				if taskStatus == MYSQL_TASK_STATUS_INITIAL || taskStatus == MYSQL_TASK_STATUS_RUNNING {
+					return resource.RetryableError(fmt.Errorf("update mysql engineVersion status is %s", taskStatus))
+				}
+				err = fmt.Errorf("update mysql engineVersion task status is %s,we won't wait for it finish ,it show message:%s",
+					",", message)
+				return resource.NonRetryableError(err)
+			})
+
+			if err != nil {
+				log.Printf("[CRITAL]%s update mysql engineVersion fail, reason:%s\n ", logId, err.Error())
+				return err
 			}
-			if taskStatus == MYSQL_TASK_STATUS_INITIAL || taskStatus == MYSQL_TASK_STATUS_RUNNING {
-				return resource.RetryableError(fmt.Errorf("update mysql engineVersion status is %s", taskStatus))
+		} else {
+			err = resource.Retry(6*time.Hour, func() *resource.RetryError {
+				mysqlInfo, err := mysqlService.DescribeDBInstanceById(ctx, d.Id())
+
+				if err != nil {
+					if _, ok := err.(*errors.TencentCloudSDKError); !ok {
+						return resource.RetryableError(err)
+					} else {
+						return resource.NonRetryableError(err)
+					}
+				}
+
+				if *mysqlInfo.TaskStatus == 15 {
+					return nil
+				}
+				return resource.RetryableError(fmt.Errorf("update mysql engineVersion task status is %v", mysqlInfo.TaskStatus))
+			})
+
+			if err != nil {
+				log.Printf("[CRITAL]%s update mysql engineVersion fail, reason:%s\n ", logId, err.Error())
+				return err
 			}
-			err = fmt.Errorf("update mysql engineVersion task status is %s,we won't wait for it finish ,it show message:%s",
-				",", message)
-			return resource.NonRetryableError(err)
-		})
 
-		if err != nil {
-			log.Printf("[CRITAL]%s update mysql engineVersion fail, reason:%s\n ", logId, err.Error())
-			return err
 		}
 	}
 

tencentcloud/services/cdb/resource_tc_mysql_readonly_instance.go

@@ -35,6 +35,13 @@ func ResourceTencentCloudMysqlReadonlyInstance() *schema.Resource {
 			Optional:    true,
 			Description: "The zone information of the primary instance is required when you purchase a disaster recovery instance.",
 		},
+		"slave_deploy_mode": {
+			Type:         schema.TypeInt,
+			Optional:     true,
+			ValidateFunc: tccommon.ValidateAllowedIntValue([]int{0, 1}),
+			Default:      0,
+			Description:  "Availability zone deployment method. Available values: 0 - Single availability zone; 1 - Multiple availability zones.",
+		},
 	}
 
 	basic := TencentMsyqlBasicInfo()

tencentcloud/services/cdb/service_tencentcloud_mysql.go

@@ -411,16 +411,15 @@ func (me *MysqlService) ModifyAccountMaxUserConnections(ctx context.Context, mys
 	return
 }
 
-func (me *MysqlService) UpgradeDBInstanceEngineVersion(ctx context.Context, mysqlId, engineVersion string, upgradeSubversion, maxDelayTime int64) (asyncRequestId string, errRet error) {
+func (me *MysqlService) UpgradeDBInstanceEngineVersion(ctx context.Context, mysqlId, engineVersion string, upgradeSubversion, maxDelayTime, waitSwitch int64) (asyncRequestId string, errRet error) {
 
 	logId := tccommon.GetLogId(ctx)
 
 	request := cdb.NewUpgradeDBInstanceEngineVersionRequest()
 
-	var waitSwitch int64 = 0 // 0- switch immediately, 1- time window switch
-
 	request.InstanceId = &mysqlId
 	request.EngineVersion = &engineVersion
+	// 0- switch immediately, 1- time window switch
 	request.WaitSwitch = &waitSwitch
 	request.UpgradeSubversion = &upgradeSubversion
 	request.MaxDelayTime = &maxDelayTime

tencentcloud/services/crs/resource_tc_redis_instance.go

@@ -7,6 +7,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"time"
 
 	tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
 	svctag "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tag"
@@ -182,6 +183,12 @@ func ResourceTencentCloudRedisInstance() *schema.Resource {
 				Description: "IP address of an instance. When the `operation_network` is `changeVip`, this parameter needs to be configured.",
 			},
 
+			"wait_switch": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Description: "Switching mode: `1`-maintenance time window switching, `2`-immediate switching, default value `2`.",
+			},
+
 			"tags": {
 				Type:     schema.TypeMap,
 				Optional: true,
@@ -500,37 +507,45 @@ func resourceTencentCloudRedisInstanceRead(d *schema.ResourceData, meta interfac
 		info *redis.InstanceSet
 		e    error
 	)
-	err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
-		has, _, info, e = service.CheckRedisOnlineOk(ctx, d.Id(), tccommon.ReadRetryTimeout*20)
-		if info != nil {
-			if *info.Status == REDIS_STATUS_ISOLATE || *info.Status == REDIS_STATUS_TODELETE {
+
+	if v, ok := d.GetOkExists("wait_switch"); ok && v.(int) == 1 {
+		info, e = service.DescribeRedisInstanceById(ctx, d.Id())
+		if e != nil {
+			return e
+		}
+	} else {
+		err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
+			has, _, info, e = service.CheckRedisOnlineOk(ctx, d.Id(), tccommon.ReadRetryTimeout*20)
+			if info != nil {
+				if *info.Status == REDIS_STATUS_ISOLATE || *info.Status == REDIS_STATUS_TODELETE {
+					d.SetId("")
+					onlineHas = false
+					return nil
+				}
+			}
+			if e != nil {
+				return resource.NonRetryableError(e)
+			}
+			if !has {
 				d.SetId("")
 				onlineHas = false
 				return nil
 			}
+			return nil
+		})
+		if err != nil {
+			//internal version: replace redisFail begin, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
+			return fmt.Errorf("Fail to get info from redis, reaseon %s", err.Error())
+			//internal version: replace redisFail end, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
 		}
-		if e != nil {
-			return resource.NonRetryableError(e)
-		}
-		if !has {
-			d.SetId("")
-			onlineHas = false
+		if !onlineHas {
 			return nil
 		}
-		return nil
-	})
-	if err != nil {
-		//internal version: replace redisFail begin, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
-		return fmt.Errorf("Fail to get info from redis, reaseon %s", err.Error())
-		//internal version: replace redisFail end, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
-	}
-	if !onlineHas {
-		return nil
 	}
 
 	statusName := REDIS_STATUS[*info.Status]
 	if statusName == "" {
-		err = fmt.Errorf("redis read unkwnow status %d", *info.Status)
+		err := fmt.Errorf("redis read unkwnow status %d", *info.Status)
 		log.Printf("[CRITAL]%s redis read status name error, reason:%s\n", logId, err.Error())
 		return err
 	}
@@ -829,7 +844,13 @@ func resourceTencentCloudRedisInstanceUpdate(d *schema.ResourceData, meta interf
 		typeId := d.Get("type_id").(int)
 		request.InstanceId = &id
 		request.TargetInstanceType = helper.String(strconv.Itoa(typeId))
-		request.SwitchOption = helper.IntInt64(2)
+		waitSwitch := 2
+		if v, ok := d.GetOkExists("wait_switch"); ok {
+			waitSwitch = v.(int)
+		}
+
+		request.SwitchOption = helper.IntInt64(waitSwitch)
+		startTime := time.Now().Format("2006-01-02 15:04:05")
 		err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
 			result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseRedisClient().UpgradeInstanceVersion(request)
 			if e != nil {
@@ -845,11 +866,45 @@ func resourceTencentCloudRedisInstanceUpdate(d *schema.ResourceData, meta interf
 		}
 
 		service := RedisService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
-		_, _, _, err = service.CheckRedisOnlineOk(ctx, id, 20*tccommon.ReadRetryTimeout)
-		if err != nil {
-			log.Printf("[CRITAL]%s redis upgradeVersionOperation fail, reason:%s\n", logId, err.Error())
-			return err
+		if waitSwitch == 2 {
+			_, _, _, err = service.CheckRedisOnlineOk(ctx, id, 20*tccommon.ReadRetryTimeout)
+			if err != nil {
+				log.Printf("[CRITAL]%s redis upgradeVersionOperation fail, reason:%s\n", logId, err.Error())
+				return err
+			}
+		} else {
+			time.Sleep(10 * time.Second)
+			paramMap := make(map[string]interface{})
+			paramMap["InstanceId"] = &id
+			paramMap["BeginTime"] = &startTime
+			paramMap["TaskTypes"] = helper.StringsStringsPoint([]string{"043"})
+			err := resource.Retry(5*tccommon.WriteRetryTimeout, func() *resource.RetryError {
+				result, e := service.DescribeRedisInstanceTaskListByFilter(ctx, paramMap)
+				if e != nil {
+					return tccommon.RetryError(e)
+				}
+				if result == nil || len(result) < 1 {
+					return resource.RetryableError(fmt.Errorf("redis upgradeVersion fail, result is nil"))
+				}
+				for _, v := range result {
+					if *v.Result == 0 || *v.Result == 1 {
+						return resource.RetryableError(fmt.Errorf("redis upgradeVersion state is %v, retry...", *v.Result))
+					}
+					if *v.Result == 4 {
+						return resource.NonRetryableError(fmt.Errorf("redis upgradeVersion fail, task status is %v", *v.Result))
+					}
+					if *v.Result == 2 {
+						return nil
+					}
+				}
+				return resource.RetryableError(fmt.Errorf("redis upgradeVersion fail, retry..."))
+			})
+			if err != nil {
+				log.Printf("[CRITAL]%s redis upgradeVersion failed, reason:%+v", logId, err)
+				return err
+			}
 		}
+
 	}
 
 	if d.HasChange("vpc_id") || d.HasChange("subnet_id") || d.HasChange("port") || d.HasChange("recycle") || d.HasChange("ip") {

website/docs/r/mysql_instance.html.markdown

@@ -166,6 +166,7 @@ The following arguments are supported:
 * `tags` - (Optional, Map) Instance tags.
 * `upgrade_subversion` - (Optional, Int) Whether it is a kernel subversion upgrade, supported values: 1 - upgrade the kernel subversion; 0 - upgrade the database engine version. Only need to fill in when upgrading kernel subversion and engine version.
 * `vpc_id` - (Optional, String) ID of VPC, which can be modified once every 24 hours and can't be removed.
+* `wait_switch` - (Optional, Int) Switch the method of accessing new instances, default is `0`. Supported values include: `0` - switch immediately, `1` - switch in time window.
 
 ## Attributes Reference
 

website/docs/r/mysql_readonly_instance.html.markdown

@@ -102,9 +102,11 @@ The following arguments are supported:
 * `period` - (Optional, Int, **Deprecated**) It has been deprecated from version 1.36.0. Please use `prepaid_period` instead. Period of instance. NOTES: Only supported prepaid instance.
 * `prepaid_period` - (Optional, Int) Period of instance. NOTES: Only supported prepaid instance.
 * `security_groups` - (Optional, Set: [`String`]) Security groups to use.
+* `slave_deploy_mode` - (Optional, Int) Availability zone deployment method. Available values: 0 - Single availability zone; 1 - Multiple availability zones.
 * `subnet_id` - (Optional, String) Private network ID. If `vpc_id` is set, this value is required.
 * `tags` - (Optional, Map) Instance tags.
 * `vpc_id` - (Optional, String) ID of VPC, which can be modified once every 24 hours and can't be removed.
+* `wait_switch` - (Optional, Int) Switch the method of accessing new instances, default is `0`. Supported values include: `0` - switch immediately, `1` - switch in time window.
 * `zone` - (Optional, String) Zone information, this parameter defaults to, the system automatically selects an Availability Zone.
 
 ## Attributes Reference

website/docs/r/redis_instance.html.markdown

@@ -263,6 +263,7 @@ The following arguments are supported:
 * `type_id` - (Optional, Int) Instance type. Available values reference data source `tencentcloud_redis_zone_config` or [document](https://intl.cloud.tencent.com/document/product/239/32069), toggle immediately when modified.
 * `type` - (Optional, String, ForceNew, **Deprecated**) It has been deprecated from version 1.33.1. Please use 'type_id' instead. Instance type. Available values: `cluster_ckv`,`cluster_redis5.0`,`cluster_redis`,`master_slave_ckv`,`master_slave_redis4.0`,`master_slave_redis5.0`,`master_slave_redis`,`standalone_redis`, specific region support specific types, need to refer data `tencentcloud_redis_zone_config`.
 * `vpc_id` - (Optional, String) ID of the vpc with which the instance is to be associated. When the `operation_network` is `changeVpc` or `changeBaseToVpc`, this parameter needs to be configured.
+* `wait_switch` - (Optional, Int) Switching mode: `1`-maintenance time window switching, `2`-immediate switching, default value `2`.
 
 ## Attributes Reference