Change doTryNextCluster logic to make it the same. [API-1354] (#1403)

* Make ReadResultSet iterable [API-1315] * Make ReadResultSet iterable [API-1315] * Changes made according to comments on PR.[API-1315] * Change doTryNextCluster logic to make it the same. [API-1354]
hazelcast · Oct 25, 2022 · e1d228b · e1d228b
1 parent 62a2183
commit e1d228b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/ClusterFailoverService.ts b/src/ClusterFailoverService.ts
@@ -50,7 +50,7 @@ export class ClusterFailoverService {
     }
 
     private doTryNextCluster(tryCount: number, fn: TryNextFn): Promise<boolean> {
-        if (!this.lifecycleService.isRunning() || tryCount >= this.maxTryCount) {
+        if (!this.lifecycleService.isRunning() || tryCount >= (this.maxTryCount * this.candidateClusters.length)) {
             return Promise.resolve(false);
         }
 

diff --git a/test/unit/ClusterFailoverServiceTest.js b/test/unit/ClusterFailoverServiceTest.js
@@ -111,8 +111,8 @@ describe('ClusterFailoverServiceTest', function () {
         const result = await service.tryNextCluster(fn);
 
         expect(result).to.be.false;
-        expect(cnt).to.be.equal(maxTryCount);
-        expect(fn.callCount).to.be.equal(maxTryCount);
-        expect(service.current()).to.be.equal(contexts[maxTryCount % contexts.length]);
+        expect(cnt).to.be.equal(maxTryCount * contexts.length);
+        expect(fn.callCount).to.be.equal(maxTryCount * contexts.length);
+        expect(service.current()).to.be.equal(contexts[(maxTryCount * contexts.length) % contexts.length]);
     });
 });