@cumulus/db 16.0.3-alpha.0 → 17.0.0

package/dist/lib/QuerySearchClient.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuerySearchClient = void 0;
+const retry_1 = require("./retry");
 /**
  * Class to handle fetching results for an arbitrary PostgreSQL query and
  * paging through them.
@@ -19,7 +20,7 @@ class QuerySearchClient {
      * @throws
      */
     async fetchRecords() {
-        this.records = await (this.query
+        this.records = await (0, retry_1.RetryOnDbConnectionTerminateError)(this.query
             .offset(this.offset)
             .limit(this.limit));
         this.offset += this.limit;

package/dist/lib/collection.d.ts

@@ -6,5 +6,5 @@ import { Knex } from 'knex';
  * @param {Array<string>} granuleIds - Array of granule IDs
  * @returns {Promise<Array<Object>>} - An array of collection results
  */
-export declare const getCollectionsByGranuleIds: (knex: Knex, granuleIds: string[]) => Promise<any[]>;
+export declare const getCollectionsByGranuleIds: (knex: Knex, granuleIds: string[]) => Promise<never>;
 //# sourceMappingURL=collection.d.ts.map

package/dist/lib/collection.js

@@ -1,6 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCollectionsByGranuleIds = void 0;
+const logger_1 = __importDefault(require("@cumulus/logger"));
+const retry_1 = require("./retry");
 const tables_1 = require("../tables");
 /**
  * Get collection results for a given set of granule IDs
@@ -11,11 +16,13 @@ const tables_1 = require("../tables");
  */
 const getCollectionsByGranuleIds = async (knex, granuleIds) => {
     const { collections: collectionsTable, granules: granulesTable, } = tables_1.TableNames;
-    return await knex(collectionsTable)
+    const log = new logger_1.default({ sender: '@cumulus/db/models/collection' });
+    const query = knex(collectionsTable)
         .select(`${collectionsTable}.*`)
         .innerJoin(granulesTable, `${collectionsTable}.cumulus_id`, `${granulesTable}.collection_cumulus_id`)
         .whereIn(`${granulesTable}.granule_id`, granuleIds)
         .groupBy(`${collectionsTable}.cumulus_id`);
+    return await (0, retry_1.RetryOnDbConnectionTerminateError)(query, {}, log);
 };
 exports.getCollectionsByGranuleIds = getCollectionsByGranuleIds;
 //# sourceMappingURL=collection.js.map

package/dist/lib/retry.d.ts

@@ -0,0 +1,7 @@
+import { Knex } from 'knex';
+import pRetry from 'p-retry';
+import Logger from '@cumulus/logger';
+declare type PromiseReturnType<T> = T extends (method: Promise<any> | Knex.QueryBuilder) => infer R ? Promise<R> : never;
+export declare const RetryOnDbConnectionTerminateError: <T>(method: Promise<any> | Knex.QueryBuilder, retryConfig?: pRetry.Options, log?: Logger) => Promise<PromiseReturnType<T>>;
+export {};
+//# sourceMappingURL=retry.d.ts.map

package/dist/lib/retry.js

@@ -0,0 +1,32 @@
+'use strict';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RetryOnDbConnectionTerminateError = void 0;
+const p_retry_1 = __importDefault(require("p-retry"));
+const logger_1 = __importDefault(require("@cumulus/logger"));
+const RetryOnDbConnectionTerminateError = async (method, retryConfig, log) => {
+    const logger = log || new logger_1.default({ sender: '@cumulus/db/retry' });
+    return await (0, p_retry_1.default)(async () => {
+        try {
+            const result = await method;
+            return result;
+        }
+        catch (error) {
+            if (error.message.includes('Connection terminated unexpectedly')) {
+                logger.error(`${error}. Retrying...`);
+                throw error;
+            }
+            throw new p_retry_1.default.AbortError(error);
+        }
+    }, {
+        retries: 3,
+        onFailedAttempt: (e) => {
+            logger.error(`Error ${e.message}. Attempt ${e.attemptNumber} failed.`);
+        },
+        ...retryConfig,
+    });
+};
+exports.RetryOnDbConnectionTerminateError = RetryOnDbConnectionTerminateError;
+//# sourceMappingURL=retry.js.map

package/dist/models/base.js

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasePgModel = void 0;
+const logger_1 = __importDefault(require("@cumulus/logger"));
 const errors_1 = require("@cumulus/errors");
 const database_1 = require("../database");
+const retry_1 = require("../lib/retry");
 class BasePgModel {
     constructor({ tableName }) {
         this.tableName = tableName;
@@ -16,7 +21,9 @@ class BasePgModel {
      * @returns {Promise<PostgresCollectionRecord[]>} List of returned records
      */
     async searchWithUpdatedAtRange(knexOrTransaction, params, updatedAtParams) {
-        const records = await knexOrTransaction(this.tableName).where((builder) => {
+        const log = new logger_1.default({ sender: '@cumulus/db/models/base' });
+        const query = knexOrTransaction(this.tableName)
+            .where((builder) => {
             builder.where(params);
             if (updatedAtParams.updatedAtFrom || updatedAtParams.updatedAtTo) {
                 builder.whereBetween('updated_at', [
@@ -25,6 +32,7 @@ class BasePgModel {
                 ]);
             }
         });
+        const records = await (0, retry_1.RetryOnDbConnectionTerminateError)(query, {}, log);
         return records;
     }
     async count(knexOrTransaction, params) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/db",
-  "version": "16.0.3-alpha.0",
+  "version": "17.0.0",
   "description": "Utilities for working with the Cumulus DB",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
@@ -16,7 +16,8 @@
     "tsc:listEmittedFiles": "../../node_modules/.bin/tsc --listEmittedFiles",
     "test": "../../node_modules/.bin/ava",
     "test:coverage": "../../node_modules/.bin/nyc npm test",
-    "watch": "../../node_modules/.bin/tsc -w"
+    "watch": "../../node_modules/.bin/tsc -w",
+    "coverage": "python ../../scripts/coverage_handler/coverage.py"
   },
   "ava": {
     "files": [
@@ -29,12 +30,12 @@
     "node": ">=16.19.0"
   },
   "dependencies": {
-    "@cumulus/aws-client": "16.0.3-alpha.0",
-    "@cumulus/common": "16.0.3-alpha.0",
-    "@cumulus/errors": "16.0.3-alpha.0",
-    "@cumulus/logger": "16.0.3-alpha.0",
-    "@cumulus/message": "16.0.3-alpha.0",
-    "@cumulus/types": "16.0.3-alpha.0",
+    "@cumulus/aws-client": "17.0.0",
+    "@cumulus/common": "17.0.0",
+    "@cumulus/errors": "17.0.0",
+    "@cumulus/logger": "17.0.0",
+    "@cumulus/message": "17.0.0",
+    "@cumulus/types": "17.0.0",
     "crypto-random-string": "^3.2.0",
     "is-valid-hostname": "1.0.2",
     "knex": "2.4.1",
@@ -46,5 +47,5 @@
   "devDependencies": {
     "@types/uuid": "^8.0.0"
   },
-  "gitHead": "81be18bf42487473dce42432781672da91fbecd0"
+  "gitHead": "a5acb591242a334a730cebd6159f3a88a466432b"
 }