diff options
| author | matt dannenberg <matt.dannenberg@10gen.com> | 2015-08-26 06:15:12 -0400 |
|---|---|---|
| committer | matt dannenberg <matt.dannenberg@10gen.com> | 2015-08-26 06:15:12 -0400 |
| commit | 9142f3304aaf4585799c25706ece0cd135f83d13 (patch) | |
| tree | 3737252c6dc007cbdb77ebfb3940d46a6e07e76b /src/mongo | |
| parent | f9deff7cc32e9705fe26272e398cb19d9c93a2a9 (diff) | |
| download | mongo-9142f3304aaf4585799c25706ece0cd135f83d13.tar.gz | |
SERVER-20052 fix linter
Diffstat (limited to 'src/mongo')
| -rw-r--r-- | src/mongo/db/db_raii.cpp | 6 | ||||
| -rw-r--r-- | src/mongo/db/repl/replication_coordinator_impl.cpp | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/mongo/db/db_raii.cpp b/src/mongo/db/db_raii.cpp index 5a0c9f964bd..0363b62cd3a 100644 --- a/src/mongo/db/db_raii.cpp +++ b/src/mongo/db/db_raii.cpp @@ -114,7 +114,7 @@ AutoGetCollectionForRead::AutoGetCollectionForRead(OperationContext* txn, Locker::LockSnapshot lockStateBackup; massert(28795, str::stream() << "Unable to yield to wait for readConcern=majority " - << "snapshot to be available for " << nss.ns(), + << "snapshot to be available for " << nss.ns(), locker->saveLockStateAndUnlock(&lockStateBackup)); ON_BLOCK_EXIT([&]() { locker->restoreLockState(lockStateBackup); }); @@ -123,9 +123,7 @@ AutoGetCollectionForRead::AutoGetCollectionForRead(OperationContext* txn, repl::ReplicationCoordinator::get(_txn)->waitForNewSnapshot(_txn); Status status = _txn->recoveryUnit()->setReadFromMajorityCommittedSnapshot(); - uassert(28786, - "failed to set read from majority-committed snapshot", - status.isOK()); + uassert(28786, "failed to set read from majority-committed snapshot", status.isOK()); mySnapshot = _txn->recoveryUnit()->getMajorityCommittedSnapshot(); } diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp index 992481d4b97..ea65e908ed6 100644 --- a/src/mongo/db/repl/replication_coordinator_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl.cpp @@ -828,8 +828,9 @@ ReadConcernResponse ReplicationCoordinatorImpl::waitUntilOpTime(OperationContext stdx::unique_lock<stdx::mutex> lock(_mutex); bool isMajorityReadConcern = settings.getLevel() == ReadConcernLevel::kMajorityReadConcern; if (isMajorityReadConcern && !_externalState->snapshotsEnabled()) { - return ReadConcernResponse(Status(ErrorCodes::CommandNotSupported, - "Current storage engine does not support majority readConcerns")); + return ReadConcernResponse( + Status(ErrorCodes::CommandNotSupported, + "Current storage engine does not support majority readConcerns")); } auto loopCondition = [this, isMajorityReadConcern, ts] { |