root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Use ocf_attribute_target instead of crm_node 

Instead of calling crm_node directly it is preferrable to use the
ocf_attribute_target function. This function will return crm_node -n
as usual, except when run inside a bundle (aka container in pcmk
language). Inside a bundle it will return the bundle name or, if the
meta attribute meta_container_attribute_target is set to 'host', it
will return the physical node name where the bundle is running.

Typically when running a rabbitmq cluster inside containers it is
desired to set 'meta_container_attribute_target=host' on the rabbit
cluster resource so that the RA is aware on which host it is running.

Tested both on baremetal (without containers):
 Master/Slave Set: rabbitmq-master [rabbitmq]
     Masters: [ controller-0 controller-1 controller-2 ]

And with bundles as well.

Co-Authored-By: Damien Ciabrini <dciabrin@redhat.com>
This commit is contained in:
Michele Baldessari 2018-11-19 20:57:52 +01:00
parent 48f2f982ad
commit c587ba79eb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/rabbitmq-server-ha.ocf
View File

@ -595,7 +595,7 @@ master_score() {
score=0 score=0
fi fi
ocf_log info "${LH} Updating master score attribute with ${score}" ocf_log info "${LH} Updating master score attribute with ${score}"
ocf_run crm_master -l reboot -v $score || return $OCF_ERR_GENERIC ocf_run crm_master -N $THIS_PCMK_NODE -l reboot -v $score || return $OCF_ERR_GENERIC
return $OCF_SUCCESS return $OCF_SUCCESS
} }
@ -660,7 +660,7 @@ get_node_master_score() {
# Return either rabbit node name as FQDN or shortname, depends on the OCF_RESKEY_use_fqdn. # Return either rabbit node name as FQDN or shortname, depends on the OCF_RESKEY_use_fqdn.
rabbit_node_name() { rabbit_node_name() {
echo "rabbit@$(process_fqdn $1)" echo "rabbit@$(process_fqdn $(ocf_attribute_target $1))"
} }
rmq_setup_env() { rmq_setup_env() {
@ -673,7 +673,7 @@ rmq_setup_env() {
MNESIA_FILES="${OCF_RESKEY_mnesia_base}/$(rabbit_node_name $H)" MNESIA_FILES="${OCF_RESKEY_mnesia_base}/$(rabbit_node_name $H)"
RMQ_START_TIME="${MNESIA_FILES}/ocf_server_start_time.txt" RMQ_START_TIME="${MNESIA_FILES}/ocf_server_start_time.txt"
MASTER_FLAG_FILE="${MNESIA_FILES}/ocf_master_for_${OCF_RESOURCE_INSTANCE}" MASTER_FLAG_FILE="${MNESIA_FILES}/ocf_master_for_${OCF_RESOURCE_INSTANCE}"
THIS_PCMK_NODE=`crm_node -n` THIS_PCMK_NODE=$(ocf_attribute_target)
TOTALVMEM=`free -mt | awk '/Total:/ {print $2}'` TOTALVMEM=`free -mt | awk '/Total:/ {print $2}'`
# check and make PID file dir # check and make PID file dir
local PID_DIR=$( dirname $OCF_RESKEY_pid_file ) local PID_DIR=$( dirname $OCF_RESKEY_pid_file )