Merge pull request #13673 from rabbitmq/su_aws/peer_discovery_unlimited

Added 'unlimited' config setting for peer_discovery_retry_limit

deps/rabbit/priv/schema/rabbit.schema

@@ -1401,10 +1401,19 @@ end}.
     ]}.
 
 {mapping, "cluster_formation.discovery_retry_limit", "rabbit.cluster_formation.discovery_retry_limit",
-    [
-     {datatype, integer},
-     {validators, ["non_zero_positive_integer"]}
-    ]}.
+    [{datatype, [{atom, unlimited}, integer]}]}.
+
+{translation, "rabbit.cluster_formation.discovery_retry_limit",
+ fun(Conf) ->
+   case cuttlefish:conf_get("cluster_formation.discovery_retry_limit", Conf, undefined) of
+      undefined -> cuttlefish:unset();
+      unlimited  -> unlimited;
+      Val when is_integer(Val) andalso Val > 0 -> Val;
+      _         -> cuttlefish:invalid("should be positive integer or 'unlimited'")
+  end
+ end
+}.
+
 {mapping, "cluster_formation.discovery_retry_interval", "rabbit.cluster_formation.discovery_retry_interval",
     [
      {datatype, integer},

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

@@ -838,6 +838,18 @@ tcp_listen_options.exit_on_close = false",
             [{peer_discovery_backend,rabbit_peer_discovery_classic_config},
              {node_type,ram}]}]}],
   []},
+ {cluster_formation_retry_limit_integer,
+  "cluster_formation.discovery_retry_limit = 500",
+  [{rabbit,
+       [{cluster_formation,
+            [{discovery_retry_limit, 500}]}]}],
+  []},
+ {cluster_formation_retry_limit_infinity,
+  "cluster_formation.discovery_retry_limit = unlimited",
+  [{rabbit,
+       [{cluster_formation,
+            [{discovery_retry_limit, unlimited}]}]}],
+  []},
  {background_gc_enabled,
   "background_gc_enabled = true
    background_gc_target_interval = 30000",