Hello community,
here is the log from the commit of package pacemaker for openSUSE:Factory checked in at 2011-12-25 17:37:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pacemaker (Old)
and /work/SRC/openSUSE:Factory/.pacemaker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pacemaker", Maintainer is "lmb@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pacemaker/pacemaker.changes 2011-11-25 23:05:35.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pacemaker.new/pacemaker.changes 2011-12-25 17:37:37.000000000 +0100
@@ -1,0 +2,30 @@
+Fri Dec 16 04:42:38 UTC 2011 - tserong@suse.com
+
+- RA: add NodeUtilization
+- stonith-ng: export stonith resource name to stonith agents
+- crmd: Send out all of the meta parameters to lrmd for stop action
+- RA: Fix the metadata of HealthSMART and SysInfo RAs
+- stonith: Longer default timeout/interval of operations for stonith
+ resources
+- Doc: many proof-reading improvements
+- stonith: Fix the stonith timeout issue (cl#5009, bnc#727498)
+- update the license information in pacemaker.spec (bnc#726795)
+- xml: Add rsc_ticket support into "pacemaker-1.2" schema
+- xml: Add resource template support into "pacemaker-1.2" schema
+- tools: Avoid problems caused by differences between node name and
+ uname -n
+- PE: Resolve memory leak when retrieving failure counts
+- Stonith: Implement a manual override for when nodes are known to be
+ safely off
+- PE: Implement limit number of concurrent live migrations (FATE#310118)
+- PE: Implement referencing templates in constraints
+- PE: Move master based on failure of colocated group
+- Fencing: Support admin configurable timeouts for API operations
+- Fencing: Support checking in-progress operations for all nodes
+- don't package crm shell code
+- add Requires: crmsh
+- Build man pages and html versions (bnc#723680)
+- Shell: template support
+- Upstream version cs: b988976485d15cb702c9307df55512d323831a5e
+
+-------------------------------------------------------------------
Old:
----
acl_fix_d44ff2711662.patch
crm_deleteunmanaged.patch
crm_history-fix-hb_report-limit.patch
crm_history.patch
crm_history_10_d21f988a419c.patch
crm_history_11_ccd0c1e1edf9.patch
crm_history_1_d0359dca5dba.patch
crm_history_2_29fd4f04c01f.patch
crm_history_3_b3a014c0f85b.patch
crm_history_4_a09974a06cdf.patch
crm_history_5_c3068d22de72.patch
crm_history_6_441f4448eba6.patch
crm_history_7_3f3c348aaaed.patch
crm_history_8_3681d3471fde.patch
crm_history_9_709ef91cfada.patch
crm_history_peinputs.patch
crm_history_pssh.patch
crm_lrmsecrets_3a81b7eae666.patch
crm_pager_f77e52725f2d.patch
crm_path_bnc712605.patch
crm_site_9b07d41c73b4.patch
crm_tickets_825cb3e79d7b.patch
New:
----
bug-728579_pacemaker-stonith-dev-id.diff
pacemaker-NodeUtilization-RA.diff
pacemaker-rsc_ticket-schema.diff
pacemaker-template-schema.diff
rm_crmsh.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pacemaker.spec ++++++
--- /var/tmp/diff_new_pack.7yQtHI/_old 2011-12-25 17:37:38.000000000 +0100
+++ /var/tmp/diff_new_pack.7yQtHI/_new 2011-12-25 17:37:38.000000000 +0100
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
%global pcmk_docdir %{_docdir}/%{name}
%if 0%{?suse_version}
@@ -38,48 +37,51 @@
Name: pacemaker
Summary: The Pacemaker scalable High-Availability cluster resource manager
+License: GPL-2.0+ ; LGPL-2.1+
+Group: Productivity/Clustering/HA
Version: 1.1.6
Release: 0
-License: GPL-2.0+ ; LGPL-2.1+
Url: http://www.clusterlabs.org
-Group: Productivity/Clustering/HA
Source: pacemaker.tar.bz2
Source2: %{doc_pkg}.tar.gz
Source100: pacemaker.rpmlintrc
Patch1: pacemaker-cts-startcmd.patch
-Patch2: acl_fix_d44ff2711662.patch
-Patch10: crm_history.patch
-Patch11: crm_history_peinputs.patch
-Patch12: crm_history_pssh.patch
-Patch13: crm_history_1_d0359dca5dba.patch
-Patch14: crm_history_2_29fd4f04c01f.patch
-Patch15: crm_history_3_b3a014c0f85b.patch
-Patch16: crm_history_4_a09974a06cdf.patch
-Patch17: crm_history_5_c3068d22de72.patch
-Patch18: crm_history-fix-hb_report-limit.patch
-Patch19: crm_history_6_441f4448eba6.patch
-Patch20: crm_history_7_3f3c348aaaed.patch
-Patch21: crm_history_8_3681d3471fde.patch
-Patch22: crm_path_bnc712605.patch
-Patch23: crm_deleteunmanaged.patch
-Patch24: crm_lrmsecrets_3a81b7eae666.patch
-Patch25: crm_history_9_709ef91cfada.patch
-Patch26: crm_history_10_d21f988a419c.patch
-Patch27: crm_history_11_ccd0c1e1edf9.patch
-Patch28: crm_pager_f77e52725f2d.patch
-Patch29: crm_tickets_825cb3e79d7b.patch
-Patch30: crm_site_9b07d41c73b4.patch
+Patch2: rm_crmsh.patch
+Patch3: pacemaker-rsc_ticket-schema.diff
+Patch4: pacemaker-template-schema.diff
+Patch5: bug-728579_pacemaker-stonith-dev-id.diff
+Patch6: pacemaker-NodeUtilization-RA.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-AutoReqProv: on
Conflicts: heartbeat < 3.0
# We need libglue2, not libheartbeat2
Conflicts: libheartbeat2 < 3.0.0
PreReq: cluster-glue >= 1.0.6
Requires: resource-agents openais python python-xml
Requires: libpacemaker3 = %{version}-%{release} python-curses
-BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel libesmtp-devel libglue-devel libtool libxml2-devel libxslt-devel ncurses-devel net-snmp-devel pam-devel pkgconfig python-devel resource-agents swig
+Recommends: crmsh
+BuildRequires: asciidoc
+BuildRequires: e2fsprogs-devel
+BuildRequires: glib2-devel
+BuildRequires: gnutls-devel
+BuildRequires: libesmtp-devel
+BuildRequires: libglue-devel
+BuildRequires: libtool
+BuildRequires: libxml2-devel
+BuildRequires: libxslt-devel
+BuildRequires: ncurses-devel
+BuildRequires: net-snmp-devel
+BuildRequires: pam-devel
+BuildRequires: pkgconfig
+BuildRequires: python-devel
+BuildRequires: resource-agents
+BuildRequires: swig
%if %with_regression_tests
-BuildRequires: openais procps python python-curses python-xml vim-base
+BuildRequires: openais
+BuildRequires: procps
+BuildRequires: python
+BuildRequires: python-curses
+BuildRequires: python-xml
+BuildRequires: vim-base
%endif
%if %with_ais_support
BuildRequires: libcorosync-devel
@@ -93,7 +95,6 @@
BuildRequires: libbz2-devel
Suggests: graphviz
Recommends: libdlm resource-agents
-Recommends: python-pssh
%if 0%{?suse_version} > 1100
BuildRequires: docbook-xsl-stylesheets
%endif
@@ -123,8 +124,8 @@
Andrew Beekhof
%package -n libpacemaker3
-License: GPL-2.0+ ; LGPL-2.1+
Summary: The Pacemaker scalable High-Availability cluster resource manager
+License: GPL-2.0+ ; LGPL-2.1+
Group: Productivity/Clustering/HA
%description -n libpacemaker3
@@ -145,8 +146,8 @@
Andrew Beekhof
%package -n libpacemaker-devel
-License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
Summary: The Pacemaker scalable High-Availability cluster resource manager
+License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}-%{release}
Requires: libpacemaker3 = %{version}-%{release}
@@ -179,28 +180,11 @@
###########################################################
%setup -a 2 -n pacemaker -q
%patch1 -p1
-%patch2 -p1 -R
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
###########################################################
%build
@@ -241,6 +225,10 @@
# Don't want to ship this just yet:
rm $RPM_BUILD_ROOT/etc/init.d/pacemaker || true
rm $RPM_BUILD_ROOT/usr/sbin/pacemaker{d,} || true
+rm $RPM_BUILD_ROOT/usr/bin/ccs2cib || true
+rm $RPM_BUILD_ROOT/usr/bin/ccs_flatten || true
+rm $RPM_BUILD_ROOT/usr/bin/disable_rgmanager || true
+rm $RPM_BUILD_ROOT/usr/sbin/fence_pcmk || true
%if %with_gcov
GCOV_BASE=$RPM_BUILD_ROOT/%{_var}/lib/pacemaker/gcov
@@ -312,7 +300,6 @@
%{_sbindir}/crm_failcount
%{_sbindir}/crm_master
%{_sbindir}/crm_mon
-%{_sbindir}/crm
%{_sbindir}/crm_resource
%{_sbindir}/crm_report
%{_sbindir}/crm_standby
@@ -328,7 +315,6 @@
%{_sbindir}/crm_simulate
%{_sbindir}/fence_legacy
%{_sbindir}/stonith_admin
-%{py_sitedir}/crm
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/crm
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pengine
@@ -353,8 +339,7 @@
%exclude %{pcmk_docdir}/COPYING
%exclude %{pcmk_docdir}/COPYING.LIB
%exclude %{_libdir}/pkgconfig
-%doc %{pcmk_docdir}
-# %doc %{pcmk_docdir}/*.html
+%doc %{pcmk_docdir}/*.html
%doc %{_mandir}/man8/*.8*
%doc %{_mandir}/man7/*.7*
%doc %{pcmk_docdir}/README.hb2openais
++++++ bug-728579_pacemaker-stonith-dev-id.diff ++++++
diff --git a/fencing/commands.c b/fencing/commands.c
index 8269d30..b2660ca 100644
--- a/fencing/commands.c
+++ b/fencing/commands.c
@@ -368,6 +368,7 @@ static stonith_device_t *build_device_from_xml(xmlNode *msg)
device->agent = crm_element_value_copy(dev, "agent");
device->namespace = crm_element_value_copy(dev, "namespace");
device->params = xml2list(dev);
+ g_hash_table_insert(device->params, crm_strdup("CRM_" F_STONITH_DEVICE), crm_strdup(device->id));
device->work = mainloop_add_trigger(G_PRIORITY_HIGH, stonith_device_dispatch, device);
/* TODO: Hook up priority */
++++++ pacemaker-NodeUtilization-RA.diff ++++++
commit 41ae609accd114bc5d4a05a74a80d3213d217373
Author: Dejan Muhamedagic
Date: Fri Nov 25 13:11:15 2011 +0100
Medium: RA: add NodeUtilization RA
diff --git a/extra/resources/Makefile.am b/extra/resources/Makefile.am
index bc35401..e38d64d 100644
--- a/extra/resources/Makefile.am
+++ b/extra/resources/Makefile.am
@@ -32,7 +32,8 @@ ocf_SCRIPTS = ClusterMon \
pingd \
Stateful \
SysInfo \
- SystemHealth
+ SystemHealth \
+ NodeUtilization
if BUILD_XML_HELP
man7_MANS = $(ocf_SCRIPTS:%=ocf_pacemaker_%.7)
diff --git a/extra/resources/NodeUtilization b/extra/resources/NodeUtilization
new file mode 100644
index 0000000..a2a17c6
--- /dev/null
+++ b/extra/resources/NodeUtilization
@@ -0,0 +1,229 @@
+#!/bin/sh
+#
+#
+# NodeUtilization OCF Resource Agent
+#
+# Copyright (c) 2011 SUSE LINUX, John Shi
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Further, this software is distributed without any warranty that it is
+# free of the rightful claim of any third person regarding infringement
+# or the like. Any license provided herein, whether implied or
+# otherwise, applies only to this software file. Patent licenses, if
+# any, provided herein do not apply to combinations of this program with
+# other software, or any other product whatsoever.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+#
+#######################################################################
+# Initialization:
+
+: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
+. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
+
+#######################################################################
+
+meta_data() {
+ cat </dev/null)
+
+ if [ "$sys_cpu" != "$uti_cpu" ]; then
+ if ! crm_attribute -t nodes -U "$host_name" -z -n cpu -v $sys_cpu; then
+ ocf_log err "Failed to set cpu of utilization by crm_attribute."
+ return 1
+ fi
+ fi
+ fi
+
+ if ocf_is_true "$OCF_RESKEY_utilization_host_memory"; then
+ sys_mem=$(( $(awk '/MemTotal/{printf("%d\n",$2/1024);exit(0)}' /proc/meminfo) - $OCF_RESKEY_utilization_host_memory_reservation ))
+ uti_mem=$(crm_attribute -Q -t nodes -U "$host_name" -z -n host_memory 2>/dev/null)
+
+ if [ "$sys_mem" != "$uti_mem" ]; then
+ if ! crm_attribute -t nodes -U "$host_name" -z -n host_memory -v $sys_mem; then
+ ocf_log err "Failed to set host_memory of utilization by crm_attribute."
+ return 1
+ fi
+ fi
+ fi
+
+ if [ -x /usr/sbin/xm ]; then
+ if ocf_is_true "$OCF_RESKEY_utilization_hv_memory"; then
+ hv_mem=$(( $(xm info | awk '/total_memory/{printf("%d\n",$3);exit(0)}') - $OCF_RESKEY_utilization_hv_memory_reservation ))
+ uti_mem=$(crm_attribute -Q -t nodes -U "$host_name" -z -n hv_memory 2>/dev/null)
+
+ if [ "$hv_mem" != "$uti_mem" ]; then
+ if ! crm_attribute -t nodes -U "$host_name" -z -n hv_memory -v $hv_mem; then
+ ocf_log err "Failed to set hv_memory of utilization by crm_attribute."
+ return 1
+ fi
+ fi
+ fi
+ fi
+}
+
+NodeUtilization_usage() {
+ cat <
Date: Wed Oct 26 17:36:30 2011 +0800
Medium: xml: Add rsc_ticket support into "pacemaker-1.2" schema
diff --git a/xml/constraints-1.2.rng b/xml/constraints-1.2.rng
index 84708aa..e4b9d80 100644
--- a/xml/constraints-1.2.rng
+++ b/xml/constraints-1.2.rng
@@ -11,6 +11,7 @@
<ref name="element-location"/>
<ref name="element-colocation"/>
<ref name="element-order"/>
+ <ref name="element-rsc_ticket"/>
</choice>
</zeroOrMore>
</define>
@@ -143,6 +144,36 @@
</element>
</define>
+ <define name="element-rsc_ticket">
+ <element name="rsc_ticket">
+ <attribute name="id"><data type="ID"/></attribute>
+ <choice>
+ <oneOrMore>
+ <ref name="element-resource-set"/>
+ </oneOrMore>
+ <group>
+ <attribute name="rsc"><data type="IDREF"/></attribute>
+ <optional>
+ <attribute name="rsc-role">
+ <ref name="attribute-roles"/>
+ </attribute>
+ </optional>
+ </group>
+ </choice>
+ <attribute name="ticket"><text/></attribute>
+ <optional>
+ <attribute name="loss-policy">
+ <choice>
+ <value>stop</value>
+ <value>demote</value>
+ <value>fence</value>
+ <value>freeze</value>
+ </choice>
+ </attribute>
+ </optional>
+ </element>
+ </define>
+
<define name="attribute-actions">
<choice>
<value>start</value>
++++++ pacemaker-template-schema.diff ++++++
commit 288cbadc532f1256129d1fcef5716ac1eb7d4bde
Author: Gao,Yan
Date: Wed Oct 26 17:45:03 2011 +0800
Medium: xml: Add resource template support into "pacemaker-1.2" schema
diff --git a/xml/resources-1.2.rng b/xml/resources-1.2.rng
index d2fe1a8..d295b2a 100644
--- a/xml/resources-1.2.rng
+++ b/xml/resources-1.2.rng
@@ -9,6 +9,7 @@
<zeroOrMore>
<choice>
<ref name="element-primitive"/>
+ <ref name="element-template"/>
<ref name="element-group"/>
<ref name="element-clone"/>
<ref name="element-master"/>
@@ -22,6 +23,44 @@
<attribute name="id"><data type="ID"/></attribute>
<choice>
<group>
+ <choice>
+ <group>
+ <attribute name="class"><value>ocf</value></attribute>
+ <attribute name="provider"><text/></attribute>
+ </group>
+ <attribute name="class">
+ <choice>
+ <value>lsb</value>
+ <value>heartbeat</value>
+ <value>stonith</value>
+ <value>upstart</value>
+ </choice>
+ </attribute>
+ </choice>
+ <attribute name="type"><text/></attribute>
+ </group>
+ <attribute name="template"><data type="IDREF"/></attribute>
+ </choice>
+ <optional>
+ <attribute name="description"><text/></attribute>
+ </optional>
+ <ref name="element-resource-extra"/>
+ <ref name="element-operations"/>
+ <zeroOrMore>
+ <element name="utilization">
+ <externalRef href="nvset.rng"/>
+ </element>
+ </zeroOrMore>
+ </interleave>
+ </element>
+ </define>
+
+ <define name="element-template">
+ <element name="template">
+ <interleave>
+ <attribute name="id"><data type="ID"/></attribute>
+ <choice>
+ <group>
<attribute name="class"><value>ocf</value></attribute>
<attribute name="provider"><text/></attribute>
</group>
++++++ pacemaker.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/pacemaker/pacemaker.tar.bz2 /work/SRC/openSUSE:Factory/.pacemaker.new/pacemaker.tar.bz2 differ: char 11, line 1
++++++ rm_crmsh.patch ++++++
# HG changeset patch
# Parent 9971ebba4494012a93c03b40a2c58ec0eb60f50c
build: remove crm shell
diff -r 9971ebba4494 Makefile.am
--- a/Makefile.am Wed Aug 31 11:02:11 2011 +1000
+++ b/Makefile.am Wed Oct 19 14:44:33 2011 +0200
@@ -23,7 +23,7 @@ EXTRA_DIST = autogen.sh Con
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure DRF/config-h.in \
DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
-CORE = $(LIBLTDL_DIR) replace include lib mcp pengine cib crmd fencing tools shell xml
+CORE = $(LIBLTDL_DIR) replace include lib mcp pengine cib crmd fencing tools xml
SUBDIRS = $(CORE) cts extra doc
doc_DATA = AUTHORS COPYING COPYING.LIB
diff -r 9971ebba4494 configure.ac
--- a/configure.ac Wed Aug 31 11:02:11 2011 +1000
+++ b/configure.ac Wed Oct 19 14:44:33 2011 +0200
@@ -1686,15 +1686,6 @@ tools/Makefile \
tools/coverage.sh \
tools/hb2openais.sh \
tools/crm_primitive.py \
-shell/Makefile \
- shell/templates/Makefile \
- shell/regression/Makefile \
- shell/regression/testcases/Makefile \
- shell/modules/Makefile \
- shell/modules/ui.py \
- shell/modules/ra.py \
- shell/modules/vars.py \
- shell/modules/help.py \
xml/Makefile \
)
diff -r 9971ebba4494 doc/Makefile.am
--- a/doc/Makefile.am Wed Aug 31 11:02:11 2011 +1000
+++ b/doc/Makefile.am Wed Oct 19 14:44:33 2011 +0200
@@ -22,7 +22,6 @@ MAINTAINERCLEANFILES = Makefile.in
helpdir = $(datadir)/$(PACKAGE)
ascii = crm_fencing.txt acls.txt
-asciiman = crm.8.txt
help_DATA = crm.8.txt
docbook = Pacemaker_Explained Clusters_from_Scratch
doc_DATA = README.hb2openais $(ascii) $(generated_docs)
@@ -57,10 +56,7 @@ graphics: $(PNGS)
$(INKSCAPE) --file=$< --export-dpi=180 -C --export-png=$@
if BUILD_ASCIIDOC
-generated_docs += $(ascii:%.txt=%.html) $(asciiman:%.txt=%.html)
-generated_mans += $(asciiman:%.8.txt=%.8)
-$(generated_mans): $(asciiman)
-man8_MANS = $(generated_mans)
+generated_docs += $(ascii:%.txt=%.html)
endif
if BUILD_DOCBOOK
@@ -122,12 +118,12 @@ brand: $(BRAND_PNGS) $(wildcard publica
# find publican-clusterlabs -name "*.noarch.rpm" -exec sudo rpm -Uvh --force \{\} \;
www: $(generated_docs)
- echo rsync -rtz --progress $(generated_docs) $(ascii) $(asciiman) root@www.clusterlabs.org:/var/www/html/doc/
- rsync -rtz --progress $(generated_docs) $(ascii) $(asciiman) root@www.clusterlabs.org:/var/www/html/doc/
+ echo rsync -rtz --progress $(generated_docs) $(ascii) root@www.clusterlabs.org:/var/www/html/doc/
+ rsync -rtz --progress $(generated_docs) $(ascii) root@www.clusterlabs.org:/var/www/html/doc/
rm -f $(docbook_txt)
make DOCBOOK_FORMATS="pdf,html,html-single,txt,epub" DOCBOOK_LANGS="all" all-local $(generated_docs) $(ascii)
echo Uploading current documentation set to clusterlabs.org
- rsync -rtz --progress $(generated_docs) $(ascii) $(asciiman) root@www.clusterlabs.org:/var/www/html/doc/
+ rsync -rtz --progress $(generated_docs) $(ascii) root@www.clusterlabs.org:/var/www/html/doc/
if BUILD_DOCBOOK
for book in $(docbook); do \
echo Uploading $$book...; \
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org