From 0a4ab1a0acbdba3f08efd81660d76908d72f6aba Mon Sep 17 00:00:00 2001
From: SevenEarth <391613297@qq.com>
Date: Thu, 18 Jul 2024 19:41:26 +0800
Subject: [PATCH 1/2] add

---
 ...ce_tc_kubernetes_scale_worker_extension.go | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_scale_worker_extension.go b/tencentcloud/services/tke/resource_tc_kubernetes_scale_worker_extension.go
index d8b67ce367..774a87070e 100644
--- a/tencentcloud/services/tke/resource_tc_kubernetes_scale_worker_extension.go
+++ b/tencentcloud/services/tke/resource_tc_kubernetes_scale_worker_extension.go
@@ -457,15 +457,19 @@ func resourceTencentCloudKubernetesScaleWorkerCreateOnStart(ctx context.Context)
 
 		// check instances status
 		tmpInstanceSet := result.Response.InstanceSet
-		if tmpInstanceSet == nil || len(tmpInstanceSet) == 0 {
+		if tmpInstanceSet == nil {
 			return resource.NonRetryableError(fmt.Errorf("there is no instances in set"))
 		} else {
-			var stop int
+			var (
+				stop int
+				flag bool
+			)
 			for _, v := range instanceIds {
 				for _, instance := range tmpInstanceSet {
 					if v == *instance.InstanceId {
 						if *instance.InstanceState == "running" {
 							stop += 1
+							flag = true
 						} else if *instance.InstanceState == "failed" {
 							stop += 1
 							log.Printf("instance:%s status is failed.", v)
@@ -476,17 +480,20 @@ func resourceTencentCloudKubernetesScaleWorkerCreateOnStart(ctx context.Context)
 				}
 			}
 
-			if stop == len(instanceIds) {
+			if stop == len(instanceIds) && flag {
 				return nil
+			} else if stop == len(instanceIds) && !flag {
+				return resource.NonRetryableError(fmt.Errorf("cluster all instances state is failed"))
+			} else {
+				e = fmt.Errorf("cluster instances is still initializing.")
+				return tccommon.RetryError(e)
 			}
 		}
-
-		e = fmt.Errorf("cluster instances is still initializing.")
-		return tccommon.RetryError(e)
 	})
 
 	if err != nil {
 		log.Printf("[CRITAL] kubernetes scale worker instances status error, reason:%+v", err)
+		return err
 	}
 
 	return nil

From 46b1c9525f7315cdeb36b9f731ce547f103e2c79 Mon Sep 17 00:00:00 2001
From: SevenEarth <391613297@qq.com>
Date: Thu, 18 Jul 2024 19:42:32 +0800
Subject: [PATCH 2/2] add

---
 .changelog/2735.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .changelog/2735.txt

diff --git a/.changelog/2735.txt b/.changelog/2735.txt
new file mode 100644
index 0000000000..0f93ed72d4
--- /dev/null
+++ b/.changelog/2735.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_kubernetes_scale_worker: support retry
+```