[CAE-342] Fix a couple of bugs

Author: htemelski-oss

packages/client/lib/client/index.ts

@@ -325,6 +325,14 @@ export default class RedisClient<
     return this._self.#watchEpoch !== undefined;
   }
 
+  get watchEpoch() {
+    return this._self.#watchEpoch
+  }
+
+  setWatchEpoch(watchEpoch: number | undefined) {
+    this._self.#watchEpoch = watchEpoch
+  }
+
   setDirtyWatch(msg: string) {
     this._self.#dirtyWatch = msg;
   }

packages/client/lib/sentinel/index.spec.ts

@@ -197,6 +197,11 @@ async function steadyState(frame: SentinelFramework) {
 
         await assert.doesNotReject(sentinel.get('x'));
       });
+
+      it('failed to connect', async function() {
+        sentinel = frame.getSentinelClient({sentinelRootNodes: [{host: "127.0.0.1", port: 1010}], maxCommandRediscovers: 0})
+        await assert.rejects(sentinel.connect());
+      });
 
       it('try to connect multiple times', async function () {
         sentinel = frame.getSentinelClient();

packages/client/lib/sentinel/index.ts

@@ -682,9 +682,10 @@ class RedisSentinelInternal<
 
   async #connect() {
     let count = 0;
-    while (true) {
+    while (true) {      
       this.#trace("starting connect loop");
 
+      count+=1;      
       if (this.#destroy) {
         this.#trace("in #connect and want to destroy")
         return;
@@ -1106,10 +1107,12 @@ class RedisSentinelInternal<
       this.#trace(`transform: opening a new master`);
       const masterPromises = [];
       const masterWatches: Array<boolean> = [];
+      const watchEpochs: Array<number|undefined> = [];
 
       this.#trace(`transform: destroying old masters if open`);
       for (const client of this.#masterClients) {
         masterWatches.push(client.isWatching);
+        watchEpochs.push(client.watchEpoch);
 
         if (client.isOpen) {
           client.destroy()
@@ -1135,6 +1138,7 @@ class RedisSentinelInternal<
         });
 
         if (masterWatches[i]) {
+          client.setWatchEpoch(watchEpochs[i])
           client.setDirtyWatch("sentinel config changed in middle of a WATCH Transaction");
         }
         this.#masterClients.push(client);

packages/client/lib/sentinel/test-util.ts

@@ -180,9 +180,14 @@ export class SentinelFramework extends DockerBase {
     RedisScripts,
     RespVersions, 
     TypeMapping>>, errors = true) {
-    if (opts?.sentinelRootNodes !== undefined) {
-      throw new Error("cannot specify sentinelRootNodes here");
-    }
+    // remove this safeguard
+    // in order to test the case when
+    // connecting to sentinel fails
+
+    // if (opts?.sentinelRootNodes !== undefined) {
+    //   throw new Error("cannot specify sentinelRootNodes here");
+    // }
+
     if (opts?.name !== undefined) {
       throw new Error("cannot specify sentinel db name here");
     }