chore: stop warehouse panics (#3105)

rudderlabs · Mar 20, 2023 · 0630253 · 0630253
1 parent 9ecf514
commit 0630253
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/warehouse/errors.go b/warehouse/errors.go
@@ -12,6 +12,7 @@ import (
 var (
 	ErrIncompatibleSchemaConversion = errors.New("incompatible schema conversion")
 	ErrSchemaConversionNotSupported = errors.New("schema conversion not supported")
+	ErrCancellingStatement          = errors.New("[error] pq: canceling statement due to user request")
 )
 
 type InvalidDestinationCredErr struct {

diff --git a/warehouse/warehouse.go b/warehouse/warehouse.go
@@ -808,7 +808,12 @@ loop:
 		wh.Logger.Debugf(`Current inProgress namespace identifiers for %s: %v`, wh.destType, inProgressNamespaces)
 
 		uploadJobsToProcess, err := wh.getUploadsToProcess(ctx, availableWorkers, inProgressNamespaces)
-		if err != nil {
+
+		switch err {
+		case nil:
+		case context.Canceled, context.DeadlineExceeded, ErrCancellingStatement:
+			break loop
+		default:
 			wh.Logger.Errorf(`Error executing getUploadsToProcess: %v`, err)
 			panic(err)
 		}