diff options
| author | Matt Kangas <matt.kangas@mongodb.com> | 2014-10-30 10:24:53 -0400 |
|---|---|---|
| committer | Matt Kangas <matt.kangas@mongodb.com> | 2014-10-30 13:55:36 -0400 |
| commit | 4f95fb4b9131e2bea07be0cf8257c2059a063c3e (patch) | |
| tree | c88d70052b745d55b9d057fcd483e07846c4ec31 /src | |
| parent | 8c3db8a30473348ec3cf1aed77bded1a5ef1dfa8 (diff) | |
| download | mongo-4f95fb4b9131e2bea07be0cf8257c2059a063c3e.tar.gz | |
SERVER-15873 massert trace not needed when splitAndMove fails
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/s/chunk.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mongo/s/chunk.cpp b/src/mongo/s/chunk.cpp index 530e696ede2..ce3ce560e2b 100644 --- a/src/mongo/s/chunk.cpp +++ b/src/mongo/s/chunk.cpp @@ -156,14 +156,14 @@ namespace mongo { BSONObj res; WriteConcernOptions noThrottle; - massert(10412, - str::stream() << "moveAndCommit failed: " << res, - toMove->moveAndCommit(newLocation, - Chunk::MaxChunkSize, - &noThrottle, /* secondaryThrottle */ - false, /* waitForDelete - small chunk, no need */ - 0, /* maxTimeMS - don't time out */ - res)); + if (!toMove->moveAndCommit(newLocation, + Chunk::MaxChunkSize, + &noThrottle, /* secondaryThrottle */ + false, /* waitForDelete - small chunk, no need */ + 0, /* maxTimeMS - don't time out */ + res)) { + msgassertedNoTrace(10412, str::stream() << "moveAndCommit failed: " << res); + } // update our config manager.reload(); |