summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl.cpp
diff options
context:
space:
mode:
authorEric Milkie <milkie@10gen.com>2012-07-23 11:29:17 -0400
committerEric Milkie <milkie@10gen.com>2012-07-23 11:29:20 -0400
commite40c25fc61b0c3db0d6fdfab414ad5d0e5da4d19 (patch)
tree16e9091334374a1118fce8610b0915f8f4df1063 /src/mongo/db/repl.cpp
parentf1564284ba6c5801bc9b6e6d9f8299605725a715 (diff)
downloadmongo-e40c25fc61b0c3db0d6fdfab414ad5d0e5da4d19.tar.gz
SERVER-6492 isMaster() no longer hangs on a REMOVED node
Diffstat (limited to 'src/mongo/db/repl.cpp')
-rw-r--r--src/mongo/db/repl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/repl.cpp b/src/mongo/db/repl.cpp
index 800cdaabdab..8520d3fe674 100644
--- a/src/mongo/db/repl.cpp
+++ b/src/mongo/db/repl.cpp
@@ -148,7 +148,7 @@ namespace mongo {
void appendReplicationInfo( BSONObjBuilder& result , bool authed , int level ) {
if ( replSet ) {
- if( theReplSet == 0 ) {
+ if( theReplSet == 0 || theReplSet->state().shunned() ) {
result.append("ismaster", false);
result.append("secondary", false);
result.append("info", ReplSet::startupStatusMsg.get());