SERVER-7775 refactor fsyncUnlock to execute through standard command path

1 files changed, 8 insertions, 1 deletions

diff --git a/src/mongo/shell/db.js b/src/mongo/shell/db.js
index 48e086ad9f6..9a6c5399067 100644
--- a/src/mongo/shell/db.js
+++ b/src/mongo/shell/db.js
@@ -975,7 +975,14 @@ DB.prototype.fsyncLock = function() {
 }
 
 DB.prototype.fsyncUnlock = function() {
-    return this.getSiblingDB("admin").$cmd.sys.unlock.findOne()
+    var res = this.adminCommand({fsyncUnlock: 1});
+    if (!res.ok &&
+        // handle both error messages for nonexistent command...
+        (res.errmsg.startsWith("no such cmd") || res.errmsg.startsWith("no such command"))) {
+        // fallback for old servers
+        res = this.getSiblingDB("admin").$cmd.sys.unlock.findOne();
+    }
+    return res;
 }
 
 DB.autocomplete = function(obj){