opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6957 from yousong/bugfix/yousong-informer

Browse Source 
Bugfix/yousong informer
This commit is contained in:
Zexi Li
2020-06-29 19:36:49 +08:00
committed by GitHub
parent d8a321b717 4fc35f92cb
commit 8ee5f442f8
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/tablespec.go
+2 -2
View File
@@ -63,10 +63,10 @@ func (ts *sTableSpec) newInformerModel(dt interface{}) (*informer.ModelObject, e
return nil, errors.Errorf("informer model is not IModel")
}
if obj.GetVirtualObject() == nil {
return nil, errors.Errorf("object %t %v virtual object is nil", obj, obj)
return nil, errors.Errorf("object %#v virtual object is nil", obj)
}
if obj.GetModelManager() == nil {
return nil, errors.Errorf("object %t %v model manager is nil", obj, obj)
return nil, errors.Errorf("object %#v model manager is nil", obj)
}
jointObj, isJoint := obj.(IJointModel)
if isJoint {
pkg/cloudcommon/db/taskman/tasks.go
+6 -4
View File
@@ -255,7 +255,7 @@ func (manager *STaskManager) NewTask(
defer lockman.ReleaseObject(ctx, obj)
data := fetchTaskParams(ctx, taskName, taskData, parentTaskId, parentTaskNotifyUrl, pendingUsage)
task := STask{
task := &STask{
ObjName: obj.Keyword(),
ObjId: obj.GetId(),
TaskName: taskName,
@@ -263,6 +263,7 @@ func (manager *STaskManager) NewTask(
Params: data,
Stage: TASK_INIT_STAGE,
}
task.SetModelManager(manager, task)
err := manager.TableSpec().Insert(ctx, &task)
if err != nil {
log.Errorf("Task insert error %s", err)
@@ -277,7 +278,7 @@ func (manager *STaskManager) NewTask(
return nil, err
}
}
return &task, nil
return task, nil
}
func (manager *STaskManager) NewParallelTask(
@@ -303,7 +304,7 @@ func (manager *STaskManager) NewParallelTask(
defer lockman.ReleaseClass(ctx, objs[0].GetModelManager(), userCred.GetProjectId())
data := fetchTaskParams(ctx, taskName, taskData, parentTaskId, parentTaskNotifyUrl, pendingUsage)
task := STask{
task := &STask{
ObjName: objs[0].Keyword(),
ObjId: MULTI_OBJECTS_ID,
TaskName: taskName,
@@ -311,6 +312,7 @@ func (manager *STaskManager) NewParallelTask(
Params: data,
Stage: TASK_INIT_STAGE,
}
task.SetModelManager(manager, task)
err := manager.TableSpec().Insert(ctx, &task)
if err != nil {
log.Errorf("Task insert error %s", err)
@@ -333,7 +335,7 @@ func (manager *STaskManager) NewParallelTask(
return nil, err
}
}
return &task, nil
return task, nil
}
func (manager *STaskManager) fetchTask(idStr string) *STask {