Quick fix for bad_return_value

https://gist.github.com/slfritchie/12e40859a08d5e4a678a

src/machi_cr_client.erl

@@ -439,8 +439,9 @@ do_append_midtail2([FLU|RestFLUs]=FLUs, Prefix, File, Offset, Chunk,
             %% We know what the chunk ought to be, so jump to the
             %% middle of read-repair.
             Resume = {append, Offset, iolist_size(Chunk), File},
-            do_repair_chunk(FLUs, Resume, Chunk, [], File, Offset,
+            {Reply, S1} = do_repair_chunk(FLUs, Resume, Chunk, [], File, Offset,
-                            iolist_size(Chunk), Depth, STime, S);
+                                  iolist_size(Chunk), Depth, STime, S),
+            {reply, Reply, S1};
         {error, trimmed} = Err ->
             %% TODO: nothing can be done
             {reply, Err, S};

src/machi_flu_filename_mgr.erl

@@ -125,6 +125,7 @@ list_files_by_prefix(_FluName, Other) ->
 %% gen_server API
 init([FluName, DataDir]) ->
     Tid = ets:new(make_filename_mgr_name(FluName), [named_table, {read_concurrency, true}]),
+    ets:insert(Tid, {counter, 0}), %% In theory, persistent counter over the lifetime of the FLU
     {ok, #state{fluname = FluName,
                 epoch = 0,
                 datadir = DataDir,
@@ -143,6 +144,7 @@ handle_call({find_filename, EpochId, Prefix}, _From, S = #state{ datadir = DataD
                                                                  tid = Tid}) ->
     %% Our state and the caller's epoch ids are the same. Business as usual.
     File = handle_find_file(Tid, Prefix, DataDir),
+    %% io:format(user, "~s:find_filename ~w ~w: ~W ~s -> ~s\n", [?MODULE, ?LINE, S#state.fluname, EpochId, 4, Prefix, File]),
     {reply, {file, File}, S};
 
 handle_call({find_filename, EpochId, Prefix}, _From, S = #state{ datadir = DataDir, tid = Tid }) ->
@@ -151,6 +153,7 @@ handle_call({find_filename, EpochId, Prefix}, _From, S = #state{ datadir = DataD
     %% If epoch ids between our state and the caller's are different, we must increment the
     %% sequence number, generate a filename and then cache it.
     File = increment_and_cache_filename(Tid, DataDir, Prefix),
+    %% io:format(user, "~s:find_filename ~w ~w: ~W ~s -> ~s\n", [?MODULE, ?LINE, S#state.fluname, EpochId, 4, Prefix, File]),
     {reply, {file, File}, S#state{epoch = EpochId}};
 
 handle_call({increment_sequence, Prefix}, _From, S = #state{ datadir = DataDir }) ->
@@ -199,25 +202,15 @@ make_filename_mgr_name(FluName) when is_atom(FluName) ->
     list_to_atom(atom_to_list(FluName) ++ "_filename_mgr").
 
 handle_find_file(Tid, Prefix, DataDir) ->
-    N = machi_util:read_max_filenum(DataDir, Prefix),
+    File = find_or_make_filename(Tid, DataDir, Prefix),
-    {File, Cleanup} = case find_file(DataDir, Prefix, N) of
-        [] ->
-            {find_or_make_filename(Tid, DataDir, Prefix, N), false};
-        [H] -> {H, true};
-        [Fn | _ ] = L ->
-            lager:debug(
-              "Searching for a matching file to prefix ~p and sequence number ~p gave multiples: ~p",
-              [Prefix, N, L]),
-            {Fn, true}
-    end,
-    maybe_cleanup(Tid, {Prefix, N}, Cleanup),
     filename:basename(File).
 
-find_or_make_filename(Tid, DataDir, Prefix, N) ->
+find_or_make_filename(Tid, DataDir, Prefix) ->
-    case ets:lookup(Tid, {Prefix, N}) of
+    case ets:lookup(Tid, {Prefix}) of
          [] ->
+            N = ets:update_counter(Tid, counter, 1),
             F = generate_filename(DataDir, Prefix, N),
-            true = ets:insert_new(Tid, {{Prefix, N}, F}),
+            true = ets:insert_new(Tid, {{Prefix}, F}),
             F;
         [{_Key, File}] ->
             File
@@ -238,9 +231,9 @@ maybe_cleanup(Tid, Key, true) ->
 
 increment_and_cache_filename(Tid, DataDir, Prefix) ->
     ok = machi_util:increment_max_filenum(DataDir, Prefix),
-    N = machi_util:read_max_filenum(DataDir, Prefix),
+    N = ets:update_counter(Tid, counter, 1),
     F = generate_filename(DataDir, Prefix, N),
-    true = ets:insert_new(Tid, {{Prefix, N}, F}),
+    ets:insert(Tid, {{Prefix}, F}),
     filename:basename(F).
 
 

test/machi_ap_repair_eqc.erl

@@ -196,6 +196,11 @@ num() ->
     choose(2, 5).
     %% return(3).
 
+sublist(L) ->
+    ?LET(K, nat(),
+    ?LET(L2, eqc_gen:vector(K, eqc_gen:oneof(L)),
+         lists:usort(L2))).
+
 %% Generator for possibly assymmetric partition information
 partition(FLUNames) ->
     frequency([{10, return([])},