diff options
| author | Robert Newson <rnewson@apache.org> | 2020-08-12 12:05:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-12 12:05:44 +0100 |
| commit | 613311faf1b83030ddf2a70db6187b87c0f32ec2 (patch) | |
| tree | 8777196648de95b99ec09d3e6e99716562810a75 | |
| parent | 625698d86fa366af490c27d6641cad313d65b97a (diff) | |
| parent | 90cd1ef8b24ccb23a1d873cad903adeeffa6870a (diff) | |
| download | couchdb-613311faf1b83030ddf2a70db6187b87c0f32ec2.tar.gz | |
Merge pull request #3071 from apache/couch_index_server_crash-3.x
Unlink index pid and swallow EXIT message if present
| -rw-r--r-- | src/couch_index/src/couch_index_server.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/couch_index/src/couch_index_server.erl b/src/couch_index/src/couch_index_server.erl index 49d1e61b7..67f0f8c6f 100644 --- a/src/couch_index/src/couch_index_server.erl +++ b/src/couch_index/src/couch_index_server.erl @@ -243,9 +243,15 @@ reset_indexes(DbName, Root) -> end, dict:new(), ets:lookup(?BY_DB, DbName)), Fun = fun({Sig, DDocIds}) -> [{_, Pid}] = ets:lookup(?BY_SIG, {DbName, Sig}), - MRef = erlang:monitor(process, Pid), + unlink(Pid), gen_server:cast(Pid, delete), - receive {'DOWN', MRef, _, _, _} -> ok end, + receive + {'EXIT', Pid, _} -> + ok + after + 0 -> + ok + end, rem_from_ets(DbName, Sig, DDocIds, Pid) end, lists:foreach(Fun, dict:to_list(SigDDocIds)), |