[Debian-ha-commits] [pacemaker] 04/05: Testing additional patches used by Ubuntu for this version of pacemaker
Richard Winters
devrik-guest at moszumanska.debian.org
Wed Apr 29 08:25:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
devrik-guest pushed a commit to branch master
in repository pacemaker.
commit 74835f6f312950d8fbc96304cbf78e41df9af189
Author: Richard B Winters <rik at mmogp.com>
Date: Wed Apr 29 03:23:20 2015 -0400
Testing additional patches used by Ubuntu for this version of pacemaker
Change-Id: I0274365592139928d42bcdb58fc1bff54bd7df14
Signed-off-by: Richard B Winters <rik at mmogp.com>
---
.../0004-Fix-lrmd-Prevent-glib-assert.patch | 53 ++++++++++++++++++++++
...-Fix-stonith-ng-Reset-mainloop-source-IDs.patch | 25 ++++++++++
.../0006-Re-enable-Default-Start-Stop.patch | 30 ++++++++++++
...cl-Do-not-delay-evaluation-of-added-nodes.patch | 53 ++++++++++++++++++++++
debian/patches/series | 4 ++
5 files changed, 165 insertions(+)
diff --git a/debian/patches/0004-Fix-lrmd-Prevent-glib-assert.patch b/debian/patches/0004-Fix-lrmd-Prevent-glib-assert.patch
new file mode 100644
index 0000000..d752562
--- /dev/null
+++ b/debian/patches/0004-Fix-lrmd-Prevent-glib-assert.patch
@@ -0,0 +1,53 @@
+From: Andrew Beekhof <andrew at beekhof.net>
+Date: Mon, 13 Oct 2014 13:30:58 +1100
+Subject: Fix lrmd; Prevent glib assert
+
+Prevent glib assert triggered by timers being removed
+from mainloop more than once
+
+Upstream commit: 568e41db929a34106c8c2ff7c48716ab5c13ef49 Mon Sep 17 00:00:00 2001
+---
+ lib/services/services.c | 3 +++
+ lib/services/services_linux.c | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/lib/services/services.c b/lib/services/services.c
+index 7b32405..d3b07aa 100644
+--- a/lib/services/services.c
++++ b/lib/services/services.c
+@@ -313,6 +313,7 @@ services_action_free(svc_action_t * op)
+
+ if (op->opaque->repeat_timer) {
+ g_source_remove(op->opaque->repeat_timer);
++ op->opaque->repeat_timer = 0;
+ }
+ if (op->opaque->stderr_gsource) {
+ mainloop_del_fd(op->opaque->stderr_gsource);
+@@ -425,6 +426,7 @@ services_action_kick(const char *name, const char *action, int interval /* ms */
+ } else {
+ if (op->opaque->repeat_timer) {
+ g_source_remove(op->opaque->repeat_timer);
++ op->opaque->repeat_timer = 0;
+ }
+ recurring_action_timer(op);
+ return TRUE;
+@@ -459,6 +461,7 @@ handle_duplicate_recurring(svc_action_t * op, void (*action_callback) (svc_actio
+ if (dup->pid != 0) {
+ if (op->opaque->repeat_timer) {
+ g_source_remove(op->opaque->repeat_timer);
++ op->opaque->repeat_timer = 0;
+ }
+ recurring_action_timer(dup);
+ }
+diff --git a/lib/services/services_linux.c b/lib/services/services_linux.c
+index 16d75f7..1c326ba 100644
+--- a/lib/services/services_linux.c
++++ b/lib/services/services_linux.c
+@@ -226,6 +226,7 @@ recurring_action_timer(gpointer data)
+ op->stdout_data = NULL;
+ free(op->stderr_data);
+ op->stderr_data = NULL;
++ op->opaque->repeat_timer = 0;
+
+ services_action_async(op, NULL);
+ return FALSE;
diff --git a/debian/patches/0005-Fix-stonith-ng-Reset-mainloop-source-IDs.patch b/debian/patches/0005-Fix-stonith-ng-Reset-mainloop-source-IDs.patch
new file mode 100644
index 0000000..1e6635a
--- /dev/null
+++ b/debian/patches/0005-Fix-stonith-ng-Reset-mainloop-source-IDs.patch
@@ -0,0 +1,25 @@
+From: Andrew Beekhof <andrew at beekhof.net>
+Date: Wed, 11 Mar 2015 12:35:49 +0000
+Subject: Fix stonith-ng; Reset mainloop source IDs
+
+Reset mainloop source IDs after removing them
+---
+ lib/fencing/st_client.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/fencing/st_client.c b/lib/fencing/st_client.c
+index 64bd8f3..2837682 100644
+--- a/lib/fencing/st_client.c
++++ b/lib/fencing/st_client.c
+@@ -663,9 +663,11 @@ stonith_action_async_done(mainloop_child_t * p, pid_t pid, int core, int signo,
+
+ if (action->timer_sigterm > 0) {
+ g_source_remove(action->timer_sigterm);
++ action->timer_sigterm = 0;
+ }
+ if (action->timer_sigkill > 0) {
+ g_source_remove(action->timer_sigkill);
++ action->timer_sigkill = 0;
+ }
+
+ if (action->last_timeout_signo) {
diff --git a/debian/patches/0006-Re-enable-Default-Start-Stop.patch b/debian/patches/0006-Re-enable-Default-Start-Stop.patch
new file mode 100644
index 0000000..682e4e4
--- /dev/null
+++ b/debian/patches/0006-Re-enable-Default-Start-Stop.patch
@@ -0,0 +1,30 @@
+From: James Page <james.page at ubuntu.com>
+Date: Wed, 11 Mar 2015 12:35:49 +0000
+Subject: Re-enable Default-Start/Stop
+
+The default runlevels where dropped from the init
+script upstream, however this stops use with update-rc.d
+to ensure that pacemaker is started on boot once
+configured.
+
+Re-add the Default-Start/Stop runlevels to make this
+functional again.
+---
+ mcp/pacemaker.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mcp/pacemaker.in b/mcp/pacemaker.in
+index ca7fab9..f1ab23e 100644
+--- a/mcp/pacemaker.in
++++ b/mcp/pacemaker.in
+@@ -15,8 +15,8 @@
+ # Required-Start: $network corosync
+ # Should-Start: $syslog
+ # Required-Stop: $network corosync
+-# Default-Start:
+-# Default-Stop:
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
+ # Short-Description: Starts and stops Pacemaker Cluster Manager.
+ # Description: Starts and stops Pacemaker Cluster Manager.
+ ### END INIT INFO
diff --git a/debian/patches/0007-Fix-acl-Do-not-delay-evaluation-of-added-nodes.patch b/debian/patches/0007-Fix-acl-Do-not-delay-evaluation-of-added-nodes.patch
new file mode 100644
index 0000000..4f36b83
--- /dev/null
+++ b/debian/patches/0007-Fix-acl-Do-not-delay-evaluation-of-added-nodes.patch
@@ -0,0 +1,53 @@
+From: Andrew Beekhof <andrew at beekhof.net>
+Date: Tue, 7 Apr 2015 10:03:25 +1000
+Subject: Fix acl; Do not delay evaluation of added nodes
+
+Do not delay evaluation of added nodes in some situations;
+
+It is not appropriate when the node has no children as it is not a
+placeholder
+
+Upstream commit: 84ac07c7d02b3badd708b1ef13a2159dede70715 Mon Sep 17 00:00:00 2001
+---
+ lib/common/xml.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/lib/common/xml.c b/lib/common/xml.c
+index 77ae843..6aa7de0 100644
+--- a/lib/common/xml.c
++++ b/lib/common/xml.c
+@@ -1022,13 +1022,16 @@ __xml_acl_post_process(xmlNode * xml)
+
+ if(is_set(p->flags, xpf_created)) {
+ xmlAttr *xIter = NULL;
++ char *path = xml_get_path(xml);
+
+- /* Always allow new scaffolding, ie. node with no attributes or only an 'id' */
++ /* Always allow new scaffolding, ie. node with no attributes or only an 'id'
++ * Except in the ACLs section
++ */
+
+ for (xIter = crm_first_attr(xml); xIter != NULL; xIter = xIter->next) {
+ const char *prop_name = (const char *)xIter->name;
+
+- if (strcmp(prop_name, XML_ATTR_ID) == 0) {
++ if (strcmp(prop_name, XML_ATTR_ID) == 0 && strstr(path, "/"XML_CIB_TAG_ACLS"/") == NULL) {
+ /* Delay the acl check */
+ continue;
+
+@@ -1037,7 +1040,6 @@ __xml_acl_post_process(xmlNode * xml)
+ break;
+
+ } else {
+- char *path = xml_get_path(xml);
+ crm_trace("Cannot add new node %s at %s", crm_element_name(xml), path);
+
+ if(xml != xmlDocGetRootElement(xml->doc)) {
+@@ -1048,6 +1050,7 @@ __xml_acl_post_process(xmlNode * xml)
+ return;
+ }
+ }
++ free(path);
+ }
+
+ while (cIter != NULL) {
diff --git a/debian/patches/series b/debian/patches/series
index c4ab39d..1d4a58c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,7 @@
0001-raexecupstart.patch
0002-init-scripts-compat.patch
0003-Properly-enable-logging-exports-in-default-file.patch
+0004-Fix-lrmd-Prevent-glib-assert.patch
+0005-Fix-stonith-ng-Reset-mainloop-source-IDs.patch
+0006-Re-enable-Default-Start-Stop.patch
+0007-Fix-acl-Do-not-delay-evaluation-of-added-nodes.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pacemaker.git
More information about the Debian-HA-Commits
mailing list