@terascope/elasticsearch-api 3.3.2 → 3.3.3

package/index.js

@@ -792,19 +792,33 @@ module.exports = function elasticsearchApi(client, logger, _opConfig) {
         });
     }
 
+    function isConnectionErrorMessage(err) {
+        const msg = get(err, 'message', '');
+        return msg.includes('No Living connections') || msg.includes('ECONNREFUSED');
+    }
+
+    function isErrorRetryable(err) {
+        const checkErrorMsg = isRetryableError(err);
+
+        if (checkErrorMsg) {
+            return true;
+        }
+
+        const isRejectedError = get(err, 'body.error.type') === 'es_rejected_execution_exception';
+        const isConnectionError = isConnectionErrorMessage(err);
+
+        if (isRejectedError || isConnectionError) {
+            return true;
+        }
+
+        return false;
+    }
+
     function _errorHandler(fn, data, reject, fnName = '->unknown()') {
         const retry = _retryFn(fn, data, reject);
+
         return function _errorHandlerFn(err) {
-            let retryable = false;
-            if (isRetryableError(err)) {
-                retryable = true;
-            } else {
-                const isRejectedError = get(err, 'body.error.type') === 'es_rejected_execution_exception';
-                const isConnectionError = get(err, 'message', '').includes('No Living connections');
-                if (isRejectedError || isConnectionError) {
-                    retryable = true;
-                }
-            }
+            const retryable = isErrorRetryable(err);
 
             if (retryable) {
                 retry();
@@ -1254,5 +1268,6 @@ module.exports = function elasticsearchApi(client, logger, _opConfig) {
         index_refresh: indexRefresh,
         index_recovery: indexRecovery,
         getESVersion,
+        isErrorRetryable
     };
 };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@terascope/elasticsearch-api",
     "displayName": "Elasticsearch API",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "Elasticsearch client api used across multiple services, handles retries and exponential backoff",
     "homepage": "https://github.com/terascope/teraslice/tree/master/packages/elasticsearch-api#readme",
     "bugs": {
@@ -31,7 +31,7 @@
         "@opensearch-project/opensearch": "^1.1.0",
         "@types/elasticsearch": "^5.0.40",
         "elasticsearch": "^15.4.1",
-        "elasticsearch-store": "^0.64.0",
+        "elasticsearch-store": "^0.65.1",
         "elasticsearch6": "npm:@elastic/elasticsearch@^6.7.0",
         "elasticsearch7": "npm:@elastic/elasticsearch@^7.0.0",
         "elasticsearch8": "npm:@elastic/elasticsearch@^8.0.0"

package/test/retry-spec.js

@@ -0,0 +1,38 @@
+'use strict';
+
+const { ElasticsearchTestHelpers } = require('elasticsearch-store');
+const { debugLogger } = require('@terascope/utils');
+const opensearch = require('@opensearch-project/opensearch');
+const API = require('../index');
+
+const logger = debugLogger('retry spec');
+const port = '1111';
+
+const { data } = ElasticsearchTestHelpers.EvenDateData;
+
+const body = ElasticsearchTestHelpers.formatUploadData('retry-error-test', data);
+
+describe('retry behavior', () => {
+    it('will work with opensearch when connection cannot be established', async () => {
+        expect.assertions(4);
+        const client = new opensearch.Client({ node: `http://127.0.0.1:${port}` });
+        const { isErrorRetryable } = API(client, logger);
+
+        try {
+            await client.bulk({ body });
+            throw Error('should have thrown');
+        } catch (err) {
+            expect(err).toBeDefined();
+            expect(isErrorRetryable(err)).toBeTrue();
+        }
+
+        // we try again as we have seen the second call be marked as unretryable
+        try {
+            await client.bulk({ body });
+            throw Error('should have thrown');
+        } catch (err) {
+            expect(err).toBeDefined();
+            expect(isErrorRetryable(err)).toBeTrue();
+        }
+    });
+});