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 branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-esxi-support-complete

Browse Source
This commit is contained in:
Qiu Jian
2018-11-25 08:27:09 +08:00
parent 94c49ded2e 5d07de78ac
commit dcbc3daf49
29 changed files with 1053 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/taskman/handler.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
var taskWorkMan *appsrv.SWorkerManager
func init() {
taskWorkMan = appsrv.NewWorkerManager("TaskWorkerManager", 4, 100)
taskWorkMan = appsrv.NewWorkerManager("TaskWorkerManager", 4, 1024)
}
func AddTaskHandler(prefix string, app *appsrv.Application) {
pkg/cloudcommon/db/taskman/localtaskworker.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
var localTaskWorkerMan *appsrv.SWorkerManager
func init() {
localTaskWorkerMan = appsrv.NewWorkerManager("LocalTaskWorkerManager", 4, 10)
localTaskWorkerMan = appsrv.NewWorkerManager("LocalTaskWorkerManager", 4, 1024)
}
func Error2TaskData(err error) jsonutils.JSONObject {
pkg/cloudcommon/db/taskman/tasks.go
+4
View File
@@ -227,6 +227,10 @@ func (manager *STaskManager) NewParallelTask(ctx context.Context, taskName strin
return nil, fmt.Errorf("task %s not found", taskName)
}
if len(objs) == 0 {
return nil, fmt.Errorf("failed to do task %s with zero objs", taskName)
}
log.Debugf("number of objs: %d", len(objs))
lockman.LockClass(ctx, objs[0].GetModelManager(), userCred.GetProjectId())
defer lockman.ReleaseClass(ctx, objs[0].GetModelManager(), userCred.GetProjectId())