Merge pull request #856 from rabbitmq/rabbitmq-management-855

Take error scenarios into account in aliveness test

Author: michaelklishin

deps/rabbitmq_management/.travis.yml

@@ -17,18 +17,18 @@ cache:
   apt: true
 env:
   global:
-    - secure: JHS6ykwlW6Nz1g62US2U2I9+SuUYqfk+c1Vy5ty/cp7z4BYW8Kf5Zb2f3mLfBxOBvzOSGAOHdUad7FuEdj1Z93gyXmcjJL2XCnAngtEjWUkH2+Zr1o9RElFW6WqBLN5m2P4pjxL6PeMiJi4ibBTkPTi3gu4iit4hBkikjUe0gvE=
-    - secure: YqJMmYy9k7FY4WpKdBRN+xTT31j1HD0YfS3mjMdTleeWhVAv/40SzfENWcVB3EP4qLLS/NmuoQhOJ7lrQ/5Alp9CkRM0IH1dJ8i5Yeem8FTLfXXphmoA7U+QafSKxQArBoqM1Pk4Ajxtlk9DraSsW954zflGVV8vz21BPBhvmLM=
+    - secure: Tu26VJ9BsXxL20xxwWk4cbCkZyqyxYmNpSSqco5r3FLeU5hk5Vkk+s2BareRvqKhKHFlvyxu8GwsKtajMvsieP6y5J99gSeub6fDOIskPz61bo0aKA9nbDuBFSG1Z5wgXx1XRo0yDatLxXCXe3FbThRsylG7XNjtRaru1/lwuVxfxPtBGQ1opvQX71sST3GYSPoBYR+JlcVpU+uDHMAzsP8J0m5rEpxcl821aTMk3iz90hBQMsoLTBmSQePPcNqOA/1OH75VfjuXR8JBXHvA9njrUBrsyxgHf2uOh3jAXdIrHZwZg/17+y7gNVqByfx/UpGb8XEpVkncg/cRyVIHMk7/gFCZkeVC1QkIN5+EPiGLF7u32x9QaT7Zqz57iLh3IJzED2dj12qWaeX8QypF1K1r5qq4pRrN6iEZx76stpZbyFT4XnExHRdzPuouy7yz1gDHF0HOxbNLowzc/jk7tuTp+qmDSR5tRvegAIH3TONegxXyB7smdbvdI6MCN5/GP2bGK7HiqYWCmTGHtJwgxBKc5XoV8ZjpXfKxG98WbK5RsSP1miRnmxSbxaV0Gai1hfFlanJFFxTA9584O+NVRXNNFMfnnt20Ts6OwoXTcJ/boIPjF5Mcm0eJ4nz4R18TArXE4B5S4pTk3eQkG1ACDigkYZ3fc6ws4cWrt8BZASI=
+    - secure: fNEx9OXi2UisiYu0FiHJpV9+vWLB9DIUAIKG24GfUHVgZqFQOInBf5fEYrjlVgm5zNezSBS3hFNHXd/EXJF8KNgbf6mI0z4h4RyyQY98N+78tWvINoIawEeYpgC6NTI52MdaCfV+fTVWhiL0uP7mqWhLmll2bKXIy6HA6I9PnmiQSloNe64vUPF+UsVZHzzeabK4DR2VdI3h+BGXzOY9FG8Kt2voiXOLd2RFpVeN86FDTp+uVZY/K9e/MsktoK+XaZZ4qMAgm6lB32LVkzl3KA9ki6y6BY7le1m2c90hxAtBJGWZptkMb+VL0Fem39nEBnLjE0a0vIddp32PLJQmv6eopMfLay5BIkwtkRwv3P0uCwYd0bgYQSHF/gdTCcK1nr7fMhkQveBh6vmnbhrca7OeQRHz08+jo6EquUgNQZKmTZPWXQn9lS9mU/0EDLJJhn4KhJezGw6DcAAqB0KqmQedxtHMUT87by7LzhINwKZnm4y5WKA/W/zLI6dNqvIgc5C6UJh0EVgxa13GRmrnGmttV1dtLRQhiMJCbJykaekjPMULUmli0RbFz7bSFqFqEUsF+wwovyD+Y6D8KGOJdvvEYPdPIFpRPnhGUvH86JzsFdVKNJBicGI9LpCtlXlWNRbQIQ8uV5ze2HhxSJhtM6e6dB4d9yzpp6a81uR77bk=
 
     # $base_rmq_ref is used by rabbitmq-components.mk to select the
     # appropriate branch for dependencies.
     - base_rmq_ref=master
 
 elixir:
-  - '1.9'
+  - '1.10'
 otp_release:
-  - '21.3'
-  - '22.2'
+  - '22.3'
+  - '23.0'
 
 install:
   # This project being an Erlang one (we just set language to Elixir

deps/rabbitmq_management/src/rabbit_mgmt_wm_aliveness_test.erl

@@ -11,6 +11,7 @@
 -export([resource_exists/2]).
 -export([variances/2]).
 
+-include("rabbit_mgmt.hrl").
 -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl").
 -include_lib("amqp_client/include/amqp_client.hrl").
 
@@ -25,30 +26,46 @@ variances(Req, Context) ->
     {[<<"accept-encoding">>, <<"origin">>], Req, Context}.
 
 content_types_provided(ReqData, Context) ->
-   {rabbit_mgmt_util:responder_map(to_json), ReqData, Context}.
+    {rabbit_mgmt_util:responder_map(to_json), ReqData, Context}.
 
 resource_exists(ReqData, Context) ->
     {case rabbit_mgmt_util:vhost(ReqData) of
-         not_found -> false;
-         _         -> true
-     end, ReqData, Context}.
+            not_found -> false;
+            _ -> true
+        end, ReqData, Context}.
 
 to_json(ReqData, Context) ->
     rabbit_mgmt_util:with_channel(
-      rabbit_mgmt_util:vhost(ReqData), ReqData, Context,
-      fun(Ch) ->
-              amqp_channel:call(Ch, #'queue.declare'{queue = ?QUEUE}),
-              amqp_channel:call(Ch, #'basic.publish'{routing_key = ?QUEUE},
-                                #amqp_msg{payload = <<"test_message">>}),
-              {#'basic.get_ok'{}, _} =
-                  amqp_channel:call(Ch, #'basic.get'{queue  = ?QUEUE,
-                                                     no_ack = true}),
-              %% Don't delete the queue. If this is pinged every few
-              %% seconds we don't want to create a mnesia transaction
-              %% each time.
-              rabbit_mgmt_util:reply([{status, ok}], ReqData, Context)
-      end).
+        rabbit_mgmt_util:vhost(ReqData),
+        ReqData,
+        Context,
+        fun(Ch) ->
+            #'queue.declare_ok'{queue = ?QUEUE} = amqp_channel:call(Ch, #'queue.declare'{
+                queue = ?QUEUE
+            }),
+            ok = amqp_channel:call(Ch, #'basic.publish'{routing_key = ?QUEUE}, #amqp_msg{
+                payload = <<"test_message">>
+            }),
+            case amqp_channel:call(Ch, #'basic.get'{queue = ?QUEUE, no_ack = true}) of
+                {#'basic.get_ok'{}, _} ->
+                    %% Don't delete the queue. If this is pinged every few
+                    %% seconds we don't want to create a mnesia transaction
+                    %% each time.
+                    rabbit_mgmt_util:reply([{status, ok}], ReqData, Context);
+                #'basic.get_empty'{} ->
+                    Reason = <<"aliveness-test queue is empty">>,
+                    failure(Reason, ReqData, Context);
+                Error ->
+                    Reason = rabbit_data_coercion:to_binary(Error),
+                    failure(Reason, ReqData, Context)
+            end
+        end
+    ).
+
+failure(Reason, ReqData0, Context0) ->
+    Body = #{status => failed, reason => Reason},
+    {Response, ReqData1, Context1} = rabbit_mgmt_util:reply(Body, ReqData0, Context0),
+    {stop, cowboy_req:reply(?HEALTH_CHECK_FAILURE_STATUS, #{}, Response, ReqData1), Context1}.
 
 is_authorized(ReqData, Context) ->
     rabbit_mgmt_util:is_authorized_vhost(ReqData, Context).
-

deps/rabbitmq_management/src/rabbit_mgmt_wm_health_check_alarms.erl

@@ -12,7 +12,7 @@
 -export([resource_exists/2]).
 -export([variances/2]).
 
--include_lib("rabbitmq_management/include/rabbit_mgmt.hrl").
+-include("rabbit_mgmt.hrl").
 -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl").
 
 %%--------------------------------------------------------------------

deps/rabbitmq_management/src/rabbit_mgmt_wm_health_check_local_alarms.erl

@@ -12,7 +12,7 @@
 -export([resource_exists/2]).
 -export([variances/2]).
 
--include_lib("rabbitmq_management/include/rabbit_mgmt.hrl").
+-include("rabbit_mgmt.hrl").
 -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl").
 
 %%--------------------------------------------------------------------

deps/rabbitmq_management/src/rabbit_mgmt_wm_healthchecks.erl

@@ -13,7 +13,7 @@
 -export([resource_exists/2]).
 -export([variances/2]).
 
--include_lib("rabbitmq_management/include/rabbit_mgmt.hrl").
+-include("rabbit_mgmt.hrl").
 -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl").
 
 %%--------------------------------------------------------------------

deps/rabbitmq_management/test/rabbit_mgmt_http_health_checks_SUITE.erl

@@ -7,10 +7,10 @@
 
 -module(rabbit_mgmt_http_health_checks_SUITE).
 
+-include("rabbit_mgmt.hrl").
 -include_lib("amqp_client/include/amqp_client.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
--include_lib("rabbitmq_management/include/rabbit_mgmt.hrl").
 -include_lib("rabbitmq_ct_helpers/include/rabbit_mgmt_test.hrl").
 
 -import(rabbit_ct_client_helpers, [close_connection/1, close_channel/1,