Move view index files to .view_deleted when db is deleted

Bugzid 86318

Author: jiangphcn

src/couch/src/couch_file.erl

@@ -43,7 +43,7 @@
 -export([append_raw_chunk/2, assemble_file_chunk/1, assemble_file_chunk/2]).
 -export([append_term/2, append_term/3, append_term_md5/2, append_term_md5/3]).
 -export([write_header/2, read_header/1]).
--export([delete/2, delete/3, nuke_dir/2, init_delete_dir/1]).
+-export([delete/2, delete/3, nuke_dir/2, nuke_dir/3, init_delete_dir/1]).
 
 % gen_server callbacks
 -export([init/1, terminate/2, code_change/3]).
@@ -264,6 +264,16 @@ rename_file(Original) ->
         Else -> Else
     end.
 
+rename_dir(RootDelDir, Original, DbName) ->
+    DbDir = binary_to_list(DbName) ++ "_design",
+    Deleted_Index_Dir = filename:join([RootDelDir, ".view_recovery", DbDir]),
+    Now = calendar:local_time(),
+    filelib:ensure_dir(Deleted_Index_Dir),
+    case file:rename(Original, Deleted_Index_Dir) of
+        ok -> file:change_time(Deleted_Index_Dir, Now);
+        Else -> Else
+    end.
+
 deleted_filename(Original) ->
     {{Y, Mon, D}, {H, Min, S}} = calendar:universal_time(),
     Suffix = lists:flatten(
@@ -272,12 +282,20 @@ deleted_filename(Original) ->
             ++ filename:extension(Original), [Y, Mon, D, H, Min, S])),
     filename:rootname(Original) ++ Suffix.
 
-nuke_dir(RootDelDir, Dir) ->
+nuke_dir(RootDir, Dir) ->
+    nuke_dir(RootDir, Dir, []).
+nuke_dir(RootDelDir, Dir, Options) ->
     EnableRecovery = config:get_boolean("couchdb",
         "enable_database_recovery", false),
     case EnableRecovery of
         true ->
-            rename_file(Dir);
+            Context = couch_util:get_value(context, Options, compaction),
+            case Context =:= delete of
+                true ->
+                    DbName = couch_util:get_value(db_name, Options),
+                    rename_dir(RootDelDir, Dir, DbName);
+                false -> rename_file(Dir)
+            end;
         false ->
             delete_dir(RootDelDir, Dir)
     end.

src/couch/test/couch_file_tests.erl

@@ -419,32 +419,47 @@ nuke_dir_test_() ->
                 RootDir = filename:dirname(File0),
                 BaseName = filename:basename(File0),
                 Seed = crypto:rand_uniform(1000000000, 9999999999),
-                DDocDir = io_lib:format("db.~b_design", [Seed]),
+                DBName0 = io_lib:format("db.~b", [Seed]),
+                DBName = iolist_to_binary(DBName0),
+                DDocDir = io_lib:format("~s_design", [DBName0]),
                 ViewDir = filename:join([RootDir, DDocDir]),
                 file:make_dir(ViewDir),
                 File = filename:join([ViewDir, BaseName]),
                 file:rename(File0, File),
                 ok = couch_file:init_delete_dir(RootDir),
                 ok = file:write_file(File, <<>>),
-                {RootDir, ViewDir}
+                {RootDir, ViewDir, DBName}
             end,
-            fun({RootDir, ViewDir}) ->
+            fun({RootDir, ViewDir, _DBName}) ->
                 meck:unload(config),
                 remove_dir(ViewDir),
                 Ext = filename:extension(ViewDir),
                 case filelib:wildcard(RootDir ++ "/*.deleted" ++ Ext) of
                     [DelDir] -> remove_dir(DelDir);
                     _ -> ok
+                end,
+                RecDirPaths = RootDir ++ "/.view_recovery" ++ "/*_design",
+                case filelib:wildcard(RecDirPaths) of
+                    RecDirs -> [remove_dir(Dir) || Dir <- RecDirs];
+                    [] -> ok
                 end
             end,
             [
                 fun(Cfg) ->
-                    {"enable_database_recovery = false",
-                    make_rename_dir_test_case(Cfg, false)}
+                    {"enable_database_recovery = false, context = delete",
+                    make_rename_dir_test_case(Cfg, false, delete)}
+                end,
+                fun(Cfg) ->
+                    {"enable_database_recovery = false, context = compaction",
+                    make_rename_dir_test_case(Cfg, false, compaction)}
                 end,
                 fun(Cfg) ->
-                    {"enable_database_recovery = true",
-                    make_rename_dir_test_case(Cfg, true)}
+                    {"enable_database_recovery = true, context = delete",
+                    make_rename_dir_test_case(Cfg, true, delete)}
+                end,
+                fun(Cfg) ->
+                    {"enable_database_recovery = true, context = compaction",
+                    make_rename_dir_test_case(Cfg, true, compaction)}
                 end,
                 fun(Cfg) ->
                     {"delete_after_rename = true",
@@ -459,24 +474,34 @@ nuke_dir_test_() ->
     }.
 
 
-make_rename_dir_test_case({RootDir, ViewDir}, EnableRecovery) ->
+make_rename_dir_test_case({RootDir, ViewDir, DBName}, EnableRecovery, Context) ->
     meck:expect(config, get_boolean, fun
         ("couchdb", "enable_database_recovery", _) -> EnableRecovery;
         ("couchdb", "delete_after_rename", _) -> true
     end),
     DirExistsBefore = filelib:is_dir(ViewDir),
-    couch_file:nuke_dir(RootDir, ViewDir),
+
+    couch_file:nuke_dir(
+        RootDir,
+        ViewDir,
+        [{db_name, DBName}, {context, Context}]
+    ),
     DirExistsAfter = filelib:is_dir(ViewDir),
-    Ext = filename:extension(ViewDir),
-    RenamedDirs = filelib:wildcard(RootDir ++ "/*.deleted" ++ Ext),
+    RenamedDirs = if Context =:= delete ->
+        filelib:wildcard(RootDir ++ "/.view_recovery" ++ "/*_design");
+    true ->
+        Ext = filename:extension(ViewDir),
+        filelib:wildcard(RootDir ++ "/*.deleted" ++ Ext)
+    end,
+
     ExpectRenamedCount = if EnableRecovery -> 1; true -> 0 end,
     [
         ?_assert(DirExistsBefore),
         ?_assertNot(DirExistsAfter),
         ?_assertEqual(ExpectRenamedCount, length(RenamedDirs))
     ].
 
-make_delete_dir_test_case({RootDir, ViewDir}, DeleteAfterRename) ->
+make_delete_dir_test_case({RootDir, ViewDir, _DBName}, DeleteAfterRename) ->
     meck:expect(config, get_boolean, fun
         ("couchdb", "enable_database_recovery", _) -> false;
         ("couchdb", "delete_after_rename", _) -> DeleteAfterRename

src/couch_index/src/couch_index_server.erl

@@ -154,13 +154,13 @@ handle_call({async_error, {DbName, _DDocId, Sig}, Error}, _From, State) ->
     [gen_server:reply(From, Error) || From <- Waiters],
     ets:delete(?BY_SIG, {DbName, Sig}),
     {reply, ok, State};
-handle_call({reset_indexes, DbName}, _From, State) ->
-    reset_indexes(DbName, State#st.root_dir),
+handle_call({reset_indexes, Options}, _From, State) ->
+    reset_indexes(Options, State#st.root_dir),
     {reply, ok, State}.
 
 
-handle_cast({reset_indexes, DbName}, State) ->
-    reset_indexes(DbName, State#st.root_dir),
+handle_cast({reset_indexes, Options}, State) ->
+    reset_indexes(Options, State#st.root_dir),
     {noreply, State}.
 
 handle_info({'EXIT', Pid, Reason}, Server) ->
@@ -219,7 +219,8 @@ new_index({Mod, IdxState, DbName, Sig}) ->
     end.
 
 
-reset_indexes(DbName, Root) ->
+reset_indexes(Options, Root) ->
+    DbName = couch_util:get_value(db_name, Options),
     % shutdown all the updaters and clear the files, the db got changed
     Fun = fun({_, {DDocId, Sig}}) ->
         [{_, Pid}] = ets:lookup(?BY_SIG, {DbName, Sig}),
@@ -230,7 +231,7 @@ reset_indexes(DbName, Root) ->
     end,
     lists:foreach(Fun, ets:lookup(?BY_DB, DbName)),
     Path = couch_index_util:index_dir("", DbName),
-    couch_file:nuke_dir(Root, Path).
+    couch_file:nuke_dir(Root, Path, Options).
 
 
 add_to_ets(DbName, Sig, DDocId, Pid) ->
@@ -246,10 +247,10 @@ rem_from_ets(DbName, Sig, DDocId, Pid) ->
 
 
 handle_db_event(DbName, created, St) ->
-    gen_server:cast(?MODULE, {reset_indexes, DbName}),
+    gen_server:cast(?MODULE, {reset_indexes, [{db_name, DbName}, {context, []}]}),
     {ok, St};
 handle_db_event(DbName, deleted, St) ->
-    gen_server:cast(?MODULE, {reset_indexes, DbName}),
+    gen_server:cast(?MODULE, {reset_indexes, [{db_name, DbName}, {context, delete}]}),
     {ok, St};
 handle_db_event(DbName, {ddoc_updated, DDocId}, St) ->
     lists:foreach(fun({_DbName, {_DDocId, Sig}}) ->