From 13ddb0f8a19b77d197a7cd31245d6aca86dfd2dd Mon Sep 17 00:00:00 2001
From: dangyifei <dangyifei@baidu.com>
Date: Mon, 2 Dec 2019 19:30:59 +0800
Subject: [PATCH] only not succ inst recieve response

---
 cube/cube-transfer/src/transfer/deployer.go | 65 +++++++++++----------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/cube/cube-transfer/src/transfer/deployer.go b/cube/cube-transfer/src/transfer/deployer.go
index e054f1fb..2c677de1 100755
--- a/cube/cube-transfer/src/transfer/deployer.go
+++ b/cube/cube-transfer/src/transfer/deployer.go
@@ -81,16 +81,17 @@ func CmdInstsDownload() {
 			}
 		}
 		for i, inst := range Dict.Instances {
-			err := <-chs[i]
-			logex.Noticef("[instance resp]download:%v", Dict.Instances)
-			if err != nil || keyAndRespSlice[i].Success != "0" {
-				logex.Warningf("cmd cube online downlaod of %v:%v, shard:%v failed", inst.AgentIp, inst.AgentPort, inst.Shard)
-				continue
-			}
-			if inst.Status < dict.Instance_Status_Download_Succ {
-				Dict.Instances[i].Status = dict.Instance_Status_Download_Succ
-				Dict.Instances[i].DownloadedTime = int(time.Now().Unix())
-				Dict.DownloadSuccInsts++
+			if inst.Status != dict.Instance_Status_Download_Succ {
+				err := <-chs[i]
+				if err != nil || keyAndRespSlice[i].Success != "0" {
+					logex.Warningf("cmd cube online downlaod of %v:%v, shard:%v failed", inst.AgentIp, inst.AgentPort, inst.Shard)
+					continue
+				}
+				if inst.Status < dict.Instance_Status_Download_Succ {
+					Dict.Instances[i].Status = dict.Instance_Status_Download_Succ
+					Dict.Instances[i].DownloadedTime = int(time.Now().Unix())
+					Dict.DownloadSuccInsts++
+				}
 			}
 		}
 		if Dict.DownloadSuccInsts == Dict.InstancesNum {
@@ -130,16 +131,18 @@ func CmdInstsReload() {
 			}
 		}
 		for i, inst := range Dict.Instances {
-			err := <-chs[i]
-			logex.Noticef("[instance resp]reload:%v", Dict.Instances)
-			if err != nil || keyAndRespSlice[i].Success != "0" {
-				logex.Warningf("cmd cube online reload of %v:%v, shard:%v failed", inst.AgentIp, inst.AgentPort, inst.Shard)
-				continue
-			}
-			if inst.Status < dict.Instance_Status_Reload_Succ {
-				Dict.Instances[i].Status = dict.Instance_Status_Reload_Succ
-				Dict.Instances[i].ReloadedTime = int(time.Now().Unix())
-				Dict.ReloadSuccInsts++
+			if inst.Status != dict.Instance_Status_Reload_Succ {
+				err := <-chs[i]
+				logex.Noticef("[instance resp]reload:%v", Dict.Instances)
+				if err != nil || keyAndRespSlice[i].Success != "0" {
+					logex.Warningf("cmd cube online reload of %v:%v, shard:%v failed", inst.AgentIp, inst.AgentPort, inst.Shard)
+					continue
+				}
+				if inst.Status < dict.Instance_Status_Reload_Succ {
+					Dict.Instances[i].Status = dict.Instance_Status_Reload_Succ
+					Dict.Instances[i].ReloadedTime = int(time.Now().Unix())
+					Dict.ReloadSuccInsts++
+				}
 			}
 		}
 		if Dict.ReloadSuccInsts == Dict.InstancesNum {
@@ -179,16 +182,18 @@ func CmdInstsEnable() {
 			}
 		}
 		for i, inst := range Dict.Instances {
-			err := <-chs[i]
-			logex.Noticef("[instance resp]enable:%v", Dict.Instances)
-			if err != nil || keyAndRespSlice[i].Success != "0" {
-				logex.Warningf("cmd cube online enable of %v:%v, shard:%v failed", inst.AgentIp, inst.AgentPort, inst.Shard)
-				continue
-			}
-			if inst.Status < dict.Instance_Status_Enable_Succ {
-				Dict.Instances[i].Status = dict.Instance_Status_Enable_Succ
-				Dict.Instances[i].EnabledTime = int(time.Now().Unix())
-				Dict.EnableSuccInsts++
+			if inst.Status != dict.Instance_Status_Enable_Succ {
+				err := <-chs[i]
+				logex.Noticef("[instance resp]enable:%v", Dict.Instances)
+				if err != nil || keyAndRespSlice[i].Success != "0" {
+					logex.Warningf("cmd cube online enable of %v:%v, shard:%v failed", inst.AgentIp, inst.AgentPort, inst.Shard)
+					continue
+				}
+				if inst.Status < dict.Instance_Status_Enable_Succ {
+					Dict.Instances[i].Status = dict.Instance_Status_Enable_Succ
+					Dict.Instances[i].EnabledTime = int(time.Now().Unix())
+					Dict.EnableSuccInsts++
+				}
 			}
 		}
 		if Dict.EnableSuccInsts == Dict.InstancesNum {
-- 
GitLab