SERVER-15854 Use ShardNotFound error code for deleted shard

1 files changed, 6 insertions, 4 deletions

diff --git a/src/mongo/s/commands/cluster_remove_shard_cmd.cpp b/src/mongo/s/commands/cluster_remove_shard_cmd.cpp
index 4e38a7bc9ac..d50dec231ac 100644
--- a/src/mongo/s/commands/cluster_remove_shard_cmd.cpp
+++ b/src/mongo/s/commands/cluster_remove_shard_cmd.cpp
@@ -102,10 +102,12 @@ namespace {
 
             Shard s = Shard::findIfExists(target);
             if (s == Shard::EMPTY) {
-                errmsg = str::stream() << "shard '" << target << "'"
-                                       << " does not exist";
-                log() << errmsg;
-                return false;
+                string msg(str::stream() <<
+                           "Could not drop shard '" << target <<
+                           "' because it does not exist");
+                log() << msg;
+                return appendCommandStatus(result,
+                                           Status(ErrorCodes::ShardNotFound, msg));
             }
 
             ScopedDbConnection conn(configServer.getPrimary().getConnString(), 30);