pool/pacemaker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 331915 from home:yan_gao:branches:network:ha-clustering:Factory:Test

Browse Source 
- remote: Revise a misleading message in the ocf:pacemaker:remote resource agent (bsc#946332)
  * bug-946332_pacemaker-resource-agent-remote-message.patch
- remote: Correctly display the usage of the ocf:pacemaker:remote resource agent (bsc#946332)
  * bug-946332_pacemaker-resource-agent-remote-usage.patch

- crm_resource: Allow the resource configuration to be modified for --force-{check,start,..} calls
- Fencing: Correctly parse 'by-attribute' fencing levels
- Fencing: Use dedicated fields for fencing level patterns and attribute matching
- pacemaker_remote: memory leak in ipc_proxy_dispatch()
- crmd: don't add node ID to proxied remote node requests for attrd
- membership: Safely autoreap nodes without code duplication
- PE: Resolve memory leak
- pacemakerd: Do not forget about nodes that leave the cluster
- corosync: Display node state and quorum data if available
- crmd: Implement reliable event notifications
- extra: Added snmp trap of type "NOTIFICATION-TYPE" to MIB and snmp helper script
- Date: Correctly set time from seconds-since-epoch
- PE: Bug cl#5247 - Imply resources running on a container are stopped when the container is stopped
- Upstream version cs: 20c2178f076ff32fdf9ba9a467c193b8dac2f9e5

- lrmd: Upgrade start/finish log tags from INFO to NOTICE (bsc#943295)
  * bug-943295_pacemaker-lrmd-log-notice.patch

OBS-URL: https://build.opensuse.org/request/show/331915
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=218
This commit is contained in:
Yan Gao 2015-09-18 11:56:45 +00:00 committed by Git OBS Bridge
parent 51fabf70bb
commit 5f75cae0be
8 changed files with 104 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -11,7 +11,7 @@
<param name="version">1.1.13</param>
-->
<param name="versionformat">1.1.13+git%cd.%h</param>
<param name="revision">e8888b98cd7dbdfb986c1a46bdb4b113b96e914f</param>
<param name="revision">20c2178f076ff32fdf9ba9a467c193b8dac2f9e5</param>
</service>
<service name="recompress" mode="disabled">

22
bug-943295_pacemaker-lrmd-log-notice.patch Normal file
View File

@ -0,0 +1,22 @@
Index: pacemaker-1.1.13+git20150827.e8888b9/lrmd/lrmd.c
===================================================================
--- pacemaker-1.1.13+git20150827.e8888b9.orig/lrmd/lrmd.c
+++ pacemaker-1.1.13+git20150827.e8888b9/lrmd/lrmd.c
@@ -97,7 +97,7 @@ static void
log_finished(lrmd_cmd_t * cmd, int exec_time, int queue_time)
{
char pid_str[32] = { 0, };
- int log_level = LOG_INFO;
+ int log_level = LOG_NOTICE;
if (cmd->last_pid) {
snprintf(pid_str, 32, "%d", cmd->last_pid);
@@ -121,7 +121,7 @@ log_finished(lrmd_cmd_t * cmd, int exec_
static void
log_execute(lrmd_cmd_t * cmd)
{
- int log_level = LOG_INFO;
+ int log_level = LOG_NOTICE;
if (safe_str_eq(cmd->action, "monitor")) {
log_level = LOG_DEBUG;

19
bug-946332_pacemaker-resource-agent-remote-message.patch Normal file
View File

@ -0,0 +1,19 @@
commit 2e2fb279198bdcbf3a66ba6bf0d84cd491e99f41
Author: Gao,Yan <ygao@suse.com>
Date: Wed Sep 16 16:24:03 2015 +0200
Fix: remote: Revise a misleading message in the ocf:pacemaker:remote resource agent
diff --git a/extra/resources/remote b/extra/resources/remote
index 91cd07f..447267e 100644
--- a/extra/resources/remote
+++ b/extra/resources/remote
@@ -98,7 +98,7 @@ END
}
remote_unsupported() {
- ocf_log info "This pacemaker version does not support the ocf:pacemaker:remote agent"
+ ocf_log info "The ocf:pacemaker:remote agent should not be directly invoked except for meta-data action"
return $OCF_ERR_GENERIC
}

19
bug-946332_pacemaker-resource-agent-remote-usage.patch Normal file
View File

@ -0,0 +1,19 @@
commit 7e36e37a855e0723a0ea28e5905c2b3f2b76d28a
Author: Gao,Yan <ygao@suse.com>
Date: Wed Sep 16 16:20:00 2015 +0200
Fix: remote: Correctly display the usage of the ocf:pacemaker:remote resource agent
diff --git a/extra/resources/remote b/extra/resources/remote
index c481863..91cd07f 100644
--- a/extra/resources/remote
+++ b/extra/resources/remote
@@ -116,7 +116,7 @@ validate-all) remote_unsupported;;
usage|help) remote_usage
exit $OCF_SUCCESS
;;
-*) dummy_usage
+*) remote_usage
exit $OCF_ERR_UNIMPLEMENTED
;;
esac

3
pacemaker-1.1.13+git20150827.e8888b9.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c1d8cfc4814b564dcae2ad394570db09b94912c0b303a5fb1c89da6f414abf98
size 3720438

3
pacemaker-1.1.13+git20150917.20c2178.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4fa1e980e3e0fbdf1f3d5fa33dadb4f81b1ad1c5ed5f269b05cdeec682e7cfdf
size 3754766

33
pacemaker.changes
View File

@ -1,3 +1,36 @@
-------------------------------------------------------------------
Fri Sep 18 08:22:19 UTC 2015 - ygao@suse.com
- remote: Revise a misleading message in the ocf:pacemaker:remote resource agent (bsc#946332)
* bug-946332_pacemaker-resource-agent-remote-message.patch
- remote: Correctly display the usage of the ocf:pacemaker:remote resource agent (bsc#946332)
* bug-946332_pacemaker-resource-agent-remote-usage.patch
-------------------------------------------------------------------
Thu Sep 17 09:26:52 UTC 2015 - ygao@suse.com
- crm_resource: Allow the resource configuration to be modified for --force-{check,start,..} calls
- Fencing: Correctly parse 'by-attribute' fencing levels
- Fencing: Use dedicated fields for fencing level patterns and attribute matching
- pacemaker_remote: memory leak in ipc_proxy_dispatch()
- crmd: don't add node ID to proxied remote node requests for attrd
- membership: Safely autoreap nodes without code duplication
- PE: Resolve memory leak
- pacemakerd: Do not forget about nodes that leave the cluster
- corosync: Display node state and quorum data if available
- crmd: Implement reliable event notifications
- extra: Added snmp trap of type "NOTIFICATION-TYPE" to MIB and snmp helper script
- Date: Correctly set time from seconds-since-epoch
- PE: Bug cl#5247 - Imply resources running on a container are stopped when the container is stopped
- Upstream version cs: 20c2178f076ff32fdf9ba9a467c193b8dac2f9e5
-------------------------------------------------------------------
Wed Sep 9 13:24:17 UTC 2015 - ygao@suse.com
- lrmd: Upgrade start/finish log tags from INFO to NOTICE (bsc#943295)
* bug-943295_pacemaker-lrmd-log-notice.patch
-------------------------------------------------------------------
Fri Aug 28 11:49:26 UTC 2015 - ygao@suse.com

8
pacemaker.spec
View File

@ -99,7 +99,7 @@ Name: pacemaker
Summary: Scalable High-Availability cluster resource manager
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA
Version: 1.1.13+git20150827.e8888b9
Version: 1.1.13+git20150917.20c2178
Release: 0
#Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org
@ -115,6 +115,9 @@ Patch4: pacemaker-cibsecret-tool-temp-disabled.patch
Patch5: pacemaker-nagios-plugin-dir.patch
Patch6: bug-812269_pacemaker-fencing-device-register-messages.patch
Patch7: pacemaker-Wno-format-signedness.patch
Patch8: bug-943295_pacemaker-lrmd-log-notice.patch
Patch9: bug-946332_pacemaker-resource-agent-remote-usage.patch
Patch10: bug-946332_pacemaker-resource-agent-remote-message.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: pacemaker-ticket-support = 2.0
Conflicts: heartbeat < 3.0
@ -396,6 +399,9 @@ manager for Corosync, CMAN and/or Linux-HA.
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
# Force the local time
#