fix metadata for pcs command's xml parser

This is reported as bug No.0000091 by maxiperez.
pgpool RA didn't work with pcs command.
"pcs resource describe pgpool" command output
"Error: Unable to parse xml for: pgpool".

diff --git a/ChangeLog b/ChangeLog
index b3ef57a3314b0e7e00bfd1cc497652ae631d2b5e..741b97ec9897415bc3075ed325b71b02dc434fd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014/1/28
+       * fix metadata for pcs command's xml parser
+
+2013/9/13
+       * Add wait loop to start action function.
+
 2013/4/25 release 2.1
 
 2013/2/7

diff --git a/pgpool.in b/pgpool.in
index 0e42a3581ec878944b770f433be96c0d59043b5b..10bc9dc1f752321d537e74a78f4eacf43ae3b49b 100644 (file)
--- a/pgpool.in
+++ b/pgpool.in
@@ -85,9 +85,12 @@ OCF_RESKEY_pcpnccmd_default=@_PGPOOL_DIR_@/bin/pcp_node_count
 
 if [ ! -e $OCF_RESKEY_pgpoolconf ]; then
        ocf_log warn "${OCF_RESOURCE_INSTANCE}: file '$OCF_RESKEY_pgpoolconf' (pgpoolconf) does not exists."
+
+else
+       PIDFILE=$(cat "$OCF_RESKEY_pgpoolconf" | grep "^pid_file_name" | cut -d "'" -f 2)
+
 fi
 
-PIDFILE=$(cat "$OCF_RESKEY_pgpoolconf" | grep "^pid_file_name" | cut -d "'" -f 2)
 
 if [ "x$OCF_RESKEY_checkstring" = "x" ] ; then
        case "$OCF_RESKEY_checkmethod" in
@@ -297,7 +300,7 @@ Path to pool_hba.conf of pgpool.
 pgpool log file for stdout and stderr redirection;
 or a program for log collecting by a pipeline.
 (e.g.)
- "/var/log/pgpool.log"
+ "/var/log/pgpool.log",
  "| logger -t pgpool -p local3.info"
    </longdesc>
    <shortdesc lang="en">pgpool logfile</shortdesc>
@@ -417,7 +420,7 @@ case "$1" in
        monitor|status)
                do_monitor ;;
        meta-data)
-               do_metadata ;;
+               do_metadata ; exit $OCF_SUCCESS ;;
        promote|demote|migrate_to|migrate_from)
                exit $OCF_ERR_UNIMPLEMENTED ;;
        validate-all)