Merge pull request #581 from RedisInsight/bugifx/RI-2654-workaround-for-rec-scan-issue

scan until cursor !== 0 when dbsize < scanThreshold

Author: arthosofteq

redisinsight/api/src/modules/browser/services/keys-business/scanner/strategies/cluster.strategy.ts

@@ -68,8 +68,14 @@ export class ClusterStrategy extends AbstractStrategy {
     while (
       !allNodesScanned
       && nodes.reduce((prev, cur) => prev + cur.keys.length, 0) < count
-      && nodes.reduce((prev, cur) => prev + cur.scanned, 0)
-        < settings.scanThreshold
+      && (
+        (
+          nodes.reduce((prev, cur) => prev + cur.total, 0) < settings.scanThreshold
+          && nodes.find((node) => !!node.cursor)
+        )
+        || nodes.reduce((prev, cur) => prev + cur.scanned, 0)
+          < settings.scanThreshold
+      )
     ) {
       await this.scanNodes(clientOptions, nodes, match, count, args.type);
       allNodesScanned = !nodes.some((node) => node.cursor !== 0);

redisinsight/api/src/modules/browser/services/keys-business/scanner/strategies/standalone.strategy.ts

@@ -83,7 +83,10 @@ export class StandaloneStrategy extends AbstractStrategy {
       node.total > 0
       && !fullScanned
       && node.keys.length < count
-      && node.scanned < settings.scanThreshold
+      && (
+        (node.total < settings.scanThreshold && node.cursor)
+        || node.scanned < settings.scanThreshold
+      )
     ) {
       let commandArgs = [`${node.cursor}`, 'MATCH', match, 'COUNT', count];
       if (type) {