Relax timeout for re-doing transcode (#7581)

AudiusProject · Feb 14, 2024 · 1fe3be6 · 1fe3be6
1 parent 4ae791d
commit 1fe3be6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/mediorum/server/transcode.go b/mediorum/server/transcode.go
@@ -170,22 +170,22 @@ func (ss *MediorumServer) findMissedJobs(work chan *Upload, myHost string, retra
 		if myRank == 2 {
 			// no recent update?
 			timedOut = upload.Status == busyStatus &&
-				time.Since(upload.TranscodedAt) > time.Minute
+				time.Since(upload.TranscodedAt) > time.Minute*3
 
 			// never started?
 			neverStarted = upload.Status == newStatus &&
-				time.Since(upload.CreatedAt) > time.Minute*2
+				time.Since(upload.CreatedAt) > time.Minute*6
 		}
 
 		// for #3 rank worker:
 		if myRank == 3 {
 			// no recent update?
 			timedOut = upload.Status == busyStatus &&
-				time.Since(upload.TranscodedAt) > time.Minute*5
+				time.Since(upload.TranscodedAt) > time.Minute*7
 
 			// never started?
 			neverStarted = upload.Status == newStatus &&
-				time.Since(upload.CreatedAt) > time.Minute*5
+				time.Since(upload.CreatedAt) > time.Minute*14
 		}
 
 		if timedOut {

diff --git a/mediorum/server/upload_client.go b/mediorum/server/upload_client.go
@@ -59,6 +59,10 @@ func (ss *MediorumServer) startUploadScroller() {
 				uploadCursor.After = upload.CreatedAt
 			}
 
+			if len(uploads) == 0 {
+				continue
+			}
+
 			// write overwrites
 			err = ss.crud.DB.Clauses(clause.OnConflict{UpdateAll: true}).Create(overwrites).Error
 			if err != nil {