From: Evgeny Khramtsov <ekhramtsov@process-one.net>
Date: Thu, 18 Jul 2019 10:02:13 +0000 (+0300)
Subject: Report failures of changing net_ticktime
X-Git-Tag: 19.08~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=478f69317bf93f3f97e01ef8a78a13aa1b382d27;p=ejabberd

Report failures of changing net_ticktime
---

diff --git a/src/ejabberd_cluster.erl b/src/ejabberd_cluster.erl
index 9cb189248..81c605cde 100644
--- a/src/ejabberd_cluster.erl
+++ b/src/ejabberd_cluster.erl
@@ -163,7 +163,15 @@ subscribe(Proc) ->
 %%%===================================================================
 set_ticktime() ->
     Ticktime = ejabberd_option:net_ticktime() div 1000,
-    net_kernel:set_net_ticktime(Ticktime).
+    case net_kernel:set_net_ticktime(Ticktime) of
+	{ongoing_change_to, Time} when Time /= Ticktime ->
+	    ?ERROR_MSG("Failed to set new net_ticktime because "
+		       "the net kernel is busy changing it to the "
+		       "previously configured value. Please wait for "
+		       "~B seconds and retry", [Time]);
+	_ ->
+	    ok
+    end.
 
 %%%===================================================================
 %%% gen_server API