Skip to content

Fix delay when navigating to a cluster #17733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richard-cox merged 2 commits into from
May 21, 2026
Merged

Fix delay when navigating to a cluster #17733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f0b99e
Reduce lag from home --> explorer, plus refresh in explorer
richard-cox May 19, 2026
b294932
fix unit test
richard-cox May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions shell/components/nav/__tests__/TopLevelMenu.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,13 +727,13 @@ describe('topLevelMenu', () => {
nameDisplay: 'cluster1',
id: 'an-id1',
mgmt: { id: 'an-id1' },
isReady: true
Copy link
Copy Markdown
Member Author

@richard-cox richard-cox May 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these are changes already in via #17739

canExplore: true
},
{
nameDisplay: 'cluster2',
id: 'an-id2',
mgmt: { id: 'an-id2' },
isReady: true
canExplore: true
}
])
}
Expand Down Expand Up @@ -786,7 +786,7 @@ describe('topLevelMenu', () => {
nameDisplay: 'cluster1',
id: 'an-id1',
mgmt: { id: 'an-id1' },
isReady: true
canExplore: true
}
]);

Expand Down Expand Up @@ -814,7 +814,7 @@ describe('topLevelMenu', () => {
nameDisplay: 'cluster1',
id: 'an-id1',
mgmt: { id: 'an-id1' },
isReady: true
canExplore: true
}
]);

Expand Down
4 changes: 3 additions & 1 deletion shell/plugins/steve/subscribe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,8 +469,10 @@ const sharedActions = {
const worker = (this.$workers || {})[getters.storeName];

if (worker) {
const storeName = getters.storeName;

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.
cleanupTasks.push(waitFor(() => !this.$workers[getters.storeName], 'Worker is destroyed'));
cleanupTasks.push(waitFor(() => !this.$workers?.[storeName], 'Worker to be destroyed', 30000, 10, true));
Copy link
Copy Markdown
Member Author

@richard-cox richard-cox May 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i've made the check

  • safer given $workers and getter might get nuked
  • limited to 30 seconds, it really shouldn't take that long
  • check every 10ms
  • log activity (which will help in future)

}

if ( socket ) {
Expand Down
2 changes: 2 additions & 0 deletions shell/store/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,6 +1041,8 @@ export const actions = {
// This is a workaround for a timing issue where the mgmt cluster schema may not be available
// Try and wait until the schema exists before proceeding
await dispatch('management/waitForSchema', { type: MANAGEMENT.CLUSTER });
// Similarly to above, we somehow get here without everything in management land being ready. FF needed to determine pagination state
await dispatch('management/waitForHaveAll', { type: MANAGEMENT.FEATURE });

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