-
Notifications
You must be signed in to change notification settings - Fork 233
fix(connections): disconnect when we encounter a non-retryable error code on an atlas connection COMPASS-9793 #7316
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.
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
Open
johnjackweir
wants to merge
2
commits into
main
Choose a base branch
from
COMPASS-9793
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -1703,14 +1703,6 @@ const connectWithOptions = ( | |||||||||||||||||||||||||||||||||||||
return; | ||||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
// We're trying to optimise the initial Compass loading times here: to | ||||||||||||||||||||||||||||||||||||||
// make sure that the driver connection pool doesn't immediately get | ||||||||||||||||||||||||||||||||||||||
// overwhelmed with requests, we fetch instance info only once and then | ||||||||||||||||||||||||||||||||||||||
// pass it down to telemetry and instance model. This is a relatively | ||||||||||||||||||||||||||||||||||||||
// expensive dataService operation so we're trying to keep the usage | ||||||||||||||||||||||||||||||||||||||
// very limited | ||||||||||||||||||||||||||||||||||||||
const instanceInfo = await dataService.instance(); | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
let showedNonRetryableErrorToast = false; | ||||||||||||||||||||||||||||||||||||||
// Listen for non-retry-able errors on failed server heartbeats. | ||||||||||||||||||||||||||||||||||||||
// These can happen on compass web when: | ||||||||||||||||||||||||||||||||||||||
|
@@ -1781,6 +1773,14 @@ const connectWithOptions = ( | |||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
DataServiceForConnection.set(connectionInfo.id, dataService); | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
// We're trying to optimise the initial Compass loading times here: to | ||||||||||||||||||||||||||||||||||||||
// make sure that the driver connection pool doesn't immediately get | ||||||||||||||||||||||||||||||||||||||
// overwhelmed with requests, we fetch instance info only once and then | ||||||||||||||||||||||||||||||||||||||
// pass it down to telemetry and instance model. This is a relatively | ||||||||||||||||||||||||||||||||||||||
// expensive dataService operation so we're trying to keep the usage | ||||||||||||||||||||||||||||||||||||||
// very limited | ||||||||||||||||||||||||||||||||||||||
const instanceInfo = await dataService.instance(); | ||||||||||||||||||||||||||||||||||||||
Comment on lines
1774
to
+1782
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Either this should be before we store the dataService instance in a map, or we need to add explicit cleanup for it in the catch block below.
Suggested change
|
||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
try { | ||||||||||||||||||||||||||||||||||||||
await dispatch( | ||||||||||||||||||||||||||||||||||||||
saveConnectionInfo( | ||||||||||||||||||||||||||||||||||||||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know we're planning to add an e2e test for this, but it probably wouldn't hurt to add a comment also