Merge pull request ceph#64980 from rhcs-dashboard/multi-cluster-subs-close

afreen23 · web-flow · commit 6ccf8a7f4789 · 2025-08-17T17:30:42.000+05:30
mgr/dashboard: close token status subscription properly

Reviewed-by: Ankush Behl &lt;cloudbehl@gmail.com&gt;
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/multi-cluster.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/multi-cluster.service.ts
@@ -33,12 +33,12 @@ export class MultiClusterService {
   }
 
   startClusterTokenStatusPolling() {
-    this.checkAndStartTimer();
+    return this.checkAndStartTimer();
   }
 
   private checkAndStartTimer() {
     this.checkTokenStatus().subscribe(this.getClusterTokenStatusObserver());
-    this.timerService
+    return this.timerService
       .get(() => this.checkTokenStatus(), this.TOKEN_CHECK_INTERVAL)
       .subscribe(this.getClusterTokenStatusObserver());
   }

Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,12 @@ export class MultiClusterService {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`startClusterTokenStatusPolling() {`
`36`		`- this.checkAndStartTimer();`
	`36`	`+ return this.checkAndStartTimer();`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`private checkAndStartTimer() {`
`40`	`40`	`this.checkTokenStatus().subscribe(this.getClusterTokenStatusObserver());`
`41`		`- this.timerService`
	`41`	`+ return this.timerService`
`42`	`42`	`.get(() => this.checkTokenStatus(), this.TOKEN_CHECK_INTERVAL)`
`43`	`43`	`.subscribe(this.getClusterTokenStatusObserver());`
`44`	`44`	`}`