Investigate log size

CHANGELOG.md

@@ -50,7 +50,10 @@ Users/clients that do not make use of these endpoints will not be impacted.
   - Updated `@cumulus/ingest/lock` to check expired locks based on `provider.maxDownloadTime`
 
 ### Changed
-
+- **CUMULUS-3177**
+  - changed removeFromCmr function for granule bulkDelete to not return and instead catch the error
+    when the granule is not found in CMR
+  - updated unit and integration tests to reflect the above changes
 - **CUMULUS-3351**
   - Updated `constructOnlineAccessUrls()` to group CMR online access URLs by link type.
 - **CUMULUS-3392**

bamboo/bootstrap-unit-tests.sh

@@ -12,14 +12,12 @@ export COMPOSE_FILE=./bamboo/docker-compose.yml
 ## Set container_id for docker compose to use to identify the compose stack per planKey
 docker_command="docker exec -t ${container_id}-build_env-1 /bin/bash -c"
 
-docker ps -a
 
 ## Setup the compose stack
 docker compose -p ${container_id} down
 docker compose -p ${container_id} rm -f
-docker compose -p ${container_id} up -d
+docker compose -p ${container_id} up -d --quiet-pull
 
-docker ps -a
 while ! docker container inspect ${container_id}-build_env-1; do
   echo 'Waiting for build env to be available';
   docker ps -a

bamboo/cleanup-unit-tests.sh

@@ -9,6 +9,5 @@ container_id=${container_id/-/}
 
 export COMPOSE_FILE=./bamboo/docker-compose.yml
 
-docker ps -a
 docker compose -p ${container_id} down
 docker compose -p ${container_id} rm -f

bamboo/extract-ts-build-cache.sh

@@ -8,4 +8,4 @@ fi
 
 echo "***Extracting build cache of compiled TS code"
 
-tar xvf $TS_BUILD_CACHE_FILE
+tar -xf $TS_BUILD_CACHE_FILE

bamboo/unit-tests.sh

@@ -8,5 +8,5 @@ set -ex
 docker ps -a ## Show running containers for output logs
 
 docker exec -i ${container_id}-build_env-1 /bin/bash -c "cd $UNIT_TEST_BUILD_DIR && npm run db:local:reset"
-docker exec -i ${container_id}-build_env-1 /bin/bash -c "cd $UNIT_TEST_BUILD_DIR && npm run test:coverage"
+docker exec -i ${container_id}-build_env-1 /bin/bash -c "cd $UNIT_TEST_BUILD_DIR && npm run test:coverage -- --since master"
 docker exec -i ${container_id}-build_env-1 /bin/bash -c "cd $UNIT_TEST_BUILD_DIR && npm run coverage -- --noRerun"

package.json

@@ -23,7 +23,7 @@
     "lint-package-json": "npmPkgJsonLint .",
     "test": "lerna run --ignore @cumulus/cumulus-integration-tests --concurrency 1 test",
     "test:ci": "./scripts/run_ci_unit_coverage.sh",
-    "test:coverage": "lerna run --ignore @cumulus/cumulus-integration-tests --concurrency 1 test:coverage",
+    "test:coverage": "lerna run --ignore @cumulus/cumulus-integration-tests --since master --concurrency 1 test:coverage",
     "coverage": "lerna run --ignore @cumulus/cumulus-integration-tests --concurrency 1 --since master coverage -- -- ",
     "tsc": "lerna run tsc",
     "tsc:listEmittedFiles": "lerna run tsc:listEmittedFiles --stream --no-prefix",

packages/api/lib/granule-remove-from-cmr.js

@@ -25,19 +25,25 @@ const { constructCollectionId } = require('@cumulus/message/Collections');
  * @private
  */
 const _removeGranuleFromCmr = async (granule, collectionId) => {
+  let metadata = false;
   log.info(`granules.removeGranuleFromCmrByGranule granule_id: ${granule.granule_id}, colletion_id: ${collectionId}`);
   if (!granule.published || !granule.cmr_link) {
     log.warn(`Granule ${granule.granule_id} in Collection ${collectionId} is not published to CMR, so cannot be removed from CMR`);
-    return;
   }
 
   const cmrSettings = await cmrjsCmrUtils.getCmrSettings();
   const cmr = new CMR(cmrSettings);
-  const metadata = await cmr.getGranuleMetadata(granule.cmr_link);
+  if (granule.cmr_link) {
+    metadata = await cmr.getGranuleMetadata(granule.cmr_link);
+  }
 
   // Use granule UR to delete from CMR
   if (metadata) {
-    await cmr.deleteGranule(metadata.title, collectionId);
+    try {
+      await cmr.deleteGranule(metadata.title, collectionId);
+    } catch (error) {
+      log.warn(`Granule ${granule.granule_id} in Collection ${collectionId} is not published to CMR, so cannot be removed from CMR`);
+    }
   }
 };