diff options
| -rw-r--r-- | src/background_gc.erl | 21 | ||||
| -rw-r--r-- | src/rabbit.app.src | 4 |
2 files changed, 18 insertions, 7 deletions
diff --git a/src/background_gc.erl b/src/background_gc.erl index 2986f356f5..835eaef4df 100644 --- a/src/background_gc.erl +++ b/src/background_gc.erl @@ -25,7 +25,6 @@ terminate/2, code_change/3]). -define(MAX_RATIO, 0.01). --define(IDEAL_INTERVAL, 60000). -define(MAX_INTERVAL, 240000). -record(state, {last_interval}). @@ -45,7 +44,9 @@ run() -> gen_server2:cast(?MODULE, run). %%---------------------------------------------------------------------------- -init([]) -> {ok, interval_gc(#state{last_interval = ?IDEAL_INTERVAL})}. +init([]) -> + {ok, IdealInterval} = application:get_env(rabbit, background_gc_target_interval), + {ok, interval_gc(#state{last_interval = IdealInterval})}. handle_call(Msg, _From, State) -> {stop, {unexpected_call, Msg}, {unexpected_call, Msg}, State}. @@ -65,14 +66,22 @@ terminate(_Reason, State) -> State. %%---------------------------------------------------------------------------- interval_gc(State = #state{last_interval = LastInterval}) -> + {ok, IdealInterval} = application:get_env(rabbit, background_gc_target_interval), {ok, Interval} = rabbit_misc:interval_operation( {?MODULE, gc, []}, - ?MAX_RATIO, ?MAX_INTERVAL, ?IDEAL_INTERVAL, LastInterval), + ?MAX_RATIO, ?MAX_INTERVAL, IdealInterval, LastInterval), erlang:send_after(Interval, self(), run), State#state{last_interval = Interval}. gc() -> - [garbage_collect(P) || P <- processes(), - {status, waiting} == process_info(P, status)], - garbage_collect(), %% since we will never be waiting... + Enabled = rabbit_misc:get_env(rabbit, background_gc_enabled, true), + case Enabled of + true -> + [garbage_collect(P) || P <- processes(), + {status, waiting} == process_info(P, status)], + %% since we will never be waiting... + garbage_collect(); + false -> + ok + end, ok. diff --git a/src/rabbit.app.src b/src/rabbit.app.src index dd38ad4072..9c30876c1d 100644 --- a/src/rabbit.app.src +++ b/src/rabbit.app.src @@ -107,5 +107,7 @@ {passphrase, undefined} ]}, %% rabbitmq-server-973 - {lazy_queue_explicit_gc_run_operation_threshold, 250} + {lazy_queue_explicit_gc_run_operation_threshold, 250}, + {background_gc_enabled, true}, + {background_gc_target_interval, 60000} ]}]}. |