Hello community, here is the log from the commit of package cluster-glue for openSUSE:Factory checked in at 2018-08-27 13:46:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old) and /work/SRC/openSUSE:Factory/.cluster-glue.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cluster-glue" Mon Aug 27 13:46:47 2018 rev:66 rq:629574 version:1.0.12+v1.git.1534346580.be86a9f2 Changes: -------- --- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes 2018-04-17 11:08:38.647364784 +0200 +++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes 2018-08-27 13:46:55.612344147 +0200 @@ -1,0 +2,8 @@ +Thu Aug 16 07:31:33 UTC 2018 - [email protected] + +- Update to version 1.0.12+v1.git.1534346580.be86a9f2: + * Fix: stonith:ibmhmc: Add "managedsyspat" and "password" as supported parameters (bsc#1098758) +- Remove obsolete patch: + * Remove 0001-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch + +------------------------------------------------------------------- Old: ---- 0001-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch cluster-glue-1.0.12+v1.git.1523280117.43b22d15.tar.bz2 New: ---- cluster-glue-1.0.12+v1.git.1534346580.be86a9f2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cluster-glue.spec ++++++ --- /var/tmp/diff_new_pack.Zi9SI3/_old 2018-08-27 13:46:56.368345228 +0200 +++ /var/tmp/diff_new_pack.Zi9SI3/_new 2018-08-27 13:46:56.368345228 +0200 @@ -23,7 +23,7 @@ # Directory where we install documentation %global glue_docdir %{_defaultdocdir}/%{name} Name: cluster-glue -Version: 1.0.12+v1.git.1523280117.43b22d15 +Version: 1.0.12+v1.git.1534346580.be86a9f2 Release: 0 Summary: Reusable cluster components License: GPL-2.0-only AND LGPL-2.1-or-later @@ -39,8 +39,6 @@ # PATCH-FIX-UPSTREAM: fix warnings seen by GCC7 # PATCH-FIX-OPENSUSE: Port scripts to Python 3 Patch5: 0001-Port-scripts-to-Python-3.patch -# PATCH-FIX-UPSTREAM: Medium: external/ec2: Mitigate fence race (bsc#1088656) -Patch6: 0001-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch BuildRequires: autoconf BuildRequires: automake @@ -108,7 +106,6 @@ %patch1 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %build export CFLAGS="${CFLAGS} %{optflags}" ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Zi9SI3/_old 2018-08-27 13:46:56.404345279 +0200 +++ /var/tmp/diff_new_pack.Zi9SI3/_new 2018-08-27 13:46:56.408345285 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/cluster-glue.git</param> - <param name="changesrevision">6734e0d0f6c20e44f31ab3f6664569adb3109dfd</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">be86a9f22546e7d765b71ec0faebdabcc3a7c988</param></service></servicedata> \ No newline at end of file ++++++ cluster-glue-1.0.12+v1.git.1523280117.43b22d15.tar.bz2 -> cluster-glue-1.0.12+v1.git.1534346580.be86a9f2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue-1.0.12+v1.git.1523280117.43b22d15/lib/plugins/stonith/external/ec2 new/cluster-glue-1.0.12+v1.git.1534346580.be86a9f2/lib/plugins/stonith/external/ec2 --- old/cluster-glue-1.0.12+v1.git.1523280117.43b22d15/lib/plugins/stonith/external/ec2 2018-04-09 15:21:57.000000000 +0200 +++ new/cluster-glue-1.0.12+v1.git.1534346580.be86a9f2/lib/plugins/stonith/external/ec2 2018-08-15 17:23:00.000000000 +0200 @@ -170,6 +170,33 @@ exit 0; } +function is_instance_running() +{ + local myinstance + local mystatus + + # get my instance id + myinstance="$(curl http://169.254.169.254/latest/meta-data/instance-id)" + + # check my status. + # When the EC2 instance be stopped by the "aws ec2 stop-instances" , the stop processing of the OS is executed. + # While the OS stop processing, Pacemaker can execute the STONITH processing. + # So, If my status is not "running", it determined that I was already fenced. And to prevent fencing each other + # in split-brain, I don't fence other node. + if [ -z "$myinstance" ]; then + ha_log.sh err "Failed to get Instance ID. Unable to check instance status." + return 1 + fi + + mystatus="$(instance_status $myinstance)" + + if [ "$mystatus" != "running" ]; then #do not fence + ha_log.sh warn "Already fenced (Instance status = $mystatus). Aborting fence attempt." + return 1 + fi + return 0 +} + function instance_for_port() { local port=$1 @@ -312,24 +339,6 @@ ;; esac -# get my instance id -myinstance=`curl http://169.254.169.254/latest/meta-data/instance-id` - -# check my status. -# When the EC2 instance be stopped by the "aws ec2 stop-instances" , the stop processing of the OS is executed. -# While the OS stop processing, Pacemaker can execute the STONITH processing. -# So, If my status is not "running", it determined that I was already fenced. And to prevent fencing each other -# in split-brain, I don't fence other node. -if [ -z "$myinstance" ]; then - ha_log.sh err "Failed to get My Instance ID. so can not check my status." - exit 1 -fi -mystatus=`instance_status $myinstance` -if [ "$mystatus" != "running" ]; then #do not fence - ha_log.sh warn "I was already fenced (My instance status=$mystatus). I don't fence other node." - exit 1 -fi - if [ -z "$port" ]; then port="$node_to_fence" fi @@ -340,6 +349,8 @@ instance=`instance_for_port $port $options` fi +is_instance_running || exit 1 + case $action in reboot|reset) status=`instance_status $instance` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue-1.0.12+v1.git.1523280117.43b22d15/lib/plugins/stonith/ibmhmc.c new/cluster-glue-1.0.12+v1.git.1534346580.be86a9f2/lib/plugins/stonith/ibmhmc.c --- old/cluster-glue-1.0.12+v1.git.1523280117.43b22d15/lib/plugins/stonith/ibmhmc.c 2018-04-09 15:21:57.000000000 +0200 +++ new/cluster-glue-1.0.12+v1.git.1534346580.be86a9f2/lib/plugins/stonith/ibmhmc.c 2018-08-15 17:23:00.000000000 +0200 @@ -320,7 +320,7 @@ static const char * const * ibmhmc_get_confignames(StonithPlugin* p) { - static const char * names[] = {ST_IPADDR, NULL}; + static const char * names[] = {ST_IPADDR, ST_MANSYSPAT, ST_PASSWD, NULL}; if (Debug) { LOG(PIL_DEBUG, "%s: called.", __FUNCTION__); }
