Add solution to resolve stale QUEUED migration requests

dmwm · Sep 20, 2022 · 4e2ecc4 · 4e2ecc4
1 parent 58b1aab
commit 4e2ecc4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/dbs/migration_server.go b/dbs/migration_server.go
@@ -82,7 +82,14 @@ func MigrationServer(interval, timeout int, ch <-chan bool) {
 				api.Params = params
 				time0 := time.Now()
 				atomic.AddUint64(&TotalMigrationRequests, 1)
-				api.ProcessMigration()
+				if r.MIGRATION_STATUS == QUEUED {
+					// asynchronously start migration request
+					// the StartMigrationRequest relies on MigrationAsyncTimeout (in sec)
+					// context timeout
+					go StartMigrationRequest(r)
+				} else {
+					api.ProcessMigration()
+				}
 				log.Printf("migration process %+v finished in %v", params, time.Since(time0))
 			}
 		}

diff --git a/static/sql/migration_requests.sql b/static/sql/migration_requests.sql
@@ -9,10 +9,9 @@ JOIN {{.Owner}}.MIGRATION_BLOCKS MB ON MB.MIGRATION_REQUEST_ID=MR.MIGRATION_REQU
 
 {{if .Oldest}}
 WHERE MR.MIGRATION_STATUS=0
+or MR.MIGRATION_STATUS=1
 or (MR.migration_status=3 and MR.retry_count=0 and MR.last_modification_date <= {{.Date1}})
 or (MR.migration_status=3 and MR.retry_count=1 and MR.last_modification_date <= {{.Date2}})
 or (MR.migration_status=3 and MR.retry_count=2 and MR.last_modification_date <= {{.Date3}})
---or (MR.migration_status=0 and MR.retry_count=0 and MR.last_modification_date <= {{.PendingDate}})
---or (MR.migration_status=1 and MR.retry_count=0 and MR.last_modification_date <= {{.ProgressDate}})
-or MR.MIGRATION_STATUS=1
+or (MR.migration_status=5 and MR.retry_count=0 and MR.last_modification_date <= {{.Date1}})
 {{end}}