review changes as requested by ivan.

nats-io · May 5, 2017 · de189da · de189da
1 parent 175d828
commit de189da
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 3 deletions.
diff --git a/lib/nats.js b/lib/nats.js
@@ -815,7 +815,9 @@ Client.prototype.processInbound = function() {
     });
 
     if(toAdd.length > 0) {
-      shuffle(toAdd);
+      if(client.options.noRandomize !== true) {
+        shuffle(toAdd);
+      }
       toAdd.forEach(function(s) {
         client.servers.push(s);
       });

diff --git a/test/dyncluster.js b/test/dyncluster.js
@@ -64,7 +64,7 @@ describe('Dynamic Cluster - Connect URLs', function() {
 
       var connectCount = 0;
       function connectAndRecordPorts(check) {
-        var nc = NATS.connect({'port': port, 'reconnectTimeWait': 100, 'protocol': 0});
+        var nc = NATS.connect({'port': port, 'reconnectTimeWait': 100});
         nc.on('connect', function () {
           var have = [];
           nc.servers.forEach(function (s) {
@@ -74,7 +74,7 @@ describe('Dynamic Cluster - Connect URLs', function() {
           connectCount++;
           should.ok(have[0] == port);
           var key = have.join("_");
-          map[key]++;
+          map[key] = map[key] ? map[key] + 1 : 1;
           nc.close();
           if (connectCount === 10) {
             check();
@@ -94,4 +94,50 @@ describe('Dynamic Cluster - Connect URLs', function() {
       }
     });
   });
+
+  it('added servers not shuffled when noRandomize is set', function(done) {
+    var route_port = 54320;
+    var port = 54321;
+    // start a cluster of one server
+    var ports = [];
+    for (var i = 0; i < 10; i++) {
+      ports.push(port + i);
+    }
+    var map = {};
+    servers = nsc.start_cluster(ports, route_port, function () {
+      should(servers.length).be.equal(10);
+
+      var connectCount = 0;
+      function connectAndRecordPorts(check) {
+        var nc = NATS.connect({'port': port, 'reconnectTimeWait': 100, 'noRandomize': true});
+        nc.on('connect', function () {
+          var have = [];
+          nc.servers.forEach(function (s) {
+            have.push(s.url.port);
+          });
+
+          connectCount++;
+          should.ok(have[0] == port);
+          var key = have.join("_");
+          map[key] = map[key] ? map[key] + 1 : 1;
+          nc.close();
+          if (connectCount === 10) {
+            check();
+          }
+        });
+      }
+
+      // we should have more than one property if there was randomization
+      function check() {
+        var keys = Object.getOwnPropertyNames(map);
+        should.ok(keys.length === 1);
+        should.ok(map[keys[0]] === 10);
+        done();
+      }
+      // connect several times...
+      for (var i = 0; i < 10; i++) {
+        connectAndRecordPorts(check);
+      }
+    });
+  });
 });