diff options
| author | Jason Rassi <rassi@10gen.com> | 2015-08-24 18:41:15 -0400 |
|---|---|---|
| committer | Jason Rassi <rassi@10gen.com> | 2015-08-26 14:21:20 -0400 |
| commit | 2abbaa67383f64d8b5e6cd747c5b0abf5f370335 (patch) | |
| tree | 4b009b3e30a14abf6ebe305286311972944dca68 | |
| parent | d83a5c1fa203ce12cf813a99ff3660c9bcce265d (diff) | |
| download | mongo-2abbaa67383f64d8b5e6cd747c5b0abf5f370335.tar.gz | |
SERVER-17886 Don't call Request::getns() if message doesn't include ns
(cherry picked from commit 32eb4dbe6fb78f7697f72b1406f1d8efaaedd378)
| -rw-r--r-- | src/mongo/s/request.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/s/request.h | 3 | ||||
| -rw-r--r-- | src/mongo/s/server.cpp | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/mongo/s/request.cpp b/src/mongo/s/request.cpp index 25219eb0893..ccaca188db1 100644 --- a/src/mongo/s/request.cpp +++ b/src/mongo/s/request.cpp @@ -90,7 +90,7 @@ namespace mongo { int msgId = (int)(_m.header()->id); Timer t; - LOG(3) << "Request::process begin ns: " << getns() + LOG(3) << "Request::process begin ns: " << getnsIfPresent() << " msg id: " << msgId << " op: " << op << " attempt: " << attempt @@ -130,7 +130,7 @@ namespace mongo { // globalOpCounters are handled by write commands. } - LOG(3) << "Request::process end ns: " << getns() + LOG(3) << "Request::process end ns: " << getnsIfPresent() << " msg id: " << msgId << " op: " << op << " attempt: " << attempt diff --git a/src/mongo/s/request.h b/src/mongo/s/request.h index a8230f36b4c..97107bf29d9 100644 --- a/src/mongo/s/request.h +++ b/src/mongo/s/request.h @@ -52,6 +52,9 @@ namespace mongo { const char * getns() const { return _d.getns(); } + const char* getnsIfPresent() const { + return _d.messageShouldHaveNs() ? _d.getns() : ""; + } int op() const { return _m.operation(); } diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp index 9c4f2acea2c..787fbd64c80 100644 --- a/src/mongo/s/server.cpp +++ b/src/mongo/s/server.cpp @@ -145,7 +145,7 @@ namespace mongo { LOG( ex.isUserAssertion() ? 1 : 0 ) << "Assertion failed" << " while processing " << opToString( m.operation() ) << " op" - << " for " << r.getns() << causedBy( ex ) << endl; + << " for " << r.getnsIfPresent() << causedBy( ex ) << endl; if ( r.expectResponse() ) { m.header()->id = r.id(); @@ -159,7 +159,7 @@ namespace mongo { log() << "Exception thrown" << " while processing " << opToString( m.operation() ) << " op" - << " for " << r.getns() << causedBy( ex ) << endl; + << " for " << r.getnsIfPresent() << causedBy( ex ) << endl; if ( r.expectResponse() ) { m.header()->id = r.id(); |