diff options
| author | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2021-05-25 01:45:11 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-05-25 02:19:35 +0000 |
| commit | c6ebe28e7ed60bdb8675204144bbb765891a4ca2 (patch) | |
| tree | 1116a5ff942df1164af7f41d3393b181415ac3d8 /src/mongo | |
| parent | c9658dab44272cdc6e8cb949b81f8fae1288b4e8 (diff) | |
| download | mongo-c6ebe28e7ed60bdb8675204144bbb765891a4ca2.tar.gz | |
Revert "SERVER-56950 Avoid shardRegistry reload infinite loop when overlapping with setFCV"
This reverts commit 5ffdb69a0d691549c0d6cd780c2d8be238e588a6.
Diffstat (limited to 'src/mongo')
| -rw-r--r-- | src/mongo/s/client/shard_registry.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/mongo/s/client/shard_registry.h b/src/mongo/s/client/shard_registry.h index 488b3edea95..6fc5f866322 100644 --- a/src/mongo/s/client/shard_registry.h +++ b/src/mongo/s/client/shard_registry.h @@ -349,13 +349,7 @@ private: return !(*this == other); } bool operator>(const Time& other) const { - // SERVER-56950: When setFCV(v4.4) overlaps with a ShardRegistry reload, - // the ShardRegistry can fall into an infinite loop of lookups - if ((!topologyTime.isNull() && !other.topologyTime.isNull()) && - (topologyTime > other.topologyTime)) { - return true; - } - return rsmIncrement > other.rsmIncrement || + return topologyTime > other.topologyTime || rsmIncrement > other.rsmIncrement || forceReloadIncrement > other.forceReloadIncrement; } bool operator>=(const Time& other) const { |