workflow: do not retry AM poll activities

sevein · sevein · commit 6f8e9afc61fe · 2019-11-07T13:38:17.000-08:00
This commit updates the poller activities so they convert errors that escape
the backoff retry into workflow NRE (non-retryable) errors. When these are
returned, they escape the retry policy attached to the activities.

E.g., we want the activity to give up right away when Archivematica returns the
"FAILED" status for a package.
diff --git a/internal/workflow/poll_ingest_activity.go b/internal/workflow/poll_ingest_activity.go
@@ -33,7 +33,7 @@ func (a *PollIngestActivity) Execute(ctx context.Context, tinfo *TransferInfo) (
 
 			err = pipeline.IngestStatus(ctx, amc, tinfo.SIPID)
 			if errors.Is(err, pipeline.ErrStatusNonRetryable) {
-				return backoff.Permanent(err)
+				return backoff.Permanent(nonRetryableError(err))
 			}
 
 			return err
diff --git a/internal/workflow/poll_transfer_activity.go b/internal/workflow/poll_transfer_activity.go
@@ -34,7 +34,7 @@ func (a *PollTransferActivity) Execute(ctx context.Context, tinfo *TransferInfo)
 
 			sipID, err = pipeline.TransferStatus(ctx, amc, tinfo.TransferID)
 			if errors.Is(err, pipeline.ErrStatusNonRetryable) {
-				return backoff.Permanent(err)
+				return backoff.Permanent(nonRetryableError(err))
 			}
 
 			return err

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func (a PollIngestActivity) Execute(ctx context.Context, tinfo TransferInfo) (`
`33`	`33`
`34`	`34`	`err = pipeline.IngestStatus(ctx, amc, tinfo.SIPID)`
`35`	`35`	`if errors.Is(err, pipeline.ErrStatusNonRetryable) {`
`36`		`- return backoff.Permanent(err)`
	`36`	`+ return backoff.Permanent(nonRetryableError(err))`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func (a PollTransferActivity) Execute(ctx context.Context, tinfo TransferInfo)`
`34`	`34`
`35`	`35`	`sipID, err = pipeline.TransferStatus(ctx, amc, tinfo.TransferID)`
`36`	`36`	`if errors.Is(err, pipeline.ErrStatusNonRetryable) {`
`37`		`- return backoff.Permanent(err)`
	`37`	`+ return backoff.Permanent(nonRetryableError(err))`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`return err`