This is an automated email from the ASF dual-hosted git repository. nickva pushed a commit to branch fix-idle-monitor-timeout in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit c417c3a73de7fbd992f785ae4df0c349dd2e2dae Author: Nick Vatamaniuc <[email protected]> AuthorDate: Wed Oct 28 15:36:41 2026 -0400 Avoid db and index files auto-closing during initialization It's possible, that after we open a couch_file, but before we set up our own monitor, ioq backups longer than couch_file idle checks could auto-close the file. To prevent that, monitor the file right after open while we update or check headers. Fix: #6178 --- src/couch/src/couch_bt_engine.erl | 7 ++- src/couch/src/couch_bt_engine_compactor.erl | 17 ++++-- src/couch_mrview/src/couch_mrview_compactor.erl | 5 ++ src/couch_mrview/src/couch_mrview_index.erl | 78 +++++++++++++------------ 4 files changed, 64 insertions(+), 43 deletions(-) diff --git a/src/couch/src/couch_bt_engine.erl b/src/couch/src/couch_bt_engine.erl index 4bdef732d..55dcfd409 100644 --- a/src/couch/src/couch_bt_engine.erl +++ b/src/couch/src/couch_bt_engine.erl @@ -166,6 +166,9 @@ is_compacting([_ | _] = FilePath) -> init(FilePath, Options) -> {ok, Fd} = open_db_file(FilePath, Options), + % couch_file auto-closes if idle so monitor it until init_state runs in + % case it gets stuck in ioq for longer than the idle timeout. + Ref = monitor(process, Fd), Header = case lists:member(create, Options) of true -> @@ -185,7 +188,9 @@ init(FilePath, Options) -> Header0 end end, - {ok, init_state(FilePath, Fd, Header, Options)}. + St = init_state(FilePath, Fd, Header, Options), + demonitor(Ref, [flush]), + {ok, St}. terminate(_Reason, St) -> % If the reason we died is because our fd disappeared diff --git a/src/couch/src/couch_bt_engine_compactor.erl b/src/couch/src/couch_bt_engine_compactor.erl index ee349337d..48024ee20 100644 --- a/src/couch/src/couch_bt_engine_compactor.erl +++ b/src/couch/src/couch_bt_engine_compactor.erl @@ -94,8 +94,8 @@ open_compaction_files(DbName, OldSt, Options) -> } = OldSt, DataFile = DbFilePath ++ ".compact.data", MetaFile = DbFilePath ++ ".compact.meta", - {ok, DataFd, DataHdr} = open_compaction_file(DataFile), - {ok, MetaFd, MetaHdr} = open_compaction_file(MetaFile), + {ok, DataFd, DataHdr, DataRef} = open_compaction_file(DataFile), + {ok, MetaFd, MetaHdr, _} = open_compaction_file(MetaFile), DataHdrIsDbHdr = couch_bt_engine_header:is_header(DataHdr), CompSt = case {DataHdr, MetaHdr} of @@ -146,8 +146,11 @@ open_compaction_files(DbName, OldSt, Options) -> retry = nil } end, + % From this point new_st fd_monitor keeps the data file until the decref + % later so we dro the DataRef. Meta file is monitored for the life of the + % compactor. + demonitor(DataRef, [flush]), unlink(DataFd), - monitor(process, MetaFd), {ok, CompSt}. copy_purge_info(#comp_st{} = CompSt) -> @@ -650,13 +653,15 @@ compact_final_sync(#comp_st{new_st = St0} = CompSt) -> open_compaction_file(FilePath) -> case couch_file:open(FilePath, [nologifmissing]) of {ok, Fd} -> + Ref = monitor(process, Fd), case couch_file:read_header(Fd) of - {ok, Header} -> {ok, Fd, Header}; - no_valid_header -> {ok, Fd, nil} + {ok, Header} -> {ok, Fd, Header, Ref}; + no_valid_header -> {ok, Fd, nil, Ref} end; {error, enoent} -> {ok, Fd} = couch_file:open(FilePath, [create]), - {ok, Fd, nil} + Ref = monitor(process, Fd), + {ok, Fd, nil, Ref} end. reset_compaction_file(Fd, Header) -> diff --git a/src/couch_mrview/src/couch_mrview_compactor.erl b/src/couch_mrview/src/couch_mrview_compactor.erl index fa8ce71fe..6d648644d 100644 --- a/src/couch_mrview/src/couch_mrview_compactor.erl +++ b/src/couch_mrview/src/couch_mrview_compactor.erl @@ -49,7 +49,12 @@ compact(State) -> {EmptyState, NumDocIds} = couch_util:with_db(DbName, fun(Db) -> CompactFName = couch_mrview_util:compaction_file(DbName, Sig), {ok, Fd} = couch_mrview_util:open_file(CompactFName), + % Monitor the file until reset_index sets up its own monitor. + % Otherwise, couch_file could auto-close it on idle if it gets stuck in + % ioq for a long while. + Ref = monitor(process, Fd), ESt = couch_mrview_util:reset_index(Db, Fd, State), + demonitor(Ref, [flush]), {ok, Count} = couch_db:get_doc_count(Db), diff --git a/src/couch_mrview/src/couch_mrview_index.erl b/src/couch_mrview/src/couch_mrview_index.erl index a484403f4..a9cfe175b 100644 --- a/src/couch_mrview/src/couch_mrview_index.erl +++ b/src/couch_mrview/src/couch_mrview_index.erl @@ -122,42 +122,48 @@ open(Db, State0) -> case couch_mrview_util:open_file(IndexFName) of {ok, Fd} -> - case couch_file:read_header(Fd) of - % upgrade code for <= 2.x - {ok, {OldSig, Header}} -> - % Matching view signatures. - NewSt = init_and_upgrade_state(Db, Fd, State, Header), - ok = commit(NewSt), - ensure_local_purge_doc(Db, NewSt), - {ok, NewSt}; - % end of upgrade code for <= 2.x - {ok, {Sig, Header}} -> - % Matching view signatures. - NewSt = init_and_upgrade_state(Db, Fd, State, Header), - ensure_local_purge_doc(Db, NewSt), - check_collator_versions(DbName, NewSt), - {ok, NewSt}; - {ok, {WrongSig, _}} -> - couch_log:error( - "~s has the wrong signature: expected: ~p but got ~p", - [IndexFName, Sig, WrongSig] - ), - NewSt = couch_mrview_util:reset_index(Db, Fd, State), - ensure_local_purge_doc(Db, NewSt), - {ok, NewSt}; - {ok, Else} -> - couch_log:error( - "~s has a bad header: got ~p", - [IndexFName, Else] - ), - NewSt = couch_mrview_util:reset_index(Db, Fd, State), - ensure_local_purge_doc(Db, NewSt), - {ok, NewSt}; - no_valid_header -> - NewSt = couch_mrview_util:reset_index(Db, Fd, State), - ensure_local_purge_doc(Db, NewSt), - {ok, NewSt} - end; + % Monitor file while we setup our own monitor in index open to + % avoid it auto-closing due to couch_file idle check. + Ref = monitor(process, Fd), + Result = + case couch_file:read_header(Fd) of + % upgrade code for <= 2.x + {ok, {OldSig, Header}} -> + % Matching view signatures. + NewSt = init_and_upgrade_state(Db, Fd, State, Header), + ok = commit(NewSt), + ensure_local_purge_doc(Db, NewSt), + {ok, NewSt}; + % end of upgrade code for <= 2.x + {ok, {Sig, Header}} -> + % Matching view signatures. + NewSt = init_and_upgrade_state(Db, Fd, State, Header), + ensure_local_purge_doc(Db, NewSt), + check_collator_versions(DbName, NewSt), + {ok, NewSt}; + {ok, {WrongSig, _}} -> + couch_log:error( + "~s has the wrong signature: expected: ~p but got ~p", + [IndexFName, Sig, WrongSig] + ), + NewSt = couch_mrview_util:reset_index(Db, Fd, State), + ensure_local_purge_doc(Db, NewSt), + {ok, NewSt}; + {ok, Else} -> + couch_log:error( + "~s has a bad header: got ~p", + [IndexFName, Else] + ), + NewSt = couch_mrview_util:reset_index(Db, Fd, State), + ensure_local_purge_doc(Db, NewSt), + {ok, NewSt}; + no_valid_header -> + NewSt = couch_mrview_util:reset_index(Db, Fd, State), + ensure_local_purge_doc(Db, NewSt), + {ok, NewSt} + end, + demonitor(Ref, [flush]), + Result; {error, Reason} = Error -> couch_log:error( "Failed to open view file '~s': ~s",
