diff --git a/SOURCES/039-crm_mon.patch b/SOURCES/039-crm_mon.patch new file mode 100644 index 0000000..e3d525f --- /dev/null +++ b/SOURCES/039-crm_mon.patch @@ -0,0 +1,760 @@ +From bd4f396f267d8ef8f9c9bcbf286a77dc78d4e1b0 Mon Sep 17 00:00:00 2001 +From: Chris Lumens +Date: Tue, 2 Mar 2021 10:26:13 -0500 +Subject: [PATCH 1/3] Med: Generate xml/crm_mon.rng from the contents of + xml/crm_mon*. + +This prevents the version reference in it from getting out of sync. + +See: rhbz#1931332 +--- + xml/Makefile.am | 28 +++++++++++++++++++++++----- + xml/crm_mon.rng | 16 ---------------- + 3 files changed, 24 insertions(+), 21 deletions(-) + delete mode 100644 xml/crm_mon.rng + +diff --git a/xml/Makefile.am b/xml/Makefile.am +index cb6cfa0..c52b968 100644 +--- a/xml/Makefile.am ++++ b/xml/Makefile.am +@@ -76,22 +76,24 @@ CIB_abs_xsl = $(abs_srcdir)/upgrade-1.3.xsl \ + $(abs_srcdir)/upgrade-2.10.xsl \ + $(wildcard $(abs_srcdir)/upgrade-*enter.xsl) \ + $(wildcard $(abs_srcdir)/upgrade-*leave.xsl) +-MON_abs_files = $(abs_srcdir)/crm_mon.rng ++MON_abs_files = $(abs_srcdir)/crm_mon.rng + API_files = $(foreach base,$(API_base),$(wildcard $(srcdir)/api/$(base)*.rng)) + CIB_files = $(foreach base,$(CIB_base),$(wildcard $(srcdir)/$(base).rng $(srcdir)/$(base)-*.rng)) + CIB_xsl = $(srcdir)/upgrade-1.3.xsl \ + $(srcdir)/upgrade-2.10.xsl \ + $(wildcard $(srcdir)/upgrade-*enter.xsl) \ + $(wildcard $(srcdir)/upgrade-*leave.xsl) +-MON_files = $(srcdir)/crm_mon.rng ++MON_files = $(srcdir)/crm_mon.rng + + # Sorted lists of all numeric schema versions + API_numeric_versions = $(call numeric_versions,${API_files}) + CIB_numeric_versions = $(call numeric_versions,${CIB_files}) ++MON_numeric_versions = $(call numeric_versions,$(wildcard $(srcdir)/api/crm_mon*.rng)) + + # The highest numeric schema version + API_max ?= $(lastword $(API_numeric_versions)) + CIB_max ?= $(lastword $(CIB_numeric_versions)) ++MON_max ?= $(lastword $(MON_numeric_versions)) + + # Sorted lists of all schema versions (including "next") + API_versions = next $(API_numeric_versions) +@@ -100,11 +102,12 @@ CIB_versions = next $(CIB_numeric_versions) + # Build tree locations of static schema files and transforms (for VPATH builds) + API_build_copies = $(foreach f,$(API_abs_files),$(subst $(abs_srcdir),$(abs_builddir),$(f))) + CIB_build_copies = $(foreach f,$(CIB_abs_files) $(CIB_abs_xsl),$(subst $(abs_srcdir),$(abs_builddir),$(f))) +-MON_build_copies = $(foreach f,$(MON_abs_files),$(subst $(abs_srcdir),$(abs_builddir),$(f))) ++MON_build_copies = $(foreach f,$(MON_abs_files),$(subst $(abs_srcdir),$(abs_builddir),$(f))) + + # Dynamically generated schema files + API_generated = api/api-result.rng $(foreach base,$(API_versions),api/api-result-$(base).rng) + CIB_generated = pacemaker.rng $(foreach base,$(CIB_versions),pacemaker-$(base).rng) versions.rng ++MON_generated = crm_mon.rng + + CIB_version_pairs = $(call version_pairs,${CIB_numeric_versions}) + CIB_version_pairs_cnt = $(words ${CIB_version_pairs}) +@@ -112,10 +115,10 @@ CIB_version_pairs_last = $(call version_pairs_last,${CIB_version_pairs_cnt},${C + + dist_API_DATA = $(API_files) + dist_CIB_DATA = $(CIB_files) $(CIB_xsl) +-dist_MON_DATA = $(MON_files) + + nodist_API_DATA = $(API_generated) + nodist_CIB_DATA = $(CIB_generated) ++nodist_MON_DATA = $(MON_generated) + + EXTRA_DIST = Readme.md \ + best-match.sh \ +@@ -162,6 +165,21 @@ api/api-result-%.rng: $(API_build_copies) best-match.sh Makefile.am + $(AM_V_at)echo ' ' >> $@ + $(AM_V_SCHEMA)echo '' >> $@ + ++crm_mon.rng: api/crm_mon-$(MON_max).rng ++ $(AM_V_at)echo '' > $@ ++ $(AM_V_at)echo '> $@ ++ $(AM_V_at)echo ' datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">' >> $@ ++ $(AM_V_at)echo ' ' >> $@ ++ $(AM_V_at)echo ' ' >> $@ ++ $(AM_V_at)echo ' ' >> $@ ++ $(AM_V_at)echo ' ' >> $@ ++ $(AM_V_at)echo ' ' >> $@ ++ $(AM_V_at)echo ' ' >> $@ ++ $(AM_V_at)echo ' ' >> $@ ++ $(AM_V_at)echo ' ' >> $@ ++ $(AM_V_at)echo ' ' >> $@ ++ $(AM_V_SCHEMA)echo '' >> $@ ++ + # Dynamically generated top-level CIB schema + pacemaker.rng: pacemaker-$(CIB_max).rng + $(AM_V_SCHEMA)cp $(top_builddir)/xml/$< $@ +@@ -256,7 +274,7 @@ fulldiff: best-match.sh + @echo "# Comparing all changes across all the subsequent increments" + $(call version_diff,${CIB_version_pairs}) + +-CLEANFILES = $(API_generated) $(CIB_generated) ++CLEANFILES = $(API_generated) $(CIB_generated) $(MON_generated) + + clean-local: + if [ "x$(srcdir)" != "x$(builddir)" ]; then \ +diff --git a/xml/crm_mon.rng b/xml/crm_mon.rng +deleted file mode 100644 +index be87fba..0000000 +--- a/xml/crm_mon.rng ++++ /dev/null +@@ -1,16 +0,0 @@ +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-- +1.8.3.1 + + +From 0cbc5b0a66ac0bf206ff45f36206253a60620e07 Mon Sep 17 00:00:00 2001 +From: Chris Lumens +Date: Tue, 2 Mar 2021 10:53:17 -0500 +Subject: [PATCH 2/3] Med: Copy crm_mon.rng and crm_resource.rng in preparation + for updates. + +See: rhbz#1931332 +--- + xml/api/crm_mon-2.7.rng | 311 +++++++++++++++++++++++++++++++++++++++++++ + xml/api/crm_resource-2.7.rng | 238 +++++++++++++++++++++++++++++++++ + 2 files changed, 549 insertions(+) + create mode 100644 xml/api/crm_mon-2.7.rng + create mode 100644 xml/api/crm_resource-2.7.rng + +diff --git a/xml/api/crm_mon-2.7.rng b/xml/api/crm_mon-2.7.rng +new file mode 100644 +index 0000000..88973a4 +--- /dev/null ++++ b/xml/api/crm_mon-2.7.rng +@@ -0,0 +1,311 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ unknown ++ member ++ remote ++ ping ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ granted ++ revoked ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/xml/api/crm_resource-2.7.rng b/xml/api/crm_resource-2.7.rng +new file mode 100644 +index 0000000..b49e24c +--- /dev/null ++++ b/xml/api/crm_resource-2.7.rng +@@ -0,0 +1,238 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ promoted ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ocf ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ true ++ false ++ ++ ++ ++ true ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Stopped ++ Started ++ Master ++ Slave ++ ++ ++ +-- +1.8.3.1 + + +From 9b6ee6eb5aa1008beebae9d9f6c3889c81c3bbb6 Mon Sep 17 00:00:00 2001 +From: Chris Lumens +Date: Tue, 2 Mar 2021 10:58:15 -0500 +Subject: [PATCH 3/3] Med: Change the schema type of 'expected' and 'call' to + integer. + +Regression in 2.0.3. + +See: rhbz#1931332 +--- + xml/api/crm_mon-2.7.rng | 4 ++-- + xml/api/crm_resource-2.7.rng | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/xml/api/crm_mon-2.7.rng b/xml/api/crm_mon-2.7.rng +index 88973a4..8e6792b 100644 +--- a/xml/api/crm_mon-2.7.rng ++++ b/xml/api/crm_mon-2.7.rng +@@ -198,7 +198,7 @@ + + + +- ++ + + + +@@ -269,7 +269,7 @@ + + + +- ++ + + + +diff --git a/xml/api/crm_resource-2.7.rng b/xml/api/crm_resource-2.7.rng +index b49e24c..8e386db 100644 +--- a/xml/api/crm_resource-2.7.rng ++++ b/xml/api/crm_resource-2.7.rng +@@ -217,7 +217,7 @@ + + + +- ++ + + + +-- +1.8.3.1 + diff --git a/SPECS/pacemaker.spec b/SPECS/pacemaker.spec index 72563a8..31f51e5 100644 --- a/SPECS/pacemaker.spec +++ b/SPECS/pacemaker.spec @@ -23,7 +23,7 @@ ## can be incremented to build packages reliably considered "newer" ## than previously built packages with the same pcmkversion) %global pcmkversion 2.0.5 -%global specversion 8 +%global specversion 9 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build %global commit ba59be71228fed04f78ab374dfac748d314d0e89 @@ -286,6 +286,7 @@ Patch35: 035-crm_mon.patch Patch36: 036-crm_resource.patch Patch37: 037-scheduler.patch Patch38: 038-feature-set.patch +Patch39: 039-crm_mon.patch # downstream-only commits Patch100: 100-default-to-syncing-with-sbd.patch @@ -983,8 +984,12 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Tue Mar 2 2021 Ken Gaillot - 2.0.5-9 +- Avoid pcs failures when Pacemaker records negative call ID in history +- Resolves: rhbz1931332 + * Mon Feb 15 2021 Ken Gaillot - 2.0.5-8 -- Route cancellations through correct node when remote connectin is moving +- Route cancellations through correct node when remote connection is moving - Resolves: rhbz1928762 * Fri Feb 12 2021 Ken Gaillot - 2.0.5-7