Skip to content

Commit ceb58fe

Browse files
committed
SERVER-15854 Don't massert when checking for deleted shard
1 parent 73986ce commit ceb58fe

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/mongo/s/commands/cluster_remove_shard_cmd.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,11 @@ namespace {
100100

101101
const string target = cmdObj.firstElement().valuestrsafe();
102102

103-
Shard s = Shard::make(target);
104-
if (!grid.knowAboutShard(s.getConnString())) {
105-
errmsg = "unknown shard";
103+
Shard s = Shard::findIfExists(target);
104+
if (s == Shard::EMPTY) {
105+
errmsg = str::stream() << "shard '" << target << "'"
106+
<< " does not exist";
107+
log() << errmsg;
106108
return false;
107109
}
108110

0 commit comments

Comments
 (0)