Skip to content

Commit 030a453

Browse files
authored
Merge pull request #17733 from richard-cox/fix-load-cluster-delay-clean
Fix delay when navigating to a cluster
2 parents 020b4a0 + b294932 commit 030a453

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

shell/plugins/steve/subscribe.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,10 @@ const sharedActions = {
469469
const worker = (this.$workers || {})[getters.storeName];
470470

471471
if (worker) {
472+
const storeName = getters.storeName;
473+
472474
worker.postMessage({ destroyWorker: true }); // we're only passing the boolean here because the key needs to be something truthy to ensure it's passed on the object.
473-
cleanupTasks.push(waitFor(() => !this.$workers[getters.storeName], 'Worker is destroyed'));
475+
cleanupTasks.push(waitFor(() => !this.$workers?.[storeName], 'Worker to be destroyed', 30000, 10, true));
474476
}
475477

476478
if ( socket ) {

shell/store/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,6 +1041,8 @@ export const actions = {
10411041
// This is a workaround for a timing issue where the mgmt cluster schema may not be available
10421042
// Try and wait until the schema exists before proceeding
10431043
await dispatch('management/waitForSchema', { type: MANAGEMENT.CLUSTER });
1044+
// Similarly to above, we somehow get here without everything in management land being ready. FF needed to determine pagination state
1045+
await dispatch('management/waitForHaveAll', { type: MANAGEMENT.FEATURE });
10441046

10451047
// If SSP is on we won't have requested all clusters
10461048
if (!paginateClusters({ rootGetters, state })) {

0 commit comments

Comments
 (0)