Merge pull request #37 from rabbitmq/fix_double_down_notification

Avoid double notifying on node termination.
rabbitmq · Dec 20, 2023 · 123cd57 · 123cd57
2 parents 5272007 + 70911ba
commit 123cd57
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/src/aten.erl b/src/aten.erl
@@ -10,23 +10,19 @@
          start/0,
          register/1,
          unregister/1
-         ]).
-
--export_type([
-              ]).
-
+        ]).
 
 start() ->
     application:ensure_all_started(aten).
 
--spec register(node()) -> ok.
+-spec register(node()) -> ok | ignore.
+register(Node) when Node == node() ->
+    ignore;
 register(Node) ->
     aten_detector:register(Node).
 
--spec unregister(node()) -> ok.
+-spec unregister(node()) -> ok | ignore.
+unregister(Node) when Node == node() ->
+    ignore;
 unregister(Node) ->
     aten_detector:unregister(Node).
-
--ifdef(TEST).
--include_lib("eunit/include/eunit.hrl").
--endif.
diff --git a/src/aten_detector.erl b/src/aten_detector.erl
@@ -157,10 +157,18 @@ analyse_one(_Curr, _Prev, _Thresh) ->
     no_change.
 
 analyse(Curr, Prev, Thresh) ->
-    Down0 = maps:fold(fun (N, _S, Acc) ->
+    Down0 = maps:fold(fun (N, Sample, Acc) ->
                               case maps:get(N, Curr, undefined) of
                                   undefined ->
-                                      [N | Acc];
+                                      case Sample >= Thresh of
+                                          true ->
+                                              %% already down
+                                              %% this should already have been
+                                              %% been notified
+                                              Acc;
+                                          _ ->
+                                              [N | Acc]
+                                      end;
                                   _ ->
                                       Acc
                               end

diff --git a/src/aten_sink.erl b/src/aten_sink.erl
@@ -8,8 +8,6 @@
 
 -behaviour(gen_server).
 
--include_lib("kernel/include/logger.hrl").
-
 %% API functions
 -export([start_link/0,
          get_failure_probabilities/0,