floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[migration] fix missing partition for running sub tasks

This commit is contained in:
Kassian Sun 2023-05-19 19:12:10 +08:00
parent 86c8615537
commit 5000deefa9
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/migration/api.go
View File

@ -266,9 +266,7 @@ func (h *APIHandler) getDataMigrationTaskOfIndex(w http.ResponseWriter, req *htt
if ptask.StartTimeInMillis > 0 { if ptask.StartTimeInMillis > 0 {
if migration_util.IsPendingState(ptask.Status) { if migration_util.IsPendingState(ptask.Status) {
durationInMS = time.Now().UnixMilli() - ptask.StartTimeInMillis durationInMS = time.Now().UnixMilli() - ptask.StartTimeInMillis
continue } else if ptask.CompletedTime != nil {
}
if ptask.CompletedTime != nil {
subCompletedTime = ptask.CompletedTime.UnixMilli() subCompletedTime = ptask.CompletedTime.UnixMilli()
durationInMS = subCompletedTime - ptask.StartTimeInMillis durationInMS = subCompletedTime - ptask.StartTimeInMillis
} }
@ -576,7 +574,7 @@ func (h *APIHandler) getChildPipelineInfosFromGateway(pipelineTaskIDs map[string
inst.ID = instID inst.ID = instID
_, err = orm.Get(inst) _, err = orm.Get(inst)
if err != nil { if err != nil {
log.Error("failed to get instance info, err: %v", err) log.Errorf("failed to get instance info, id: %s, err: %v", instID, err)
continue continue
} }
pipelines, err := inst.GetPipelinesByIDs(taskIDs) pipelines, err := inst.GetPipelinesByIDs(taskIDs)

4
plugin/migration/comparison_api.go
View File

@ -287,9 +287,7 @@ func (h *APIHandler) getDataComparisonTaskOfIndex(w http.ResponseWriter, req *ht
if subTask.StartTimeInMillis > 0 { if subTask.StartTimeInMillis > 0 {
if migration_util.IsPendingState(subTask.Status) { if migration_util.IsPendingState(subTask.Status) {
durationInMS = time.Now().UnixMilli() - subTask.StartTimeInMillis durationInMS = time.Now().UnixMilli() - subTask.StartTimeInMillis
continue } else if subTask.CompletedTime != nil {
}
if subTask.CompletedTime != nil {
subCompletedTime = subTask.CompletedTime.UnixMilli() subCompletedTime = subTask.CompletedTime.UnixMilli()
durationInMS = subCompletedTime - subTask.StartTimeInMillis durationInMS = subCompletedTime - subTask.StartTimeInMillis
} }