diff options
Diffstat (limited to 'src/mongo/s/catalog/legacy/distlock.cpp')
| -rw-r--r-- | src/mongo/s/catalog/legacy/distlock.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mongo/s/catalog/legacy/distlock.cpp b/src/mongo/s/catalog/legacy/distlock.cpp index 01d3b9b005a..d55e7cb87b7 100644 --- a/src/mongo/s/catalog/legacy/distlock.cpp +++ b/src/mongo/s/catalog/legacy/distlock.cpp @@ -169,7 +169,7 @@ namespace mongo { bool success = false; BSONObj result; string errMsg; - long long delay = 0; + Milliseconds delay{0}; scoped_ptr<ScopedDbConnection> connPtr; try { @@ -204,7 +204,7 @@ namespace mongo { // Make sure that our delay is not more than 2x our maximum network skew, since this is the max our remote // time value can be off by if we assume a response in the middle of the delay. - if ( delay > (long long) ( maxNetSkew * 2 ) ) { + if (delay > Milliseconds(maxNetSkew * 2)) { throw TimeNotFoundException( str::stream() << "server " << server.toString() << " in cluster " << cluster.toString() @@ -245,9 +245,10 @@ namespace mongo { // Remote time can be delayed by at most MAX_NET_SKEW // Skew is how much time we'd have to add to local to get to remote - avgSkews[s] += (long long) (remote - local); + avgSkews[s] += (remote - local).count(); - LOG( logLvl + 1 ) << "skew from remote server " << server << " found: " << (long long) (remote - local) << endl; + LOG( logLvl + 1 ) << "skew from remote server " << server << " found: " + << (remote - local).count(); } } @@ -387,7 +388,7 @@ namespace mongo { LOG( logLvl ) << "empty ping found for process in lock '" << lockName << "'" << endl; // TODO: Using 0 as a "no time found" value Will fail if dates roll over, but then, so will a lot. lastPing = BSON( LockpingsType::process(o[LocksType::process()].String()) << - LockpingsType::ping((Date_t) 0) ); + LockpingsType::ping(Date_t()) ); } unsigned long long elapsed = 0; @@ -422,7 +423,7 @@ namespace mongo { if(_lastPingCheck.remote >= remote) elapsed = 0; else - elapsed = remote - _lastPingCheck.remote; + elapsed = (remote - _lastPingCheck.remote).count(); } } catch( LockException& e ) { |