fix the infinite loop on getListOfKernelsWithCachedConnection (#15252)

microsoft · Feb 28, 2024 · d331387 · d331387
1 parent b0b8b5e
commit d331387
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/src/kernels/jupyter/finder/remoteKernelFinder.ts b/src/kernels/jupyter/finder/remoteKernelFinder.ts
@@ -170,32 +170,27 @@ export class RemoteKernelFinder extends DisposableBase implements IRemoteKernelF
         await this.loadCache(true, true);
     }
 
-    private numberOfFailures = 0;
     private getListOfKernelsWithCachedConnection(
         displayProgress: boolean,
         ignoreCache: boolean = false
     ): Promise<RemoteKernelConnectionMetadata[]> {
-        const usingCache = !!this.cachedConnection;
-        this.cachedConnection = this.cachedConnection || this.getRemoteConnectionInfo(displayProgress);
+        if (!this.cachedConnection || ignoreCache) {
+            this.cachedConnection = this.getRemoteConnectionInfo(displayProgress);
+        }
         return this.cachedConnection
             .then((connInfo) => {
-                this.numberOfFailures = 0;
-                if (connInfo && !usingCache) {
+                if (connInfo) {
                     this.cachedConnection = Promise.resolve(connInfo);
+                    return this.listKernelsFromConnection(connInfo);
                 }
-                return connInfo ? this.listKernelsFromConnection(connInfo) : Promise.resolve([]);
+                return Promise.resolve([]);
             })
             .catch((ex) => {
-                this.numberOfFailures += 1;
                 if (this.isDisposed) {
                     return Promise.reject(ex);
                 }
-                if (this.numberOfFailures > 9) {
-                    traceWarning(`Remote Kernel Finder: ${this.id} has failed to connect 10 times in a row.`, ex);
-                    return Promise.reject(ex);
-                }
-                if (usingCache) {
-                    return this.getListOfKernelsWithCachedConnection(displayProgress, ignoreCache);
+                if (!ignoreCache) {
+                    return this.getListOfKernelsWithCachedConnection(displayProgress, true);
                 }
                 this.cachedConnection = undefined;
                 return Promise.reject(ex);