Merge pull request #43 from Tencent/dev_berg

bug: 修复某些场景下取消滚动升级超时的问题; issue #42
TencentBlueKing · Jun 4, 2019 · a3491e0 · a3491e0
2 parents 255a616 + e758d8b
commit a3491e0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/bcs-mesos/bcs-scheduler/src/manager/sched/backend/deployment.go b/bcs-mesos/bcs-scheduler/src/manager/sched/backend/deployment.go
@@ -486,7 +486,7 @@ func (b *backend) CancelUpdateDeployment(ns string, name string) error {
 	for {
 		if deployment.IsInRolling && deployment.CurrRollingOp == types.DEPLOYMENT_OPERATION_DELETE {
 			times++
-			if times > 15 {
+			if times > 8 {
 				blog.Error("request cancelupdate deployment(%s.%s): in deleting taskgroups", ns, name)
 				return errors.New("deployment is deleting taskgroups, cannot cancelupdate now, try later")
 			}