wip

Author: kjnilsson

src/ra_log.erl

@@ -1340,8 +1340,6 @@ schedule_compaction(SnapIdx, #?MODULE{cfg = #cfg{uid = _UId,
             SegRefs = lists:takewhile(fun ({_Fn, {_Start, End}}) ->
                                               End =< SnapIdx
                                       end, lists:reverse(Compactable)),
-            % SnapDir = ra_snapshot:current_snapshot_dir(SnapState),
-
             %% TODO: minor compactions should also delete / truncate
             %% segments with completely overwritten indexes
 

src/ra_log_segments.erl

@@ -13,7 +13,7 @@
          init/7,
          close/1,
          update_segments/2,
-         handle_compaction/2,
+         handle_compaction_result/2,
          segment_refs/1,
          segment_ref_count/1,
          range/1,
@@ -138,23 +138,30 @@ update_segments(NewSegmentRefs,
      OverwrittenSegments}.
 
 -record(log_compaction_result,
-        {%range :: ra:range(),
-         unreferenced :: [segment_ref()],
+        {unreferenced :: [segment_ref()],
          linked :: [segment_ref()],
          compacted :: [segment_ref()]}).
 
--spec handle_compaction(#log_compaction_result{}, state()) -> state().
-handle_compaction(#log_compaction_result{unreferenced = Deleted,
-                                         linked = Linked,
-                                         compacted = Compacted},
-                  #?STATE{open_segments = Open0,
-                          segment_refs = SegRefs0} = State) ->
+-spec handle_compaction_result(#log_compaction_result{}, state()) ->
+    {state(), [ra_server:effect()]}.
+handle_compaction_result(#log_compaction_result{unreferenced = Unreferenced,
+                                                linked = Linked,
+                                                compacted = Compacted},
+                         #?STATE{cfg = #cfg{directory = Dir},
+                                 open_segments = Open0,
+                                 segment_refs = SegRefs0} = State) ->
     SegmentRefs0 = ra_lol:to_list(SegRefs0),
-    SegmentRefs = lists:usort(((SegmentRefs0 -- Deleted) -- Linked) ++ Compacted),
+    SegmentRefs = lists:usort(((SegmentRefs0 -- Unreferenced) -- Linked) ++ Compacted),
     Open = ra_flru:evict_all(Open0),
-    State#?MODULE{segment_refs = ra_lol:from_list(fun seg_ref_gt/2,
-                                                  lists:reverse(SegmentRefs)),
-                  open_segments = Open}.
+    Fun = fun () ->
+                  [prim_file:delete(filename:join(Dir, F))
+                   || {F, _} <- Unreferenced],
+                  ok
+          end,
+    {State#?MODULE{segment_refs = ra_lol:from_list(fun seg_ref_gt/2,
+                                                   lists:reverse(SegmentRefs)),
+                   open_segments = Open},
+    [{bg_work, Fun, fun (_Err) -> ok end}]}.
 
 
 -spec update_first_index(ra_index(), state()) ->

src/ra_server.erl

@@ -178,7 +178,7 @@
     %% used for tracking valid leader messages
     {record_leader_msg, ra_server_id()} |
     start_election_timeout |
-    {bg_work, fun(() -> ok) | mfargs()}.
+    {bg_work, fun(() -> ok) | mfargs(), fun()}.
 
 -type effects() :: [effect()].