commit efd3a0223e1c958b04e9df746a301d6e2870c784
author Russell Branca <chewbranca@apache.org> Thu Oct 28 13:57:24 2021 -0700
committer Russell Branca <chewbranca@apache.org> Thu Oct 28 14:00:28 2021 -0700
tree 4a6e48e446991ed3e742118d3a0e4022a2d82ed6
parent ed2690acc701493554f9b161f8b2b0fb327e8b35

Fix segmented cache setup

src/couch/src/couch_file.erl

diff --git a/src/couch/src/couch_file.erl b/src/couch/src/couch_file.erl
index 171c3e3..1645fd3 100644
--- a/src/couch/src/couch_file.erl
+++ b/src/couch/src/couch_file.erl
@@ -82,8 +82,8 @@
             IOQPid0 when is_pid(IOQPid0) ->
                 IOQPid0
         end,
-        {Tab, Ref} = gen_server:call(Fd, get_cache_ref),
-        {ok, #ioq_file{fd=Fd, ioq=IOQPid, tab=Tab, id_ref=Ref}};
+        {Tab, IdRef} = gen_server:call(Fd, get_cache_ref),
+        {ok, #ioq_file{fd=Fd, ioq=IOQPid, tab=Tab, id_ref=IdRef}};
     ignore ->
         % get the error
         receive
@@ -448,7 +448,7 @@
     IsSys = lists:member(sys_db, Options),
     update_read_timestamp(),
     IdRef = make_ref(),
-    Tab = case config:get("couchdb", "couch_file_cache", "true") of
+    Tab = case config:get("couchdb", "couch_file_cache", "segmented") of
         "true" ->
             couch_stats:increment_counter([couchdb, couch_file, cache_opens]),
             ets:new(?MODULE, [set, protected, {read_concurrency, true}]);

src/couch/src/couch_sup.erl

diff --git a/src/couch/src/couch_sup.erl b/src/couch/src/couch_sup.erl
index d58286e..f48cc93 100644
--- a/src/couch/src/couch_sup.erl
+++ b/src/couch/src/couch_sup.erl
@@ -44,10 +44,11 @@
 
 
 init(_Args) ->
+    TTL = config:get_integer("couchdb", "couch_file_ttl", 1000),
     CacheArgs = #{
         strategy => lru,
         segment_num => 3,
-        ttl => {milliseconds, 1000}
+        ttl => {milliseconds, TTL}
     },
     couch_log:info("Starting ~s", [?MODULE]),
     {ok, {{one_for_one,10, 60}, [