-
Notifications
You must be signed in to change notification settings - Fork 207
NODEJS-681: ControlConnection Concurrent Read and Write on .host and .connection #462
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
base: trunk
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -87,6 +87,7 @@ class ControlConnection extends events.EventEmitter { | |
| this._addressTranslator = this.options.policies.addressResolution; | ||
| this._reconnectionPolicy = this.options.policies.reconnection; | ||
| this._reconnectionSchedule = this._reconnectionPolicy.newSchedule(); | ||
| this._refreshInProgress = false; | ||
| this._isShuttingDown = false; | ||
|
|
||
| // Reference to the encoder of the last valid connection | ||
|
|
@@ -216,7 +217,6 @@ class ControlConnection extends events.EventEmitter { | |
|
|
||
| _setHealthListeners(host, connection) { | ||
| const self = this; | ||
| let wasRefreshCalled = 0; | ||
|
|
||
| function removeListeners() { | ||
| host.removeListener('down', downOrIgnoredHandler); | ||
|
|
@@ -225,11 +225,6 @@ class ControlConnection extends events.EventEmitter { | |
| } | ||
|
|
||
| function startReconnecting(hostDown) { | ||
| if (wasRefreshCalled++ !== 0) { | ||
| // Prevent multiple calls to reconnect | ||
| return; | ||
| } | ||
|
|
||
| removeListeners(); | ||
|
|
||
| if (self._isShuttingDown) { | ||
|
|
@@ -446,13 +441,31 @@ class ControlConnection extends events.EventEmitter { | |
| } | ||
|
|
||
| /** | ||
| * Acquires a new connection and refreshes topology and keyspace metadata. | ||
| * Acquires a new connection and refreshes topology and keyspace metadata, with protection against concurrent refreshes. | ||
| * <p>When it fails obtaining a connection and there aren't any more hosts, it schedules reconnection.</p> | ||
| * <p>When it fails obtaining the metadata, it marks connection and/or host unusable and retries using the same | ||
| * iterator from query plan / host list</p> | ||
| * @param {Iterator<Host>} [hostIterator] | ||
| */ | ||
| async _refresh(hostIterator) { | ||
| if (this._refreshInProgress) { | ||
| return; | ||
|
Author
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. returning an auto-resolving promise here would defer the _refresh call to the microtask queue which may or may not open a hole for a race condition–I haven't checked. I don't think it's necessary to return one, but if we do, it's definitely something that needs to be done with at least a little caution |
||
| } | ||
| this._refreshInProgress = true; | ||
|
|
||
| try { | ||
| return await this._unsafeDoRefresh(hostIterator); | ||
| } finally { | ||
| this._refreshInProgress = false; | ||
| } | ||
|
toptobes marked this conversation as resolved.
|
||
| } | ||
|
|
||
| /** | ||
| * The actual implementation of the refresh logic, without protection against concurrent executions. | ||
| * <p>Should only be used via _refresh.</p> | ||
| * @param {Iterator<Host>} [hostIterator] | ||
| */ | ||
| async _unsafeDoRefresh(hostIterator) { | ||
| if (this._isShuttingDown) { | ||
| this.log('info', 'The ControlConnection will not be refreshed as the Client is being shutdown'); | ||
| return; | ||
|
|
@@ -499,7 +512,7 @@ class ControlConnection extends events.EventEmitter { | |
| } | ||
|
|
||
| // Retry the whole thing with the same query plan | ||
| return await this._refresh(hostIterator); | ||
| return await this._unsafeDoRefresh(hostIterator); | ||
| } | ||
|
|
||
| this._reconnectionSchedule = this._reconnectionPolicy.newSchedule(); | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -149,7 +149,7 @@ function times(count, limit, fn) { | |
| * @returns {undefined} | ||
| */ | ||
| function toBackground(promise) { | ||
| promise.catch(() => {}); | ||
| promise?.catch(() => {}); | ||
|
Author
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. not sure if it's this package's responsibility to deal with the fact that the promise can be null 🤷 |
||
| } | ||
|
|
||
| /** | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -153,6 +153,25 @@ describe('ControlConnection', function () { | |
| assert.strictEqual(cc.hosts.length, 1); | ||
| }); | ||
|
|
||
| it('should not break when refreshing concurrently', async () => { | ||
|
Author
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. may need a better heuristic for ensuring the refreshes are okay... not sure... I just "borrowed" this from Jane's original PR |
||
| const cc = newInstance(); | ||
| cc.options.policies.loadBalancing = new policies.loadBalancing.RoundRobinPolicy(); | ||
| disposeAfter(cc); | ||
|
|
||
| await cc.init(); | ||
| await new Promise(r => cc.options.policies.loadBalancing.init(null, cc.hosts, r)); | ||
|
|
||
| const refreshPromises = []; | ||
| // randomly emit cc._refresh 100 times | ||
| for (let i = 0; i < 100; i++) { | ||
| refreshPromises.push(cc._refresh()); | ||
| await helper.delayAsync(~~(Math.random() * 100)); | ||
| } | ||
| await Promise.all(refreshPromises); | ||
|
Comment on lines
+164
to
+170
Contributor
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. Copilot's suggestion won't work. If the
Contributor
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. And although my test can be unreliable, false test failures won't happen. |
||
| assert.ok(cc.host); | ||
| assert.ok(cc.connection); | ||
| }); | ||
|
|
||
| it('should reconnect when host used goes down', async () => { | ||
| const options = clientOptions.extend( | ||
| utils.extend({ pooling: helper.getPoolingOptions(1, 1, 500) }, helper.baseOptions)); | ||
|
|
||
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.
this conditional in
_refresh()logs if true... should it also log here or no?