Merge pull request ClusterLabs#839 from jeckersb/rabbitmq_cluster_rejoin

fabbione · web-flow · commit 1d15f54923a7 · 2016-07-27T05:31:46.000+02:00
rabbitmq: Allow automatic cluster recovery before forcing it
diff --git a/heartbeat/rabbitmq-cluster b/heartbeat/rabbitmq-cluster
@@ -238,6 +238,11 @@ rmq_start_first()
 	return $rc
 }
 
+rmq_is_clustered()
+{
+    $RMQ_CTL eval 'rabbit_mnesia:is_clustered().' | grep -q true
+}
+
 rmq_join_existing()
 {
 	local join_list="$1"
@@ -249,6 +254,11 @@ rmq_join_existing()
 		return $OCF_ERR_GENERIC
 	fi
 
+        if rmq_is_clustered; then
+            ocf_log info "Successfully re-joined existing rabbitmq cluster automatically"
+            return $OCF_SUCCESS
+        fi
+
 	# unconditionally join the cluster
 	$RMQ_CTL stop_app > /dev/null 2>&1
 	for node in $(echo "$join_list"); do
