fix: kube-apiserver存储失败后，version latest报错 TencentBlueKing#525

zmberg · Jul 11, 2020 · 4e6bf3a · 4e6bf3a
1 parent c7ab2c5
commit 4e6bf3a
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/bcs-mesos/bcs-scheduler/src/manager/store/etcd/store.go b/bcs-mesos/bcs-scheduler/src/manager/store/etcd/store.go
@@ -40,6 +40,10 @@ const (
 	DefaultNamespace = "bkbcs"
 )
 
+const (
+	ObjectVersionNotLatestError = "please apply your changes to the latest version and try again"
+)
+
 //bcs mesos custom resources list
 const (
 	CrdAdmissionWebhookConfiguration = "AdmissionWebhookConfiguration"
@@ -390,3 +394,7 @@ func (store *managerStore) filterSpecialLabels(oriLabels map[string]string) map[
 	}
 	return labels
 }
+
+func (store *managerStore) ObjectNotLatestErr(err error)bool{
+	return strings.Contains(err.Error(), ObjectVersionNotLatestError)
+}
diff --git a/bcs-mesos/bcs-scheduler/src/manager/store/etcd/task.go b/bcs-mesos/bcs-scheduler/src/manager/store/etcd/task.go
@@ -14,6 +14,7 @@
 package etcd
 
 import (
+	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
 	mstore "github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/manager/store"
 	"github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/types"
 	"github.com/Tencent/bk-bcs/bcs-mesos/pkg/apis/bkbcs/v2"
@@ -57,6 +58,9 @@ func (store *managerStore) SaveTask(task *types.Task) error {
 		v2Task, err = client.Create(v2Task)
 	}
 	if err != nil {
+		if store.ObjectNotLatestErr(err) {
+			store.syncTaskInCache(task.ID)
+		}
 		return err
 	}
 
@@ -65,6 +69,16 @@ func (store *managerStore) SaveTask(task *types.Task) error {
 	return nil
 }
 
+func (store *managerStore) syncTaskInCache(taskId string){
+	task,err := store.FetchDBTask(taskId)
+	if err!=nil {
+		blog.Errorf("fetch task(%s) in kube-apiserver failed: %s", taskId, err.Error())
+		return
+	}
+
+	saveCacheTask(task)
+}
+
 /*func (store *managerStore) ListTasks(runAs, appID string) ([]*types.Task, error) {
 	client := store.BkbcsClient.Tasks(runAs)
 	v2Tasks, err := client.List(metav1.ListOptions{})

diff --git a/bcs-mesos/bcs-scheduler/src/manager/store/etcd/taskgroup.go b/bcs-mesos/bcs-scheduler/src/manager/store/etcd/taskgroup.go
@@ -62,6 +62,9 @@ func (store *managerStore) SaveTaskGroup(taskGroup *types.TaskGroup) error {
 		v2Taskgroup, err = client.Create(v2Taskgroup)
 	}
 	if err != nil {
+		if store.ObjectNotLatestErr(err) {
+			store.syncTaskgroupInCache(taskGroup.ID)
+		}
 		return err
 	}
 
@@ -83,6 +86,16 @@ func (store *managerStore) SaveTaskGroup(taskGroup *types.TaskGroup) error {
 	return nil
 }
 
+func (store *managerStore) syncTaskgroupInCache(taskgroupId string){
+	taskgroup,err := store.FetchDBTaskGroup(taskgroupId)
+	if err!=nil {
+		blog.Errorf("fetch taskgroup(%s) in kube-apiserver failed: %s", taskgroupId, err.Error())
+		return
+	}
+
+	saveCacheTaskGroup(taskgroup)
+}
+
 //list mesos cluster taskgroups, include: application、deployment、daemonset...
 func (store *managerStore) ListClusterTaskgroups() ([]*types.TaskGroup, error) {
 	return listCacheTaskgroups()