Merge "[services-ng] gracefully shutdown mysql server in warden"

jobs/mysql_node_ng/templates/my.shutdown.erb

@@ -4,9 +4,11 @@ plan_enabled = properties.service_plans && properties.service_plans.send(service
 plan = properties.plan || "free"
 plan_conf = plan_enabled && properties.service_plans.send(service.to_sym).send(plan.to_sym).configuration
 base_folder = '/var/vcap/sys/run/mysqld'
+warden = plan_conf.warden
+use_warden = warden && warden.enable
 %>
 export LD_LIBRARY_PATH=/var/vcap/packages/mysql/lib/mysql
 
-password=<%= properties.mysql_node.password %>
+password=<%= use_warden ? "$1" : properties.mysql_node.password %>
 
 /var/vcap/packages/mysql/bin/mysqladmin --user=root --password="${password}" --socket=<%= "#{base_folder}/mysqld.sock" %> shutdown

jobs/mysql_node_ng/templates/my55.shutdown.erb

@@ -4,9 +4,11 @@ plan_enabled = properties.service_plans && properties.service_plans.send(service
 plan = properties.plan || "free"
 plan_conf = plan_enabled && properties.service_plans.send(service.to_sym).send(plan.to_sym).configuration
 base_folder = '/var/vcap/sys/run/mysqld'
+warden = plan_conf.warden
+use_warden = warden && warden.enable
 %>
 export LD_LIBRARY_PATH=/var/vcap/packages/mysql55/lib/mysql
 
-password=<%= properties.mysql_node.password %>
+password=<%= use_warden ? "$1" : properties.mysql_node.password %>
 
 /var/vcap/packages/mysql55/bin/mysqladmin --user=root --password="${password}" --socket=<%= "#{base_folder}/mysqld55.sock" %> shutdown

jobs/mysql_node_ng/templates/mysql55_ctl.erb

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source /var/vcap/packages/common/utils.sh
+
 case $1 in
 
   start)

jobs/mysql_node_ng/templates/mysql_ctl.erb

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source /var/vcap/packages/common/utils.sh
+
 case $1 in
 
   start)

jobs/mysql_node_ng/templates/mysql_node_ctl

@@ -76,6 +76,7 @@ case $1 in
     mkdir -p $COMMON_DIR/bin
     mkdir -p $COMMON_DIR/config
     rsync -arl $JOB_DIR/bin/warden_service_ctl $COMMON_DIR/bin
+    rsync -arl $JOB_DIR/bin/my*.shutdown $COMMON_DIR/bin
     rsync -arl /var/vcap/packages/common/utils.sh $COMMON_DIR/bin
     chmod -R 755 $COMMON_DIR/bin
     rsync $JOB_DIR/config/my*.cnf $COMMON_DIR/config

jobs/mysql_node_ng/templates/warden_service_ctl

@@ -7,6 +7,7 @@ COMMON_DIR=$4
 BIN_DIR=$5
 DATA_DIR=$6
 VERSION=$7
+PASSWORD=$8
 PIDFILE=$BASE_DIR/service.pid
 
 source $COMMON_DIR/bin/utils.sh
@@ -21,7 +22,7 @@ case $OP in
     ;;
 
   stop)
-    $BIN_DIR/libexec/mysql_warden.server stop $COMMON_DIR/config/my$VERSION.cnf $STOP_TIMEOUT
+    $BIN_DIR/libexec/mysql_warden.server stop $COMMON_DIR/config/my$VERSION.cnf $STOP_TIMEOUT $PASSWORD
     rm -f $PIDFILE
     ;;
 

src/mysql/mysql55_warden.server

@@ -128,9 +128,6 @@ case "$mode" in
     ;;
 
   'stop')
-    # Stop daemon. We use a signal here to avoid having to know the
-    # root password.
-
     pid_file=$server_pid_file
 
     if test -s "$pid_file"
@@ -143,7 +140,7 @@ case "$mode" in
         defaultsdir=`dirname ${defaults}`
         if test -f $defaultsdir/../bin/my55.shutdown; then
           echo "Gracefully shutting down MySQL"
-          $defaultsdir/../bin/my55.shutdown; return_value=$?
+          $defaultsdir/../bin/my55.shutdown $other_args; return_value=$?
           if [ $return_value -ne 0 ]; then
             echo "Gracefully shut down MySQL failed, kill it"
             kill $mysqld_pid

src/mysql/mysql_warden.server

@@ -128,9 +128,6 @@ case "$mode" in
     ;;
 
   'stop')
-    # Stop daemon. We use a signal here to avoid having to know the
-    # root password.
-
     pid_file=$server_pid_file
 
     if test -s "$pid_file"
@@ -143,7 +140,7 @@ case "$mode" in
         defaultsdir=`dirname ${defaults}`
         if test -f $defaultsdir/../bin/my.shutdown; then
           echo "Gracefully shutting down MySQL"
-          $defaultsdir/../bin/my.shutdown; return_value=$?
+          $defaultsdir/../bin/my.shutdown $other_args; return_value=$?
           if [ $return_value -ne 0 ]; then
             echo "Gracefully shut down MySQL failed, kill it"
             kill $mysqld_pid