Merge pull request #210 from ml054/v4.1

RDBC-386 Unable to failover in cluster

Author: gregolsky

.travis.yml

@@ -2,6 +2,7 @@ language: node_js
 node_js:
   - "8"
   - "10"
+  - "12"
 env:
   global:
     - RAVENDB_TEST_SERVER_PATH=./RavenDB/Server/Raven.Server
@@ -10,11 +11,10 @@ env:
       RAVENDB_TEST_CLIENT_CERT_PATH=./certs/nodejs.pem
       RAVENDB_TEST_CA_PATH=/usr/local/share/ca-certificates/ca.crt
       RAVENDB_TEST_HTTPS_SERVER_URL=https://localhost:8989
+      RAVENDB_BUILD_TYPE="stable"
   matrix:
     - RAVENDB_SERVER_VERSION="4.1"
-      RAVENDB_BUILD_TYPE="stable"
     - RAVENDB_SERVER_VERSION="4.2"
-      RAVENDB_BUILD_TYPE="nightly"
 before_install:
   - travis_retry sudo apt-get -qq update
   - travis_retry sudo apt-get install -y libunwind8 wget libssl-dev curl unzip gettext libcurl4-openssl-dev zlib1g uuid-dev bzip2 openssl

package-lock.json

@@ -396,6 +396,10 @@ export class RequestExecutor implements IDisposable {
             return Promise.resolve(false);
         }
 
+        if (this._disableTopologyUpdates) {
+            return Promise.resolve(false);
+        }
+
         const acquiredSemContext = acquireSemaphore(this._updateDatabaseTopologySemaphore, { timeout });
         const result = BluebirdPromise.resolve(acquiredSemContext.promise)
             .then(() => {
@@ -804,7 +808,7 @@ export class RequestExecutor implements IDisposable {
             sp.stop();
 
             const serverDownHandledSuccessfully = await this._handleServerDown(
-                req.uri as string, chosenNode, nodeIndex, command, req, response, null, error, sessionInfo);
+                req.uri as string, chosenNode, nodeIndex, command, req, response, null, error, sessionInfo, shouldRetry);
 
             if (!serverDownHandledSuccessfully) {
                 this._throwFailedToContactAllNodes(command, req, error, null);
@@ -1004,7 +1008,7 @@ export class RequestExecutor implements IDisposable {
             case StatusCodes.BadGateway:
             case StatusCodes.ServiceUnavailable:
                 return this._handleServerDown(
-                    url, chosenNode, nodeIndex, command, req, response, await readBody(), null, sessionInfo);
+                    url, chosenNode, nodeIndex, command, req, response, await readBody(), null, sessionInfo, shouldRetry);
             case StatusCodes.Conflict:
                 RequestExecutor._handleConflict(response, await readBody());
                 break;
@@ -1089,7 +1093,8 @@ export class RequestExecutor implements IDisposable {
         response: HttpResponse,
         body: string,
         error: any,
-        sessionInfo: SessionInfo): Promise<boolean> {
+        sessionInfo: SessionInfo,
+        shouldRetry: boolean): Promise<boolean> {
 
         if (!command.failedNodes) {
             command.failedNodes = new Map();
@@ -1118,7 +1123,7 @@ export class RequestExecutor implements IDisposable {
         await this._executeOnSpecificNode(command, sessionInfo, {
                     chosenNode: currentIndexAndNode.currentNode,
                     nodeIndex: currentIndexAndNode.currentIndex,
-                    shouldRetry: false
+                    shouldRetry: shouldRetry
                 });
 
         return true;

src/Http/RequestExecutor.ts

@@ -62,7 +62,7 @@ describe("Attachments Session", function () {
             assert.strictEqual(attachments.length, 3);
 
             const orderedNames = [...attachments];
-            orderedNames.sort((a, b) => a.name > b.name ? -1 : -1);
+            orderedNames.sort((a, b) => a.name > b.name ? 1 : -1);
 
             for (let i = 0; i < attachmentsInfo.length; i++) {
                 const { name, contentType } = orderedNames[i];