SERVER-9417 opReplicatedEnough should assert on step down

Conflicts:
	src/mongo/db/dbcommands.cpp

1 files changed, 7 insertions, 0 deletions

diff --git a/src/mongo/db/dbcommands.cpp b/src/mongo/db/dbcommands.cpp
index 8d1eec45eb0..9a1bfca0228 100644
--- a/src/mongo/db/dbcommands.cpp
+++ b/src/mongo/db/dbcommands.cpp
@@ -241,6 +241,13 @@ namespace mongo {
                         break;
                     }
 
+                    if ( !_isMaster() ) {
+                        // this should be in the while loop in case we step down
+                        errmsg = "not master";
+                        result.append( "wnote", "no longer primary" );
+                        return false;
+                    }
+
                     // check this first for w=0 or w=1
                     if ( opReplicatedEnough( op, e ) ) {
                         break;