Merge pull request discoproject#264 from jamii/master

Fixes regressions in temp_gc which prevent purged jobs from being deleted
kostis · Sep 22, 2011 · 2b25dfc · 2b25dfc
2 parents efffdf3 + 09a1deb
commit 2b25dfc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/master/src/node_mon.erl b/master/src/node_mon.erl
@@ -102,7 +102,7 @@ is_master(Host) ->
 
 -spec start_temp_gc(node()) -> pid().
 start_temp_gc(Node) ->
-    spawn_link(Node, temp_gc, start_link, [whereis(disco_server)]).
+    spawn_link(Node, temp_gc, start_link, [node(whereis(disco_server))]).
 
 -spec start_lock_server(node()) -> pid().
 start_lock_server(Node) ->

diff --git a/master/src/temp_gc.erl b/master/src/temp_gc.erl
@@ -58,7 +58,7 @@ get_jobs() ->
 -spec process_dir([string()], gb_set(), gb_set()) -> 'ok'.
 process_dir([], _Purged, _Active) -> ok;
 process_dir([Dir|R], Purged, Active) ->
-    Path = disco:data_path(node, Dir),
+    Path = disco:data_path(node(), Dir),
     {ok, Jobs} = prim_file:list_dir(Path),
     _ = [process_job(filename:join(Path, Job), Purged) ||
             Job <- Jobs, ifdead(Job, Active)],