Add mnesia up/down, do not log events already logged by mnesia_event

Author: chrzaszcz

include/alarms.hrl

@@ -10,14 +10,24 @@
 -define(EVENT_MANAGER, alarm_handler).
 
 -define(ALARM_TYPES,
+        (?SYSTEM_MONITOR_ALARM_TYPES ++
+             ?MNESIA_ALARM_TYPES ++
+             ?NET_KERNEL_ALARM_TYPES)).
+
+-define(SYSTEM_MONITOR_ALARM_TYPES,
         [long_gc,
          large_heap,
          busy_port,
-         busy_dist_port,
-         mnesia_overload,
+         busy_dist_port]).
+
+-define(MNESIA_ALARM_TYPES,
+        [mnesia_overload,
          inconsistent_database,
          mnesia_fatal,
          mnesia_error,
-         nodeup,
-         nodedown
-        ]).
+         mnesia_up,
+         mnesia_down]).
+
+-define(NET_KERNEL_ALARM_TYPES,
+        [nodeup,
+         nodedown]).

src/alarms_basic_handler.erl

@@ -200,16 +200,22 @@ handle_alarm(AlarmType, Details, Alarms0, LogTS0) ->
                     error ->
                         true
                 end,
-    LogTS = case ShouldLog of
-                true ->
-                    log(AlarmType, Count, Details),
-                    orddict:store(AlarmType, TS, LogTS0);
-                false ->
-                    LogTS0
+    LogTS = case ShouldLog andalso maybe_log(AlarmType, Count, Details) of
+                true  -> orddict:store(AlarmType, TS, LogTS0);
+                false -> LogTS0
             end,
     {Alarms, LogTS}.
 
-log(AlarmType, Count, Details) ->
-    error_logger:info_report([{alarm, AlarmType},
-                              {count, Count},
-                              {details, Details}]).
+maybe_log(AlarmType, Count, Details) ->
+    case lists:member(
+           AlarmType,
+           [mnesia_up, mnesia_down |
+            ?SYSTEM_MONITOR_ALARM_TYPES ++ ?NET_KERNEL_ALARM_TYPES]) of
+        true ->
+            error_logger:info_report([{alarm, AlarmType},
+                                      {count, Count},
+                                      {details, Details}]),
+            true;
+        false ->
+            false
+    end.

src/alarms_server.erl

@@ -177,10 +177,14 @@ msg_to_alarm({mnesia_overload, Details}) ->
     {mnesia_overload, Details};
 msg_to_alarm({inconsistent_database, Context, Node}) ->
     {inconsistent_database, {Context, Node}};
-msg_to_alarm({mnesia_fatal, Format, Args, BinaryCore}) ->
-    {mnesia_fatal, {Format, Args, BinaryCore}};
+msg_to_alarm({mnesia_fatal, Format, Args, _BinaryCore}) ->
+    {mnesia_fatal, {Format, Args}};
 msg_to_alarm({mnesia_error, Format, Args}) ->
     {mnesia_error, {Format, Args}};
+msg_to_alarm({mnesia_up, Node}) ->
+    {mnesia_up, Node};
+msg_to_alarm({mnesia_down, Node}) ->
+    {mnesia_down, Node};
 
 %% from net_kernel:monitor_nodes/2
 msg_to_alarm({nodeup, Node, InfoList}) ->

test/alarms_basic_handler_SUITE.erl

@@ -78,6 +78,7 @@ test_logging(_Config) ->
     fake_alarm(long_gc, gc1),
     fake_alarm(long_gc, gc2),
     fake_alarm(large_heap, lh),
+    fake_alarm(mnesia_error, {"error", []}), % should not be logged
 
     %% Wait until events are processed
     sys:get_status(alarm_handler),

test/alarms_server_SUITE.erl

@@ -86,13 +86,21 @@ test_alarm_handling(_Config) ->
     alarm_handler:clear_alarm(inconsistent_database),
 
     fake_event({mnesia_fatal, "fatal", [], <<>>}),
-    [{mnesia_fatal, {"fatal", [], <<>>}}] = alarm_handler:get_alarms(),
+    [{mnesia_fatal, {"fatal", []}}] = alarm_handler:get_alarms(),
     alarm_handler:clear_alarm(mnesia_fatal),
 
     fake_event({mnesia_error, "error", []}),
     [{mnesia_error, {"error", []}}] = alarm_handler:get_alarms(),
     alarm_handler:clear_alarm(mnesia_error),
 
+    fake_event({mnesia_up, node}),
+    [{mnesia_up, node}] = alarm_handler:get_alarms(),
+    alarm_handler:clear_alarm(mnesia_up),
+
+    fake_event({mnesia_down, node}),
+    [{mnesia_down, node}] = alarm_handler:get_alarms(),
+    alarm_handler:clear_alarm(mnesia_down),
+
     fake_event({nodeup, upnode, []}),
     [{nodeup, {upnode, []}}] = alarm_handler:get_alarms(),
     alarm_handler:clear_alarm(nodeup),