Merge pull request #451 from zmberg/1.16.x

fix: etcd存储下save taskgroup偶尔会失败 #436
TencentBlueKing · May 8, 2020 · c2ad4d0 · c2ad4d0
2 parents 18e6b62 + a399034
commit c2ad4d0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/bcs-mesos/bcs-scheduler/src/manager/sched/scheduler/trans_command.go b/bcs-mesos/bcs-scheduler/src/manager/sched/scheduler/trans_command.go
@@ -22,8 +22,16 @@ import (
 )
 
 func (s *Scheduler) RunCommand(command *commtypes.BcsCommandInfo) {
+	if len(command.Status.Taskgroups)==0 {
+		return
+	}
+	//lock command
 	s.store.LockCommand(command.Id)
 	defer s.store.UnLockCommand(command.Id)
+	//lock application
+	runAs, appId := types.GetRunAsAndAppIDbyTaskGroupID(command.Status.Taskgroups[0].TaskgroupId)
+	s.store.LockApplication(runAs + "." + appId)
+	defer s.store.UnLockApplication(runAs + "." + appId)
 
 	blog.Info("begin send command(%s)", command.Id)
 	for _, taskGroup := range command.Status.Taskgroups {

diff --git a/bcs-mesos/bcs-scheduler/src/types/application.go b/bcs-mesos/bcs-scheduler/src/types/application.go
@@ -725,9 +725,15 @@ func (in *TaskGroup) DeepCopyInto(out *TaskGroup) {
 	if in.Attributes != nil {
 		in, out := &in.Attributes, &out.Attributes
 		*out = make([]*mesos.Attribute, len(*in))
-		err := deepcopy.DeepCopy(*out, *in)
-		if err != nil {
-			fmt.Println("DeepCopy TaskGroup.Attributes", "failed", err.Error())
+		for i := range *in {
+			if (*in)[i] != nil {
+				in, out := &(*in)[i], &(*out)[i]
+				*out = new(mesos.Attribute)
+				err := deepcopy.DeepCopy(out, in)
+				if err != nil {
+					fmt.Println("DeepCopy TaskGroup.Attributes", "failed", err.Error())
+				}
+			}
 		}
 	}
 	if in.BcsEventMsg != nil {
@@ -1038,9 +1044,15 @@ func (in *DataClass) DeepCopyInto(out *DataClass) {
 	if in.Msgs != nil {
 		in, out := &in.Msgs, &out.Msgs
 		*out = make([]*BcsMessage, len(*in))
-		err := deepcopy.DeepCopy(*out, *in)
-		if err != nil {
-			fmt.Println("DeepCopy DataClass.Msgs", "failed", err.Error())
+		for i := range *in {
+			if (*in)[i] != nil {
+				in, out := &(*in)[i], &(*out)[i]
+				*out = new(BcsMessage)
+				err := deepcopy.DeepCopy(out, in)
+				if err != nil {
+					fmt.Println("DeepCopy DataClass.BcsMessage", "failed", err.Error())
+				}
+			}
 		}
 	}
 	return