From 1a0f7f83ef5fd66286236f0e0d313841d810bd48 Mon Sep 17 00:00:00 2001
From: ioito <qu_xuan@icloud.com>
Date: Mon, 9 Sep 2019 11:17:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=81=BF=E5=85=8D=E8=A7=A3=E7=BB=91EIP?=
 =?UTF-8?q?=E5=90=8E=E9=87=8A=E6=94=BEEIP=E4=BB=BB=E5=8A=A1=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/multicloud/qcloud/qcloud.go | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkg/multicloud/qcloud/qcloud.go b/pkg/multicloud/qcloud/qcloud.go
index d2f4ab19bd..841981bbc0 100644
--- a/pkg/multicloud/qcloud/qcloud.go
+++ b/pkg/multicloud/qcloud/qcloud.go
@@ -343,10 +343,16 @@ func _baseJsonRequest(client *common.Client, req tchttp.Request, resp qcloudResp
 			break
 		}
 		needRetry := false
-		for _, msg := range []string{"EOF", "TLS handshake timeout", "Code=InternalError", "try later", "Code=MutexOperation.TaskRunning", "Code=InvalidInstance.NotSupported", "i/o timeout"} {
-			// Code=InvalidInstance.NotSupported, Message=The request does not support the instances `ins-bg54517v` which are in operation or in a special state., RequestId=79d02048-a8c9-4b59-b442-3c6f01fb728e
-			// Code=DesOperation.MutexTaskRunning, Message=Mutex task is running, please try later, RequestId=4529e365-b466-4239-ab56-ad36da70d982
-			// 重装系统后立即关机有可能会引发 Code=InvalidInstance.NotSupported 错误, 重试可以避免任务失败
+		for _, msg := range []string{
+			"EOF",
+			"TLS handshake timeout",
+			"Code=InternalError",
+			"try later",
+			"Code=MutexOperation.TaskRunning",   // Code=DesOperation.MutexTaskRunning, Message=Mutex task is running, please try later
+			"Code=InvalidInstance.NotSupported", // Code=InvalidInstance.NotSupported, Message=The request does not support the instances `ins-bg54517v` which are in operation or in a special state., 重装系统后立即关机有可能会引发 Code=InvalidInstance.NotSupported 错误, 重试可以避免任务失败
+			"i/o timeout",
+			"Code=InvalidAddressId.StatusNotPermit", // Code=InvalidAddressId.StatusNotPermit, Message=The status `"UNBINDING"` for AddressId `"eip-m3kix9kx"` is not permit to do this operation., EIP删除需要重试
+		} {
 			if strings.Contains(err.Error(), msg) {
 				needRetry = true
 				break