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

Accepting request 206425 from network:ha-clustering:Factory

Browse Source 
- Rebase:
  * bug-806256_pacemaker-log-level-notice.patch
- Drop the obsolete patch:
  * bug-800323_pacemaker-crm_mon-save-cib.patch
- Probe for baremetal remote-node connection resources.
- remote: Add support for ipv6 into pacemaker_remote daemon
- election/fencing: Fix the casts that would result in incorrect values for big-endian systems (bnc#842915)
- Fencing: Apply correct score to the resource of group
- crm_resource: Wait for the correct number of replies when cleaning up resources (bnc#842204)
- cpg: Only process one message at a time to allow other priority jobs to be performed
- remote: Handle endian changes between client and server and improve forward compatibility
- crmd: A more reliable method of looking up migration options
- crmd: Allow non-CIB based throttling to be disabled
- crmd: Honor load thresholds lower than the cib maximum
- crmd: Tell the DC our job limit instead of the number of cores
- crmd: Track the CIB's CPU usage
- crmd: Fold the enforcement of migration-limit into the throttling code
- crmd: Don't start throttling until we're over the target threshold
- crmd: Do not send throttle updates to versions that don't support them
- ipc: Use the higher of the configured buffer size or the default
- crmd: Tweak the throttling threshold multipliers
- crmd: Simplify option processing for throttling options
- crmd: Simplify the logic for calculating the number of available cores
- crmd: Make the per-node action limit directly configurable in the CIB
- crmd: Tweak the throttling code based on migration-limit and/or LRMD_MAX_CHILDREN (bnc#838358)
- crmd: Slow down recovery on nodes with IO load
- crmd: Make the utilization limit configurable
- crmd: Use the load on our peers to know how many jobs to send them
- crmd: Notify peers of our relative load
- remote: Properly version the remote connection protocol

OBS-URL: https://build.opensuse.org/request/show/206425
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=59
This commit is contained in:
Stephan Kulow 2013-11-12 09:53:56 +00:00 committed by Git OBS Bridge
commit c7b9f67698
5 changed files with 58 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
bug-800323_pacemaker-crm_mon-save-cib.patch
View File

@ -1,84 +0,0 @@
commit e97f7eb36e1d2c3a8b241ba52e98b707da1eccf5
Author: Gao,Yan <ygao@suse.com>
Date: Mon Apr 1 14:19:47 2013 +0800
Log: tools: crm_mon - Save relevant cib XML into /tmp/cmon.* files if refreshing fails (bnc#800323)
diff --git a/tools/crm_mon.c b/tools/crm_mon.c
index da778de..c6af01b 100644
--- a/tools/crm_mon.c
+++ b/tools/crm_mon.c
@@ -85,6 +85,8 @@ const char *external_recipient = NULL;
cib_t *cib = NULL;
stonith_t *st = NULL;
xmlNode *current_cib = NULL;
+xmlNode *orig_cib = NULL;
+xmlNode *diff_cib = NULL;
gboolean one_shot = FALSE;
gboolean has_warnings = FALSE;
@@ -2130,10 +2132,12 @@ crm_diff_update(const char *event, xmlNode * msg)
static bool stale = FALSE;
print_dot();
+ diff_cib = copy_xml(msg);
if (current_cib != NULL) {
xmlNode *cib_last = current_cib;
+ orig_cib = copy_xml(cib_last);
current_cib = NULL;
rc = cib_apply_patch_event(msg, cib_last, &current_cib, LOG_DEBUG);
@@ -2196,6 +2200,38 @@ mon_refresh_display(gpointer user_data)
last_refresh = time(NULL);
if (cli_config_update(&cib_copy, NULL, FALSE) == FALSE) {
+ char *tmp_prefix = tempnam("/tmp", "cmon.");
+ char *real_filename = NULL;
+ char *orig_filename = NULL;
+ char *new_filename = NULL;
+ char *diff_filename = NULL;
+ xmlNode *real_cib = get_cib_copy(cib);
+
+ real_filename = g_strdup_printf("%s.real", tmp_prefix);
+ write_xml_file(real_cib, real_filename, FALSE);
+ free(real_filename);
+ free_xml(real_cib);
+ real_cib = NULL;
+
+ orig_filename = g_strdup_printf("%s.orig", tmp_prefix);
+ write_xml_file(orig_cib, orig_filename, FALSE);
+ free(orig_filename);
+ free_xml(orig_cib);
+ orig_cib = NULL;
+
+ new_filename = g_strdup_printf("%s.new", tmp_prefix);
+ write_xml_file(current_cib, new_filename, FALSE);
+ free(new_filename);
+
+ diff_filename = g_strdup_printf("%s.diff", tmp_prefix);
+ write_xml_file(diff_cib, diff_filename, FALSE);
+ free(diff_filename);
+ free_xml(diff_cib);
+ diff_cib = NULL;
+
+ print_as("Saved relevant XML into /tmp/%s* files", tmp_prefix);
+ free(tmp_prefix);
+
if (cib) {
cib->cmds->signoff(cib);
}
@@ -2207,6 +2243,12 @@ mon_refresh_display(gpointer user_data)
return FALSE;
}
+ free_xml(orig_cib);
+ orig_cib = NULL;
+
+ free_xml(diff_cib);
+ diff_cib = NULL;
+
set_working_set_defaults(&data_set);
data_set.input = cib_copy;
cluster_status(&data_set);

8
bug-806256_pacemaker-log-level-notice.patch
View File

@ -8,7 +8,7 @@ Index: pacemaker/crmd/callbacks.c
===================================================================
--- pacemaker.orig/crmd/callbacks.c
+++ pacemaker/crmd/callbacks.c
@@ -179,7 +179,7 @@ peer_update_callback(enum crm_status_typ
@@ -182,7 +182,7 @@ peer_update_callback(enum crm_status_typ
const char *task = crm_element_value(down->xml, XML_LRM_ATTR_TASK);
if (alive && safe_str_eq(task, CRM_OP_FENCE)) {
@ -21,7 +21,7 @@ Index: pacemaker/crmd/membership.c
===================================================================
--- pacemaker.orig/crmd/membership.c
+++ pacemaker/crmd/membership.c
@@ -297,7 +297,7 @@ crm_update_quorum(gboolean quorum, gbool
@@ -312,7 +312,7 @@ crm_update_quorum(gboolean quorum, gbool
crm_xml_add(update, XML_ATTR_DC_UUID, fsa_our_uuid);
fsa_cib_update(XML_TAG_CIB, update, call_options, call_id, NULL);
@ -42,12 +42,12 @@ Index: pacemaker/crmd/tengine.c
+ crm_notice("Processing graph %d (ref=%s) derived from %s", transition_graph->id, ref,
graph_input);
value = crm_element_value(graph_data, "failed-stop-offset");
te_reset_job_counts();
Index: pacemaker/fencing/remote.c
===================================================================
--- pacemaker.orig/fencing/remote.c
+++ pacemaker/fencing/remote.c
@@ -341,7 +341,7 @@ remote_op_timeout(gpointer userdata)
@@ -345,7 +345,7 @@ remote_op_timeout(gpointer userdata)
return FALSE;
}

50
pacemaker.changes
View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Sun Nov 10 00:43:46 UTC 2013 - ygao@suse.com
- Rebase:
* bug-806256_pacemaker-log-level-notice.patch
- Drop the obsolete patch:
* bug-800323_pacemaker-crm_mon-save-cib.patch
- Probe for baremetal remote-node connection resources.
- remote: Add support for ipv6 into pacemaker_remote daemon
- election/fencing: Fix the casts that would result in incorrect values for big-endian systems (bnc#842915)
- Fencing: Apply correct score to the resource of group
- crm_resource: Wait for the correct number of replies when cleaning up resources (bnc#842204)
- cpg: Only process one message at a time to allow other priority jobs to be performed
- remote: Handle endian changes between client and server and improve forward compatibility
- crmd: A more reliable method of looking up migration options
- crmd: Allow non-CIB based throttling to be disabled
- crmd: Honor load thresholds lower than the cib maximum
- crmd: Tell the DC our job limit instead of the number of cores
- crmd: Track the CIB's CPU usage
- crmd: Fold the enforcement of migration-limit into the throttling code
- crmd: Don't start throttling until we're over the target threshold
- crmd: Do not send throttle updates to versions that don't support them
- ipc: Use the higher of the configured buffer size or the default
- crmd: Tweak the throttling threshold multipliers
- crmd: Simplify option processing for throttling options
- crmd: Simplify the logic for calculating the number of available cores
- crmd: Make the per-node action limit directly configurable in the CIB
- crmd: Tweak the throttling code based on migration-limit and/or LRMD_MAX_CHILDREN (bnc#838358)
- crmd: Slow down recovery on nodes with IO load
- crmd: Make the utilization limit configurable
- crmd: Use the load on our peers to know how many jobs to send them
- crmd: Notify peers of our relative load
- remote: Properly version the remote connection protocol
- crmd: Track CPU usage on cluster nodes
- ipc: Consolidate client/server flags and add version field to header
- ipc: Suppress asserts for proxied connections
- crmd: Do not block on proxied calls from pacemaker_remoted
- lrmd: Do not interrogate NULL replies from the server
- crm_mon: Reduce flickering in interactive mode
- fencing: Ignore changes to non-fencing resources
- cli: Do not enabled blackbox for cli tools
- crm_resource: Wait for all replies when cleaning up resources (bnc#842204)
- crm_mon: Correctly show the queued and exec times for an action
- crmd: Correctly update expected state when the previous DC shuts down
- crm_resource: Observe --master modifier for --move
- PE: Location constraints with role=Started should prevent masters from running at all
- Upstream version cs: 907f52608e97b4f280690618342e1377f184b554
-------------------------------------------------------------------
Tue Oct 22 15:03:31 UTC 2013 - schwab@suse.de

6
pacemaker.spec
View File

@ -112,9 +112,8 @@ Patch5: pacemaker-colocated-utilization.patch
Patch6: pacemaker-cibsecret-tool-temp-disabled.patch
Patch7: pacemaker-nagios-plugin-dir.patch
Patch8: bug-812269_pacemaker-fencing-update-cib.patch
Patch9: bug-800323_pacemaker-crm_mon-save-cib.patch
Patch10: bug-812269_pacemaker-fencing-device-register-messages.patch
Patch11: pacemaker-Wno-cast-align.patch
Patch9: bug-812269_pacemaker-fencing-device-register-messages.patch
Patch10: pacemaker-Wno-cast-align.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: pacemaker-ticket-support = 2.0
Conflicts: heartbeat < 3.0
@ -401,7 +400,6 @@ manager for Corosync, CMAN and/or Linux-HA.
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
# Force the local time
#

4
pacemaker.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5dfb710c87072037d1f1609246c2c034babddc8debe1954f8dfe4c9f42db0cc8
size 8820516
oid sha256:e1fd4a243749d28098f29d357f075c316651f4564fc14b5fcc077b28287a7b12
size 8822832