Bump Cumulus CLI version and handle reingestions

Fixes #329
NASA-IMPACT · Jan 12, 2024 · 7a67d0e · 7a67d0e
1 parent fb261cb
commit 7a67d0e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/app/stacks/cumulus/main.tf b/app/stacks/cumulus/main.tf
@@ -161,7 +161,7 @@ resource "aws_cloudwatch_event_target" "background_job_queue_watcher" {
   arn  = module.cumulus.sqs2sfThrottle_lambda_function_arn
   input = jsonencode(
     {
-      messageLimit = 1500
+      messageLimit = 1000
       queueUrl     = aws_sqs_queue.background_job_queue.id
       timeLimit    = 60
     }
@@ -576,7 +576,7 @@ module "cumulus" {
     {
       id              = "backgroundJobQueue",
       url             = aws_sqs_queue.background_job_queue.id,
-      execution_limit = 500
+      execution_limit = 300
     }
   ]
 }
diff --git a/package.json b/package.json
@@ -90,7 +90,7 @@
     "@typescript-eslint/parser": "^5.62.0",
     "ava": "^5.3.1",
     "codecov": "^3.5.0",
-    "cumulus-cli": "github:NASA-IMPACT/cumulus-cli#68b8eb5",
+    "cumulus-cli": "github:NASA-IMPACT/cumulus-cli#d274e3e",
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^8.3.0",

diff --git a/src/lib/ingestion.ts b/src/lib/ingestion.ts
@@ -303,11 +303,13 @@ export const recordWorkflowFailureRT = (event: FailedEvent) => {
   const failureDetails = toFailureDetails(event);
   const bucket = event.cumulus_meta.system_bucket;
   const { parentExecutionArn } = event.cumulus_meta;
-  const parentExecutionName = parentExecutionArn.split(':').slice(-1)[0];
+  const parentExecutionName = parentExecutionArn
+    ? `DiscoverAndQueueGranules-${parentExecutionArn.split(':').slice(-1)[0]}`
+    : 'reingest'; // There is no parent execution, so this is a reingest workflow
   const key = [
     'failures',
     event.meta.workflow_name,
-    `DiscoverAndQueueGranules-${parentExecutionName}`,
+    parentExecutionName,
     `${event.cumulus_meta.execution_name}.json`,
   ].join('/');
 

diff --git a/yarn.lock b/yarn.lock
@@ -3180,9 +3180,9 @@ crypto-random-string@^4.0.0:
   dependencies:
     type-fest "^1.0.1"
 
-"cumulus-cli@github:NASA-IMPACT/cumulus-cli#68b8eb5":
+"cumulus-cli@github:NASA-IMPACT/cumulus-cli#d274e3e":
   version "0.1.0"
-  resolved "https://codeload.github.com/NASA-IMPACT/cumulus-cli/tar.gz/68b8eb5a44151699da0cbbfd1a3cd41c0d116957"
+  resolved "https://codeload.github.com/NASA-IMPACT/cumulus-cli/tar.gz/d274e3e8088fd86c9096c6803d15516e4fc84c36"
   dependencies:
     cmd-ts "^0.11.0"
     lodash "^4.17.21"