diff options
| author | Andy Schwerin <schwerin@mongodb.com> | 2015-05-27 19:36:59 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@mongodb.com> | 2015-06-05 14:21:56 -0400 |
| commit | 51c2064d518140fbeae62f9d7ba29f1d69fb530f (patch) | |
| tree | b6d97eb91b4ac76279eb983234c6ec63ac44a8c6 /src/mongo/s/d_migrate.cpp | |
| parent | 1cf11a282870c26ce7d963fb3a6c3329b39d90a2 (diff) | |
| download | mongo-51c2064d518140fbeae62f9d7ba29f1d69fb530f.tar.gz | |
SERVER-18277 Stronger locking rules for CurOp and OpDebug.
Diffstat (limited to 'src/mongo/s/d_migrate.cpp')
| -rw-r--r-- | src/mongo/s/d_migrate.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp index 82b25e9eb13..24985dd4f81 100644 --- a/src/mongo/s/d_migrate.cpp +++ b/src/mongo/s/d_migrate.cpp @@ -191,10 +191,10 @@ namespace { const string s = str::stream() << "step " << step << " of " << _total; CurOp * op = CurOp::get(_txn); - if (op) - op->setMessage(s.c_str()); - else - warning() << "op is null in MoveTimingHelper::done" << migrateLog; + { + stdx::lock_guard<Client> lk(*_txn->getClient()); + op->setMessage_inlock(s.c_str()); + } _b.appendNumber(s, _t.millis()); _t.reset(); |