diff options
| author | LaMont Nelson <lamont.nelson@mongodb.com> | 2021-10-05 14:40:18 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-10-05 16:24:00 +0000 |
| commit | c5b030f1235b9a8340c0a30181c6104500f15eb3 (patch) | |
| tree | 60b03c0e89e1c837e9b5cf72578fd0ce5ae2c875 | |
| parent | 5a6bcdf77dc1769e2542cb16957fb69073306d03 (diff) | |
| download | mongo-c5b030f1235b9a8340c0a30181c6104500f15eb3.tar.gz | |
SERVER-60421 raise the log level when removing nodes from sdam topology or ignoring messages
4 files changed, 9 insertions, 8 deletions
diff --git a/jstests/multiVersion/genericSetFCVUsage/rsm_topology_change_fcv.js b/jstests/multiVersion/genericSetFCVUsage/rsm_topology_change_fcv.js index 02b83454000..07f2a4b6c10 100644 --- a/jstests/multiVersion/genericSetFCVUsage/rsm_topology_change_fcv.js +++ b/jstests/multiVersion/genericSetFCVUsage/rsm_topology_change_fcv.js @@ -12,7 +12,7 @@ function makeTopologyChangeLogMsgRegex(rs, minWireVersion, maxWireVersion) { return new RegExp( `Topology Change.*${rs.name}` + - `.*minWireVersion: ${minWireVersion}.*maxWireVersion: ${maxWireVersion}`.repeat( + `.*minWireVersion":${minWireVersion}.*maxWireVersion":${maxWireVersion}`.repeat( rs.nodes.length)); } diff --git a/jstests/noPassthrough/rsm_horizon_change.js b/jstests/noPassthrough/rsm_horizon_change.js index 8944e41f705..d573a056f74 100644 --- a/jstests/noPassthrough/rsm_horizon_change.js +++ b/jstests/noPassthrough/rsm_horizon_change.js @@ -10,9 +10,9 @@ const st = new ShardingTest( const configRSPrimary = st.configRS.getPrimary(); const unknownTopologyChangeRegex = new RegExp( - `Topology Change.*${st.configRS.name}.*topologyType:.*ReplicaSetNoPrimary.*type:.*Unknown`); -const knownTopologyChangeRegex = new RegExp( - `Topology Change.*${st.configRS.name}.*topologyType:.*ReplicaSetWithPrimary.*type:.*RSPrimary`); + `Topology Change.*${st.configRS.name}.*topologyType":.*ReplicaSetNoPrimary.*type":.*Unknown`); +const knownTopologyChangeRegex = new RegExp(`Topology Change.*${ + st.configRS.name}.*topologyType":.*ReplicaSetWithPrimary.*type":.*RSPrimary`); const expeditedMonitoringAfterNetworkErrorRegex = new RegExp(`RSM monitoring host in expedited mode until we detect a primary`); const unknownServerDescriptionRegex = diff --git a/src/mongo/client/sdam/topology_state_machine.cpp b/src/mongo/client/sdam/topology_state_machine.cpp index 4aa91d07637..0f092b8b208 100644 --- a/src/mongo/client/sdam/topology_state_machine.cpp +++ b/src/mongo/client/sdam/topology_state_machine.cpp @@ -36,7 +36,7 @@ namespace mongo::sdam { namespace { -static constexpr auto kLogLevel = 2; +static constexpr auto kLogLevel = 0; } // namespace TopologyStateMachine::TopologyStateMachine(const SdamConfiguration& config) : _config(config) { @@ -385,7 +385,8 @@ void TopologyStateMachine::removeServerDescription(TopologyDescription& topology kLogLevel, "Server '{serverAddress}' was removed from the topology", "Server was removed from the topology", - "serverAddress"_attr = serverAddress); + "serverAddress"_attr = serverAddress, + "topologyDescription"_attr = topologyDescription.toBSON()); } void TopologyStateMachine::modifyTopologyType(TopologyDescription& topologyDescription, diff --git a/src/mongo/client/streamable_replica_set_monitor.cpp b/src/mongo/client/streamable_replica_set_monitor.cpp index 86d08e595db..1448862124b 100644 --- a/src/mongo/client/streamable_replica_set_monitor.cpp +++ b/src/mongo/client/streamable_replica_set_monitor.cpp @@ -689,8 +689,8 @@ void StreamableReplicaSetMonitor::onTopologyDescriptionChangedEvent( "RSM {replicaSet} Topology Change: {newTopologyDescription}", "RSM Topology Change", "replicaSet"_attr = getName(), - "newTopologyDescription"_attr = newDescription->toString(), - "previousTopologyDescription"_attr = previousDescription->toString()); + "newTopologyDescription"_attr = newDescription->toBSON(), + "previousTopologyDescription"_attr = previousDescription->toBSON()); auto maybePrimary = newDescription->getPrimary(); if (maybePrimary) { |