Skip to content
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

Jump to bottom

NODE-2474: update equal server description #2260

Merged
merged 4 commits into from Mar 11, 2020
Merged

NODE-2474: update equal server description #2260

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7797088
fix: update server description when equal to keep client-tracked attr…
emadum Mar 9, 2020
88292ec
clean up
emadum Mar 9, 2020
de9cd2c
add spec test sdam/rs/repeated
emadum Mar 10, 2020
bb8b353
skip broken test
emadum Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 25 additions & 21 deletions lib/core/sdam/topology.js
View file
Open in desktop
Expand Up @@ -519,10 +519,10 @@ class Topology extends EventEmitter {
}

// If we already know all the information contained in this updated description, then
// we don't need to update anything or emit SDAM events
if (previousServerDescription && previousServerDescription.equals(serverDescription)) {
return;
}
// we don't need to emit SDAM events, but still need to update the description, in order
// to keep client-tracked attributes like last update time and round trip time up to date
const equalDescriptions =
previousServerDescription && previousServerDescription.equals(serverDescription);

// first update the TopologyDescription
this.s.description = this.s.description.update(serverDescription);
Expand All @@ -532,15 +532,17 @@ class Topology extends EventEmitter {
}

// emit monitoring events for this change
this.emit(
'serverDescriptionChanged',
new events.ServerDescriptionChangedEvent(
this.s.id,
serverDescription.address,
previousServerDescription,
this.s.description.servers.get(serverDescription.address)
)
);
if (!equalDescriptions) {
this.emit(
'serverDescriptionChanged',
new events.ServerDescriptionChangedEvent(
this.s.id,
serverDescription.address,
previousServerDescription,
this.s.description.servers.get(serverDescription.address)
)
);
}

// update server list from updated descriptions
updateServers(this, serverDescription);
Expand All @@ -550,14 +552,16 @@ class Topology extends EventEmitter {
processWaitQueue(this);
}

this.emit(
'topologyDescriptionChanged',
new events.TopologyDescriptionChangedEvent(
this.s.id,
previousTopologyDescription,
this.s.description
)
);
if (!equalDescriptions) {
this.emit(
'topologyDescriptionChanged',
new events.TopologyDescriptionChangedEvent(
this.s.id,
previousTopologyDescription,
this.s.description
)
);
}
}

auth(credentials, callback) {
Expand Down
140 changes: 140 additions & 0 deletions test/spec/server-discovery-and-monitoring/rs/repeated.json
View file
Open in desktop
@@ -0,0 +1,140 @@
{
"description": "Repeated ismaster response must be processed",
"uri": "mongodb://a,b/?replicaSet=rs",
"phases": [
{
"responses": [
[
"a:27017",
{
"ok": 1,
"ismaster": false,
"secondary": true,
"hidden": true,
"hosts": [
"a:27017",
"c:27017"
],
"setName": "rs",
"minWireVersion": 0,
"maxWireVersion": 6
}
]
],
"outcome": {
"servers": {
"a:27017": {
"type": "RSOther",
"setName": "rs"
},
"b:27017": {
"type": "Unknown"
},
"c:27017": {
"type": "Unknown"
}
},
"topologyType": "ReplicaSetNoPrimary",
"logicalSessionTimeoutMinutes": null,
"setName": "rs"
}
},
{
"responses": [
[
"c:27017",
{
"ok": 1,
"ismaster": true,
"minWireVersion": 0,
"maxWireVersion": 6
}
]
],
"outcome": {
"servers": {
"a:27017": {
"type": "RSOther",
"setName": "rs"
},
"b:27017": {
"type": "Unknown"
}
},
"topologyType": "ReplicaSetNoPrimary",
"logicalSessionTimeoutMinutes": null,
"setName": "rs"
}
},
{
"responses": [
[
"a:27017",
{
"ok": 1,
"ismaster": false,
"secondary": true,
"hidden": true,
"hosts": [
"a:27017",
"c:27017"
],
"setName": "rs",
"minWireVersion": 0,
"maxWireVersion": 6
}
]
],
"outcome": {
"servers": {
"a:27017": {
"type": "RSOther",
"setName": "rs"
},
"b:27017": {
"type": "Unknown"
},
"c:27017": {
"type": "Unknown"
}
},
"topologyType": "ReplicaSetNoPrimary",
"logicalSessionTimeoutMinutes": null,
"setName": "rs"
}
},
{
"responses": [
[
"c:27017",
{
"ok": 1,
"ismaster": true,
"hosts": [
"a:27017",
"c:27017"
],
"setName": "rs",
"minWireVersion": 0,
"maxWireVersion": 6
}
]
],
"outcome": {
"servers": {
"a:27017": {
"type": "RSOther",
"setName": "rs"
},
"c:27017": {
"type": "RSPrimary",
"setName": "rs"
}
},
"topologyType": "ReplicaSetWithPrimary",
"logicalSessionTimeoutMinutes": null,
"setName": "rs"
}
}
]
}
101 changes: 101 additions & 0 deletions test/spec/server-discovery-and-monitoring/rs/repeated.yml
View file
Open in desktop
@@ -0,0 +1,101 @@
description: Repeated ismaster response must be processed

uri: "mongodb://a,b/?replicaSet=rs"

phases:
# Phase 1 - a says it's not primary and suggests c may be the primary
- responses:
-
- "a:27017"
- ok: 1
ismaster: false
secondary: true
hidden: true
hosts: ["a:27017", "c:27017"]
setName: "rs"
minWireVersion: 0
maxWireVersion: 6
outcome:
servers:
"a:27017":
type: "RSOther"
setName: "rs"

"b:27017":
type: Unknown

"c:27017":
type: Unknown
topologyType: "ReplicaSetNoPrimary"
logicalSessionTimeoutMinutes: ~
setName: "rs"

# Phase 2 - c says it's a standalone, is removed
- responses:
-
- "c:27017"
- ok: 1
ismaster: true
minWireVersion: 0
maxWireVersion: 6
outcome:
servers:
"a:27017":
type: "RSOther"
setName: "rs"

"b:27017":
type: Unknown
topologyType: "ReplicaSetNoPrimary"
logicalSessionTimeoutMinutes: ~
setName: "rs"

# Phase 3 - response from a is repeated, and must be processed; c added again
- responses:
-
- "a:27017"
- ok: 1
ismaster: false
secondary: true
hidden: true
hosts: ["a:27017", "c:27017"]
setName: "rs"
minWireVersion: 0
maxWireVersion: 6
outcome:
servers:
"a:27017":
type: "RSOther"
setName: "rs"

"b:27017":
type: Unknown

"c:27017":
type: Unknown
topologyType: "ReplicaSetNoPrimary"
logicalSessionTimeoutMinutes: ~
setName: "rs"

# Phase 4 - c is now a primary
- responses:
-
- "c:27017"
- ok: 1
ismaster: true
hosts: ["a:27017", "c:27017"]
setName: "rs"
minWireVersion: 0
maxWireVersion: 6
outcome:
servers:
"a:27017":
type: "RSOther"
setName: "rs"

"c:27017":
type: RSPrimary
setName: rs
topologyType: "ReplicaSetWithPrimary"
logicalSessionTimeoutMinutes: ~
setName: "rs"