summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <robert.newson@uk.ibm.com>2020-08-13 14:23:24 +0100
committerRobert Newson <robert.newson@uk.ibm.com>2020-08-14 16:48:27 +0100
commit06ab38d0c7607abeea7d63aeb47a5229fe0129da (patch)
tree150338116e8d9593823e4a851d4143be42be424c
parent22c0146d959bbd0365bd1d2e39808f65e143ebfc (diff)
downloadcouchdb-couch_index_server_crash2-3.x.tar.gz
Don't crash couch_index_server if the db isn't known yetcouch_index_server_crash2-3.x
If a ddoc is added immediately after database creation (_users and _replicator when couchdb is used in a multi-tenant fashion), we can crash couch_index_server in handle_db_event, as mem3_shards:local throws an error.
-rw-r--r--src/couch_index/src/couch_index_server.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/couch_index/src/couch_index_server.erl b/src/couch_index/src/couch_index_server.erl
index 67f0f8c6f..6bebff2d8 100644
--- a/src/couch_index/src/couch_index_server.erl
+++ b/src/couch_index/src/couch_index_server.erl
@@ -284,7 +284,11 @@ handle_db_event(<<"shards/", _/binary>> = DbName, {ddoc_updated,
DDocResult = couch_util:with_db(DbName, fun(Db) ->
couch_db:open_doc(Db, DDocId, [ejson_body, ?ADMIN_CTX])
end),
- DbShards = [mem3:name(Sh) || Sh <- mem3:local_shards(mem3:dbname(DbName))],
+ LocalShards = try mem3:local_shards(mem3:dbname(DbName))
+ catch error:database_does_not_exist ->
+ []
+ end,
+ DbShards = [mem3:name(Sh) || Sh <- LocalShards],
lists:foreach(fun(DbShard) ->
lists:foreach(fun({_DbShard, {_DDocId, Sig}}) ->
% check if there are other ddocs with the same Sig for the same db