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

Remove unused files:

Browse Source 
D    bug-809635_pacemaker-xml-digest.patch
D    bug-815447_pacemaker-cib-strip-text-nodes.patch
D    heartbeat-doc-1.0.tar.gz
D    pacemaker-configure-libqb-version.patch
D    pacemaker-cts-startcmd.patch
D    pacemaker-disable-listing-fence-agents.patch
D    pacemaker-ptest-build.patch

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=58
This commit is contained in:
Yan Gao 2013-09-12 09:44:38 +00:00 committed by Git OBS Bridge
parent 2b929800db
commit fd12761563
7 changed files with 0 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
bug-809635_pacemaker-xml-digest.patch
View File

@ -1,129 +0,0 @@
diff --git a/lib/common/xml.c b/lib/common/xml.c
index b6df79f..33a9abf 100644
--- a/lib/common/xml.c
+++ b/lib/common/xml.c
@@ -2275,6 +2275,7 @@ calculate_xml_digest_v1(xmlNode * input, gboolean sort, gboolean ignored)
return digest;
}
+#if 0
static char *
calculate_xml_digest_v2(xmlNode * source, gboolean do_filter)
{
@@ -2324,6 +2325,116 @@ calculate_xml_digest_v2(xmlNode * source, gboolean do_filter)
crm_trace("End digest");
return digest;
}
+#endif
+
+static void
+filter_xml(xmlNode *data, filter_t *filter, int filter_len, gboolean recursive)
+{
+ int lpc = 0;
+ xmlNode *child = NULL;
+
+ for(lpc = 0; lpc < filter_len; lpc++) {
+ xml_remove_prop(data, filter[lpc].string);
+ }
+
+ if(recursive == FALSE || filter_len == 0) {
+ return;
+ }
+
+ for(child = __xml_first_child(data); child != NULL; child = __xml_next(child)) {
+ filter_xml(child, filter, filter_len, recursive);
+ }
+}
+
+static char *
+calculate_xml_digest_v2(xmlNode *source, gboolean do_filter)
+{
+ char *digest = NULL;
+
+ int buffer_len = 0;
+ int filter_size = DIMOF(filter);
+
+ xmlDoc *doc = NULL;
+ xmlNode *copy = NULL;
+ xmlNode *input = source;
+ xmlBuffer *xml_buffer = NULL;
+ static struct qb_log_callsite *digest_cs = NULL;
+
+ crm_trace("Begin digest");
+ if(do_filter && BEST_EFFORT_STATUS) {
+ /* Exclude the status calculation from the digest
+ *
+ * This doesn't mean it wont be sync'd, we just wont be paranoid
+ * about it being an _exact_ copy
+ *
+ * We don't need it to be exact, since we throw it away and regenerate
+ * from our peers whenever a new DC is elected anyway
+ *
+ * Importantly, this reduces the amount of XML to copy+export as
+ * well as the amount of data for MD5 needs to operate on
+ */
+ xmlNode *child = NULL;
+ xmlAttrPtr pIter = NULL;
+ copy = create_xml_node(NULL, XML_TAG_CIB);
+ for(pIter = crm_first_attr(input); pIter != NULL; pIter = pIter->next) {
+ const char *p_name = (const char *)pIter->name;
+ const char *p_value = crm_attr_value(pIter);
+
+ xmlSetProp(copy, (const xmlChar*)p_name, (const xmlChar*)p_value);
+ }
+
+ xml_remove_prop(copy, XML_ATTR_ORIGIN);
+ xml_remove_prop(copy, XML_CIB_ATTR_WRITTEN);
+
+ /* We just did all the filtering */
+
+ for(child = __xml_first_child(input); child != NULL; child = __xml_next(child)) {
+ if(safe_str_neq(crm_element_name(child), XML_CIB_TAG_STATUS)) {
+ add_node_copy(copy, child);
+ }
+ }
+
+ } else if(do_filter) {
+ copy = copy_xml(input);
+ filter_xml(copy, filter, filter_size, TRUE);
+ input = copy;
+ }
+
+ crm_trace("Dumping");
+ doc = getDocPtr(input);
+ xml_buffer = xmlBufferCreate();
+
+ CRM_ASSERT(xml_buffer != NULL);
+ CRM_CHECK(doc != NULL, return NULL); /* doc will only be NULL if an_xml_node is */
+
+ buffer_len = xmlNodeDump(xml_buffer, doc, input, 0, FALSE);
+ CRM_CHECK(xml_buffer->content != NULL && buffer_len > 0, goto done);
+
+ digest = crm_md5sum((char *)xml_buffer->content);
+
+ if(digest_cs == NULL) {
+ digest_cs = qb_log_callsite_get(
+ __func__, __FILE__, "cib-digest", LOG_TRACE, __LINE__,
+ crm_trace_nonlog);
+ }
+ if (digest_cs && digest_cs->targets) {
+ char *trace_file = crm_concat("/tmp/cib-digest", digest, '-');
+ crm_trace("Saving %s.%s.%s to %s",
+ crm_element_value(input, XML_ATTR_GENERATION_ADMIN),
+ crm_element_value(input, XML_ATTR_GENERATION),
+ crm_element_value(input, XML_ATTR_NUMUPDATES),
+ trace_file);
+ save_xml_to_file(source, "digest input", trace_file);
+ free(trace_file);
+ }
+
+ done:
+ xmlBufferFree(xml_buffer);
+ free_xml(copy);
+
+ crm_trace("End digest");
+ return digest;
+}
char *
calculate_on_disk_digest(xmlNode * input)

26
bug-815447_pacemaker-cib-strip-text-nodes.patch
View File

@ -1,26 +0,0 @@
diff --git a/cib/io.c b/cib/io.c
index 26f0aea..1700967 100644
--- a/cib/io.c
+++ b/cib/io.c
@@ -681,6 +681,8 @@ write_cib_contents(gpointer p)
}
}
+ strip_text_nodes(cib_local);
+
tmp_cib = g_strdup_printf("%s/cib.XXXXXX", cib_root);
tmp_digest = g_strdup_printf("%s/cib.XXXXXX", cib_root);
diff --git a/lib/cib/cib_utils.c b/lib/cib/cib_utils.c
index 6353d1d..2c21f02 100644
--- a/lib/cib/cib_utils.c
+++ b/lib/cib/cib_utils.c
@@ -491,7 +491,7 @@ cib_perform_op(const char *op, int call_options, cib_op_t * fn, gboolean is_quer
}
crm_trace("Massaging CIB contents");
- strip_text_nodes(scratch);
+ /*strip_text_nodes(scratch);*/
fix_plus_plus_recursive(scratch);
/* The diff calculation in cib_config_changed() accounts for 25% of the

3
heartbeat-doc-1.0.tar.gz
View File

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

21
pacemaker-configure-libqb-version.patch
View File

@ -1,21 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 483f94d..8445c60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1009,11 +1009,11 @@ AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set)
LIBQB_LOG=1
PCMK_FEATURES="$PCMK_FEATURES libqb-logging libqb-ipc"
-if
- ! pkg-config --atleast-version 0.13 libqb
-then
- AC_MSG_FAILURE(Version of libqb is too old: v0.13 or greater requried)
-fi
+#if
+# ! pkg-config --atleast-version 0.13 libqb
+#then
+# AC_MSG_FAILURE(Version of libqb is too old: v0.13 or greater requried)
+#fi
LIBS="$LIBS $libqb_LIBS"

15
pacemaker-cts-startcmd.patch
View File

@ -1,15 +0,0 @@
Index: pacemaker/cts/CM_ais.py
===================================================================
--- pacemaker.orig/cts/CM_ais.py
+++ pacemaker/cts/CM_ais.py
@@ -263,8 +263,8 @@ class crm_cs_v0(crm_ais):
self.update({
"Name" : "crm-plugin-v0",
- "StartCmd" : "service corosync start",
- "StopCmd" : "service corosync stop",
+ "StartCmd" : CTSvars.INITDIR+"/openais start",
+ "StopCmd" : CTSvars.INITDIR+"/openais stop",
# The next pattern is too early
# "Pat:We_stopped" : "%s.*Service engine unloaded: Pacemaker Cluster Manager",

13
pacemaker-disable-listing-fence-agents.patch
View File

@ -1,13 +0,0 @@
Index: pacemaker/lib/lrmd/lrmd_client.c
===================================================================
--- pacemaker.orig/lib/lrmd/lrmd_client.c
+++ pacemaker/lib/lrmd/lrmd_client.c
@@ -1815,7 +1815,7 @@ list_stonith_agents(lrmd_list_t ** resou
stonith_key_value_t *dIter = NULL;
if(stonith_api) {
- stonith_api->cmds->list_agents(stonith_api, st_opt_sync_call, NULL, &stonith_resources, 0);
+ stonith_api->cmds->list_agents(stonith_api, st_opt_sync_call, "heartbeat", &stonith_resources, 0);
stonith_api->cmds->free(stonith_api);
}

33
pacemaker-ptest-build.patch
View File

@ -1,33 +0,0 @@
diff --git a/pengine/Makefile.am b/pengine/Makefile.am
index 521b142..ffb8267 100644
--- a/pengine/Makefile.am
+++ b/pengine/Makefile.am
@@ -42,8 +42,16 @@ lib_LTLIBRARIES = libpengine.la
## binary progs
halib_PROGRAMS = pengine
+sbin_PROGRAMS = ptest
man7_MANS =
+man8_MANS =
+
+if BUILD_HELP
+man8_MANS += ptest.8
+ptest.8: ptest
+ $(HELP2MAN) --output $@ --no-info --section 8 --name "Part of the Pacemaker cluster resource manager" $(top_builddir)/pengine/$<
+endif
if BUILD_XML_HELP
man7_MANS += pengine.7
@@ -72,6 +80,11 @@ pengine_LDADD = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
# libcib for get_object_root()
# $(top_builddir)/lib/hbclient/libhbclient.la
+ptest_SOURCES = ptest.c
+ptest_LDADD = $(top_builddir)/lib/cib/libcib.la \
+ $(top_builddir)/lib/transition/libtransitioner.la \
+ $(COMMONLIBS)
+
install-exec-local:
$(mkinstalldirs) $(DESTDIR)/$(PE_STATE_DIR)
-chown $(CRM_DAEMON_USER) $(DESTDIR)/$(PE_STATE_DIR)