Merge lp:~gandelman-a/charms/precise/rabbitmq-server/cluster_fix into lp:charms/rabbitmq-server

[Adam Gandelman]

[James Page (james-page)]

Hi Adam

I gave this a try; the changes generally look OK BUT I do hit issues when `relation-get private-address` returns an IP address instead of a hostname; this will happen when using the openstack and local providers so I think the charm needs to deal with this as well.

Cheers

James

review: Needs Fixing

[Clint Byrum (clint-fewbar)]

Excerpts from James Page's message of 2012-12-07 10:03:27 UTC:
> Review: Needs Fixing
>
> Hi Adam
>
> I gave this a try; the changes generally look OK BUT I do hit issues when `relation-get private-address` returns an IP address instead of a hostname; this will happen when using the openstack and local providers so I think the charm needs to deal with this as well.
>

Smells like something for charm helper to do.

the sh/net.sh helper already has a 'ch_is_ip' that uses awk to test if the input is an ipv4 address.

Even better would be something like

ch_relation_get_private_ip

and

ch_unit_get_private_ip

Which would hide all the details of turning that into an IP.

[lp:~gandelman-a/charms/precise/rabbitmq-server/cluster_fix]

43. By Adam Gandelman on 2012-12-07

Revert use of 'relation-get private-address'

[Adam Gandelman (gandelman-a)]

I've reverted the charm's peer relations back to their previous behavior. Turns out, when clustering peers, rabbitmq needs to address its peers by the peers' node name, which is the local hostname of that system. Using anything else (IP, FQDN, CNAME) wont work. This is why the original hook passed output of `hostname` across the relation as the hostname and did not use anything from the provider. I've tested on both the EC2 and OSAPI provider and clustering works as expected.

=== modified file 'hooks/rabbitmq-common'
--- hooks/rabbitmq-common	2011-12-05 19:55:29 +0000
+++ hooks/rabbitmq-common	2012-12-07 20:44:21 +0000
@@ -18,8 +18,10 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+set -ue
+
 RABBIT_CTL='rabbitmqctl'
-HOSTNAME=`hostname -f`
+
 ERLANG_COOKIE="/var/lib/rabbitmq/.erlang.cookie"
 
 function user_exists {
@@ -31,25 +33,25 @@
 }
 
 function vhost_exists {
-  $RABBIT_CTL list_vhosts | grep "^$VHOST\$" >/dev/null
+  $RABBIT_CTL list_vhosts | grep "^$1\$" >/dev/null
 }
 
 function create_vhost {
-  $RABBIT_CTL add_vhost $VHOST
+  juju-log "Creating vhost: $1"
+  $RABBIT_CTL add_vhost "$1"
 }
 
 function user_create {
   juju-log "rabbitmq: Creating user $1."
-
-  $RABBIT_CTL add_user $1 $PASSWORD || return 1
+  $RABBIT_CTL add_user "$1" "$3" || return 1
 
   # grant the user all permissions on the default vhost /
   # TODO: investigate sane permissions
   juju-log "rabbitmq: Granting permission to $1 on vhost /"
   $RABBIT_CTL set_permissions -p $VHOST $1 ".*" ".*" ".*"
 
-  if [[ $2 == 'admin' ]]  ; then
-    user_is_admin $1 && return 0
+  if [[ "$2" == 'admin' ]]  ; then
+    user_is_admin "$1" && return 0
     juju-log "rabbitmq: Granting user $1 admin access"
     $RABBIT_CTL set_user_tags "$1" administrator || return 1
   fi

=== modified file 'hooks/rabbitmq-relations'
--- hooks/rabbitmq-relations	2012-11-21 14:47:12 +0000
+++ hooks/rabbitmq-relations	2012-12-07 20:44:21 +0000
@@ -19,14 +19,15 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set -u
-FORMULA_DIR=$(dirname $0)
+set -ue
+
+CHARM_DIR=$(dirname $0)
 ARG0=${0##*/}
 
-if [[ -e $FORMULA_DIR/rabbitmq-common ]] ; then
-  . $FORMULA_DIR/rabbitmq-common
+if [[ -e $CHARM_DIR/rabbitmq-common ]] ; then
+  . $CHARM_DIR/rabbitmq-common
 else
-  juju-log "rabbitmq-server: ERROR Could not load $FORMULA_DIR/rabbitmq-common"
+  juju-log "rabbitmq-server: ERROR Could not load $CHARM_DIR/rabbitmq-common"
   exit 1
 fi
 
@@ -46,62 +47,70 @@
   # In reponse, we generate a password for new users,
   # grant the user access on the default vhost "/",
   # and tell it where to reach us.
-  RABBIT_USER=`relation-get username`
-  VHOST=`relation-get vhost`
-  if [[ -z $RABBIT_USER ]] || [[ -z $VHOST ]] ; then
-    juju-log "rabbitmq-server: RABBIT_USER||VHOST not yet received from peer."
+  local rabbit_user=`relation-get username`
+  local vhost=`relation-get vhost`
+  if [[ -z "$rabbit_user" ]] || [[ -z "$vhost" ]] ; then
+    juju-log "rabbitmq-server: rabbit_user||vhost not yet received from peer."
     exit 0
   fi
-  PASSWD_FILE="/var/lib/juju/$RABBIT_USER.passwd"
-  if [[ -e $PASSWD_FILE ]] ; then
-    PASSWORD=$(cat $PASSWD_FILE)
-  else
-    PASSWORD=$(pwgen 10 1)
-    echo $PASSWORD >$PASSWD_FILE
-    chmod 0400 $PASSWD_FILE
-  fi
-  if ! vhost_exists ; then
-    juju-log "rabbitmq-server: Creating vhost $VHOST"
-    create_vhost
-  fi
-  if ! user_exists $RABBIT_USER ; then
-    juju-log "rabbitmq-server: Creating user $RABBIT_USER"
-    user_create $RABBIT_USER admin || exit 1
-  else
-    juju-log "rabbitmq-server: user $RABBIT_USER already exists."
-  fi
-  juju-log "rabbitmq-server: Returning credentials for $RABBIT_USER@$HOSTNAME"
-  relation-set hostname=`unit-get private-address`
-  relation-set password=$PASSWORD
+  local passwd_file="/var/lib/juju/$rabbit_user.passwd"
+  local password=""
+  if [[ -e $passwd_file ]] ; then
+    password=$(cat $passwd_file)
+  else
+    password=$(pwgen 10 1)
+    echo $password >$passwd_file
+    chmod 0400 $passwd_file
+  fi
+  if ! vhost_exists "$vhost" ; then
+    juju-log "rabbitmq-server: Creating vhost $vhost"
+    create_vhost "$vhost"
+  fi
+  if ! user_exists "$rabbit_user" ; then
+    juju-log "rabbitmq-server: Creating user $rabbit_user"
+    user_create $rabbit_user admin || exit 1
+  else
+    juju-log "rabbitmq-server: user $rabbit_user already exists."
+  fi
+  local remote_host="$(relation-get private-address)"
+  juju-log "rabbitmq-server: Returning credentials for $rabbit_user@$remote_host"
+  relation-set password="$password"
 }
 
 function cluster_joined {
-  REMOTE_UNIT_ID=$(echo $JUJU_REMOTE_UNIT | cut -d/ -f2)
-  LOCAL_UNIT_ID=$(echo $JUJU_UNIT_NAME | cut -d/ -f2)
-  [[ $LOCAL_UNIT_ID -gt $REMOTE_UNIT_ID ]] && echo "Relation greater" && exit 0
+  local remote_unit_id=$(echo $JUJU_REMOTE_UNIT | cut -d/ -f2)
+  local local_unit_id=$(echo $JUJU_UNIT_NAME | cut -d/ -f2)
+  [[ $local_unit_id -gt $remote_unit_id ]] && echo "Relation greater" && exit 0
   if [[ ! -e $ERLANG_COOKIE ]] ; then
     juju-log "rabbitmq-server: ERROR Could not find cookie at $ERLANG_COOKIE"
     exit 1
   fi
-  relation-set cookie=$(cat $ERLANG_COOKIE) host=$HOSTNAME
+  relation-set cookie="$(cat $ERLANG_COOKIE)" host="$(hostname)"
 }
 
 function cluster_changed {
-  REMOTE_UNIT_ID=$(echo $JUJU_REMOTE_UNIT | cut -d/ -f2)
-  LOCAL_UNIT_ID=$(echo $JUJU_UNIT_NAME | cut -d/ -f2)
-  [[ $LOCAL_UNIT_ID -lt $REMOTE_UNIT_ID ]] && echo "Relation lesser" && exit 0
-
-  REMOTE_HOST=$(relation-get host)
-  COOKIE_VALUE=$(relation-get cookie)
-  [[ -z $REMOTE_HOST ]] || [[ -z $COOKIE_VALUE ]] && \
-    juju-log "rabbimtq-server: REMOTE_HOST||COOKIE_VALUE not yet set." \
+  local remote_unit_id=$(echo $JUJU_REMOTE_UNIT | cut -d/ -f2)
+  local local_unit_id=$(echo $JUJU_UNIT_NAME | cut -d/ -f2)
+
+  [[ $local_unit_id -lt $remote_unit_id ]] && echo "Relation lesser" && exit 0
+
+  local remote_host=$(relation-get host)
+  local cookie_value=$(relation-get cookie)
+
+  [[ -z "$remote_host" ]] || [[ -z "$cookie_value" ]] && \
+    juju-log "rabbimtq-server: remote_host||cookie_value not yet set." &&
     exit 0
 
+  # Sync the erlang cookie to that of remote host.
   service rabbitmq-server stop
-  echo -n $COOKIE_VALUE > $ERLANG_COOKIE
+  echo -n "$cookie_value" > $ERLANG_COOKIE
   service rabbitmq-server start
-  rabbitmqctl reset
-  rabbitmqctl cluster rabbit@$HOSTNAME rabbit@$REMOTE_HOST
+
+  # Configure clustering.
+  # rabbitmq apparently does not like FQDNs.
+  local short_host=$(echo $remote_host | sed -e 's/\./ /g' | awk '{ print $1 }')
+  rabbitmqctl stop_app
+  rabbitmqctl cluster rabbit@$short_host
   rabbitmqctl start_app
 }
 

=== modified file 'revision'
--- revision	2012-11-21 15:30:39 +0000
+++ revision	2012-12-07 20:44:21 +0000
@@ -1,1 +1,1 @@
-37
+39