summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bakken <luke@bakken.io>2021-12-20 07:13:35 -0800
committerLuke Bakken <luke@bakken.io>2021-12-21 07:11:34 -0800
commit5dfc5f508b0b52e54451f453a1db1ce98c9ee728 (patch)
tree85aa63eddb2b031d6b5aa1c874be67b33f2e5655
parentdb9dac10e94674bc287eeb2239f40c80363900e5 (diff)
downloadrabbitmq-server-git-mergify/bp/v3.8.x/pr-3926.tar.gz
Use protected ets so that data can be read quicklymergify/bp/v3.8.x/pr-3926
(cherry picked from commit 2b63bae50d68ba852ff6e4d5a5bd3f4f22420483)
-rw-r--r--deps/rabbit/src/rabbit_disk_monitor.erl7
1 files changed, 0 insertions, 7 deletions
diff --git a/deps/rabbit/src/rabbit_disk_monitor.erl b/deps/rabbit/src/rabbit_disk_monitor.erl
index 0a543f9589..551fd6c1a4 100644
--- a/deps/rabbit/src/rabbit_disk_monitor.erl
+++ b/deps/rabbit/src/rabbit_disk_monitor.erl
@@ -98,18 +98,11 @@ set_max_check_interval(Interval) ->
gen_server:call(?MODULE, {set_max_check_interval, Interval}).
-spec get_disk_free() -> (integer() | 'unknown').
-<<<<<<< HEAD
--spec set_enabled(string()) -> 'ok'.
-=======
->>>>>>> 590ead483f (Use protected ets so that data can be read quickly)
get_disk_free() ->
safe_ets_lookup(disk_free, unknown).
-<<<<<<< HEAD
-=======
-spec set_enabled(string()) -> 'ok'.
->>>>>>> 590ead483f (Use protected ets so that data can be read quickly)
set_enabled(Enabled) ->
gen_server:call(?MODULE, {set_enabled, Enabled}).