diff options
| author | Martin Bligh <mbligh@mongodb.com> | 2015-11-11 17:01:03 -0500 |
|---|---|---|
| committer | Martin Bligh <mbligh@mongodb.com> | 2015-11-11 17:01:03 -0500 |
| commit | 5dd9558ed687faa62037cd0f9774a7bd45c62b84 (patch) | |
| tree | d781826b203621e59354db824bcce15262daca67 /src/mongo/db/instance.cpp | |
| parent | 273aca8cdff4e23f62244b2537b72a12269b6370 (diff) | |
| download | mongo-5dd9558ed687faa62037cd0f9774a7bd45c62b84.tar.gz | |
SERVER-21276: Fix various issues with top
Diffstat (limited to 'src/mongo/db/instance.cpp')
| -rw-r--r-- | src/mongo/db/instance.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp index bc6481410f1..4506a1f6a14 100644 --- a/src/mongo/db/instance.cpp +++ b/src/mongo/db/instance.cpp @@ -413,7 +413,7 @@ void assembleResponse(OperationContext* txn, DbResponse& dbresponse, const HostAndPort& remote) { // before we lock... - Operation op = m.operation(); + NetworkOp op = m.operation(); bool isCommand = false; DbMessage dbmsg(m); @@ -496,7 +496,7 @@ void assembleResponse(OperationContext* txn, // Commands handling code will reset this if the operation is a command // which is logically a basic CRUD operation like query, insert, etc. currentOp.setNetworkOp_inlock(op); - currentOp.setLogicalOp_inlock(op); + currentOp.setLogicalOp_inlock(networkOpToLogicalOp(op)); } OpDebug& debug = currentOp.debug(); @@ -558,7 +558,7 @@ void assembleResponse(OperationContext* txn, uassert(18663, str::stream() << "legacy writeOps not longer supported for " << "versioned connections, ns: " << nsString.ns() - << ", op: " << opToString(op) + << ", op: " << networkOpToString(op) << ", remote: " << remote.toString(), connInfo == NULL); } @@ -577,13 +577,15 @@ void assembleResponse(OperationContext* txn, } } catch (const UserException& ue) { LastError::get(c).setLastError(ue.getCode(), ue.getInfo().msg); - MONGO_LOG_COMPONENT(3, responseComponent) << " Caught Assertion in " << opToString(op) - << ", continuing " << ue.toString() << endl; + MONGO_LOG_COMPONENT(3, responseComponent) << " Caught Assertion in " + << networkOpToString(op) << ", continuing " + << ue.toString() << endl; debug.exceptionInfo = ue.getInfo(); } catch (const AssertionException& e) { LastError::get(c).setLastError(e.getCode(), e.getInfo().msg); - MONGO_LOG_COMPONENT(3, responseComponent) << " Caught Assertion in " << opToString(op) - << ", continuing " << e.toString() << endl; + MONGO_LOG_COMPONENT(3, responseComponent) << " Caught Assertion in " + << networkOpToString(op) << ", continuing " + << e.toString() << endl; debug.exceptionInfo = e.getInfo(); shouldLog = true; } |