Clear out solr-webapp directory when setting up yz_temp dir (#681)

* Clear out solr-webapp directory when setting up yz_temp dir

On upgrade the existence of this directory and its cached solr classes
can cause yokozuna to fail to start. To prevent this, we double-check
the state of the temp directory on start.

- Remove redundant test setup now that yz_temp is cleared in production

* adjust timeout

* Fix eqc tests based on new code in dependencies:
- yz_solrq_eqc now needs to mock riak_kv_entropy_manager:get_partition_version/1
- eqc_util needs to set up riak_core_table_owner & initialize riak_core_throttle.

Author: paulhenrich

.thumbs.yml

@@ -6,4 +6,4 @@ build_steps:
  - make dialyzer
 merge: false
 org_mode: true
-timeout: 1799
+timeout: 1790

riak_test/yz_solr_upgrade_downgrade.erl

@@ -348,11 +348,6 @@ update_yz(Params) ->
     NewDataDir = proplists:get_value(new_data_dir, Params),
     TimestampStr = timestamp_str(),
     %%
-    %% Move yz_temp out of the way, because it contains cached Solr JAR files
-    %% and other artifacts.
-    %%
-    ok = mv_yz_temp(NewDataDir, TimestampStr),
-    %%
     %% Update the luceneMatchVersion in the Solr config
     %%
     [ok = modify_solr_config(NewDataDir, binary_to_list(Index)) ||

src/yz_solr_proc.erl

@@ -274,12 +274,34 @@ ensure_data_dir(Dir) ->
             ok
     end.
 
+%% @private
+%%
+%% @doc Recursively delete target directory. Equivalent to
+%% `rm -rf $DIR` at the shell
+-spec del_dir_recursive(string()) -> ok | {error, enotdir}.
+del_dir_recursive(Path) ->
+    del_dir_recursive(Path, filelib:is_dir(Path)).
+
+-spec del_dir_recursive(string(), boolean()) -> ok | {error, enotdir}.
+del_dir_recursive(DirPath, true) ->
+    FullPaths = [filename:join(DirPath, FilePath) ||
+                    FilePath <- filelib:wildcard("**", DirPath)],
+    {Dirs, Files} = lists:partition(fun filelib:is_dir/1, FullPaths),
+    lists:foreach(fun file:delete/1, Files),
+    %% Delete directories sorted longest to shortest to ensure we delete leaf
+    %% directories first.
+    lists:foreach(fun file:del_dir/1, lists:sort(fun (A,B) -> A > B end, Dirs)),
+    file:del_dir(DirPath);
+del_dir_recursive(_DirPath, _Exists = false) ->
+    {error, enotdir}.
+
 %% @private
 %%
 %% @doc Make sure that the temp directory (passed in as `TempDir')
-%% exists
+%% exists and is new
 -spec ensure_temp_dir(string()) -> ok.
 ensure_temp_dir(TempDir) ->
+    del_dir_recursive(filename:join(TempDir, "solr-webapp")),
     ok = filelib:ensure_dir(filename:join(TempDir, empty)).
 
 %% @private

test/eqc_util.erl

@@ -106,6 +106,8 @@ start_mock_components(Options) ->
     application:load(lager),
     ok = lager:start(),
     riak_core_metadata_manager:start_link([{data_dir, "eqc_test_data"}]),
+    riak_core_table_owner:start_link(),
+    riak_core_throttle:init(),
     riak_core_ring_events:start_link(),
     riak_core_ring_manager:start_link(test),
     riak_core_ring_manager:setup_ets(test),
@@ -121,6 +123,7 @@ cleanup_mock_components() ->
     stop_process(riak_core_ring_manager),
     stop_process(riak_core_metadata_manager),
     stop_process(riak_kv_entropy_manager),
+    stop_process(riak_core_table_owner),
     application:stop(riak_core),
     application:stop(riak_kv),
     application:unload(riak_core),

test/yz_solrq_eqc.erl

@@ -219,6 +219,7 @@ setup() ->
 
     meck:new(riak_kv_entropy_manager, [passthrough]),
     meck:expect(riak_kv_entropy_manager, get_version, fun() -> 0 end),
+    meck:expect(riak_kv_entropy_manager, get_partition_version, fun(_) -> 0 end),
 
     meck:new(riak_core_bucket),
     meck:expect(riak_core_bucket, get_bucket, fun get_bucket/1),