openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Change the rabbitmq ha policies during an M/N Upgrade"

Browse Source
This commit is contained in:
Jenkins 2016-10-03 16:40:06 +00:00 committed by Gerrit Code Review
commit 64dc5fabbd
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
View File

@ -20,9 +20,13 @@ check_disk_for_mysql_dump
STONITH_STATE=$(pcs property show stonith-enabled | grep "stonith-enabled" | awk '{ print $2 }')
pcs property set stonith-enabled=false
# Migrate to HA NG
# Migrate to HA NG and fix up rabbitmq queues
# We fix up the rabbitmq ha queues after the migration because it will
# restart the rabbitmq resource. Doing it after the migration means no other
# services will be restart as there are no other constraints
if [[ -n $(is_bootstrap_node) ]]; then
migrate_full_to_ng_ha
rabbitmq_mitaka_newton_upgrade
fi
# After migrating the cluster to HA-NG the services not under pacemaker's control

19
extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
View File

@ -169,3 +169,22 @@ function migrate_full_to_ng_ha {
fi
fi
}
# This function will make sure that the rabbitmq ha policies are converted from mitaka to newton
# In mitaka we had: Attributes: set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"
# In newton we want: Attributes: set_policy="ha-all ^(?!amq\.).* {"ha-mode":"exactly","ha-params":2}"
# The nr "2" should be CEIL(N/2) where N is the number of Controllers (i.e. rabbit instances)
# Note that changing an attribute like this makes the rabbitmq resource restart
function rabbitmq_mitaka_newton_upgrade {
if pcs resource show rabbitmq-clone | grep -q -E "Attributes:.*\"ha-mode\":\"all\""; then
# Number of controller is obtained by counting how many hostnames we
# have in controller_node_names hiera key
nr_controllers=$(($(hiera controller_node_names | grep -o "," |wc -l) + 1))
nr_queues=$(($nr_controllers / 2 + ($nr_controllers % 2)))
if ! [ $nr_queues -gt 0 -a $nr_queues -le $nr_controllers ]; then
echo_error "ERROR: The nr. of HA queues during the M/N upgrade is out of range $nr_queues"
exit 1
fi
pcs resource update rabbitmq set_policy='ha-all ^(?!amq\\.).* {"ha-mode":"exactly","ha-params":'"$nr_queues}" --wait=600
fi
}