wait for max 1 sec so that we dont get stuck

devlibx · Sep 4, 2023 · a62d5ba · a62d5ba
1 parent a66744c
commit a62d5ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/queue/mysql/poll_v1.go b/queue/mysql/poll_v1.go
@@ -148,8 +148,13 @@ func (q *queueImpl) internalPollV1(ctx context.Context, req queue.PollRequest) (
 				// If next job to process is not current then send a error to wait and try
 				n := time.Now()
 				if result.ProcessAtTimeUsed.After(n) {
+					waitTime := processAt.UnixMilli() - processAt.Truncate(time.Second).UnixMilli()
+					if waitTime <= 0 {
+						waitTime = 1
+					}
 					err = &queue.PollResponseError{
-						WaitForDurationBeforeTrying:       time.Duration(result.ProcessAtTimeUsed.UnixMilli()-n.UnixMilli()) * time.Millisecond,
+						// WaitForDurationBeforeTrying:       time.Duration(result.ProcessAtTimeUsed.UnixMilli()-n.UnixMilli()) * time.Millisecond,
+						WaitForDurationBeforeTrying:       time.Duration(waitTime) * time.Millisecond,
 						NextJobTimeAvailableForProcessing: result.ProcessAtTimeUsed,
 					}
 					return

diff --git a/queue/mysql/queue_test.go b/queue/mysql/queue_test.go
@@ -214,8 +214,8 @@ func TestPollWithNoRecord(t *testing.T) {
 			var e *queue.PollResponseError
 			tmp := errors.As(err, &e)
 			assert.True(t, tmp)
-			fmt.Println(e.WaitForDurationBeforeTrying.Milliseconds())
-			assert.True(t, e.WaitForDurationBeforeTrying.Milliseconds() > 6000)
+			fmt.Println("Wait for ", e.WaitForDurationBeforeTrying.Milliseconds())
+			assert.True(t, e.WaitForDurationBeforeTrying.Milliseconds() > 0)
 
 			if tmp == true {
 				break