lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-07-01 01:36:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190313-2.7.0

Browse Source 
Conflicts:
	pkg/cloudcommon/db/taskman/tasks.go
This commit is contained in:
Qiu Jian
2019-03-13 16:32:18 +08:00
parent aef848974c 9448fde22d
commit 4e9eab8ee7
5 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/cloudcommon/db/taskman/tasks.go
View File

@@ -2,6 +2,7 @@ package taskman
import (
"context"
"database/sql"
"fmt"
"net/http"
"reflect"
@@ -10,19 +11,18 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/onecloud/pkg/appctx"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/util/httputils"
"yunion.io/x/pkg/util/reflectutils"
"yunion.io/x/pkg/util/stringutils"
"yunion.io/x/pkg/util/timeutils"
"yunion.io/x/pkg/utils"
"yunion.io/x/sqlchemy"
"database/sql"
"yunion.io/x/onecloud/pkg/appctx"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/db/lockman"
"yunion.io/x/onecloud/pkg/cloudcommon/db/quotas"
"yunion.io/x/pkg/util/timeutils"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/util/httputils"
)
const (
@@ -451,6 +451,14 @@ func (task *STask) ScheduleRun(data jsonutils.JSONObject) {
runTask(task.Id, data)
}
func (self *STask) HasParentTask() bool {
parentTaskId, _ := self.Params.GetString(PARENT_TASK_ID_KEY)
if len(parentTaskId) > 0 {
return true
}
return false
}
func (self *STask) GetParentTask() *STask {
parentTaskId, _ := self.Params.GetString(PARENT_TASK_ID_KEY)
if len(parentTaskId) > 0 {