From 70ce6baf18081b7134e5b8edda634161beb71e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
Date: Wed, 25 Apr 2018 16:26:48 +0200
Subject: [PATCH 1/9] XML: regression.sh: fix thinko preventing -B running
 through actual diff

---
 xml/regression.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xml/regression.sh b/xml/regression.sh
index 15bb5925ab1..cd4f0729904 100755
--- a/xml/regression.sh
+++ b/xml/regression.sh
@@ -178,7 +178,10 @@ test_runner_upgrade() {
 EOF
 	fi
 
-	if test "$((_tru_mode ^ (1 << 2)))" -ne $((1 << 2)); then
+	# only respond with the flags except for "-B", i.e., when both:
+	# - _tru_mode non-zero
+	# - "-B" in _tru_mode is zero (hence non-zero when flipped with XOR)
+	if test "$((_tru_mode * ((_tru_mode ^ (1 << 2)) & (1 << 2))))" -ne 0; then
 		if test $((_tru_mode & (1 << 0))) -ne 0; then
 			cp -a "${_tru_target}" "${_tru_ref}"
 			cp -a "${_tru_target_err}" "${_tru_ref_err}"

From a012a9b8fd86eee00578c594d0756567170131f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
Date: Fri, 27 Apr 2018 23:09:58 +0200
Subject: [PATCH 2/9] XML: upgrade-2.10.xsl: fix out-of-date dependency
 tracking

This in particular should have been updated as of 123849236.
---
 xml/upgrade-2.10.xsl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl
index 7cb87b95a3f..311d824953b 100644
--- a/xml/upgrade-2.10.xsl
+++ b/xml/upgrade-2.10.xsl
@@ -819,7 +819,8 @@
  Source ctxt:    (primitive|template)/operations/op/meta_attributes
  Target ctxt:    (primitive|template)/operations/op/meta_attributes
  Target-inv ctxt:(primitive|template)/meta_attributes
- Dependencies:   N/A
+ Dependencies:   ProcessAttrOpMetaAttributes
+                 ProcessNonattrOpMetaAttributes
  -->
 <xsl:template name="ProcessNonattrOpMetaAttributes">
   <xsl:param name="Source"/>

From 59bb085b7822318377ee07ae730eb2fb7ae11853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
Date: Fri, 27 Apr 2018 19:57:45 +0200
Subject: [PATCH 3/9] XML: upgrade-2.10.xsl: fix thinko in multi-match-clash
 prevention

---
 xml/upgrade-2.10.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl
index 311d824953b..5405e15698e 100644
--- a/xml/upgrade-2.10.xsl
+++ b/xml/upgrade-2.10.xsl
@@ -1314,7 +1314,7 @@
                                   not(@in-case-of)
                                   and
                                   not(
-                                    $MapClusterProperties/cibtr:replace[
+                                    $MapClusterNode/cibtr:replace[
                                       @what = current()/@name
                                       and
                                       @in-case-of

From e50c79c344c9d806ca2ec2fb2c9d1cddf4d62dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
Date: Fri, 27 Apr 2018 22:03:49 +0200
Subject: [PATCH 4/9] XML: upgrade-2.10.xsl: ProcessClusterProperties'
 InverseMode not binary

Beside false(), it can also be a string or a selected tree.
---
 xml/upgrade-2.10.xsl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl
index 5405e15698e..f016f6485a2 100644
--- a/xml/upgrade-2.10.xsl
+++ b/xml/upgrade-2.10.xsl
@@ -518,7 +518,9 @@
                                   )
                                 )
                               ]"/>
-        <xsl:if test="not($InverseMode or $InnerSimulation)">
+        <xsl:if test="$InverseMode = false()
+                      and
+                      not($InnerSimulation)">
           <xsl:call-template name="MapMsg">
             <xsl:with-param name="Context" select="@id"/>
             <xsl:with-param name="Replacement" select="$Replacement"/>

From ee8017bdddae979c29b74473be8e81a70880ef26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
Date: Mon, 23 Apr 2018 13:41:25 +0200
Subject: [PATCH 5/9] XML: upgrade-2.10.xsl: space 1/4: prevent the first batch

Related to 5adb83735, but is not the panacea there, presence of
superfluous "marking" spaces (thus, extra text nodes in the internal
representation of CIB) needs to be addressed gradually, in subsequent
three patches.
---
 xml/test-2/020-rsc-requires-inline.ref       |  2 +-
 xml/test-2/024-rsc-requires-no-selfclash.ref |  4 ++--
 xml/upgrade-2.10.xsl                         | 10 ++++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/xml/test-2/020-rsc-requires-inline.ref b/xml/test-2/020-rsc-requires-inline.ref
index 574071b8aaa..6be2417df53 100644
--- a/xml/test-2/020-rsc-requires-inline.ref
+++ b/xml/test-2/020-rsc-requires-inline.ref
@@ -20,7 +20,7 @@
         <instance_attributes id="myAddr-params">
           <nvpair id="myAddr-ip" name="ip" value="192.0.2.10"/>
         </instance_attributes>
-      <meta_attributes id="_2TO3_myAddr-meta"> <nvpair id="_2TO3_myAddr-start-meta-requires" name="requires" value="nothing"/></meta_attributes></primitive>
+      <meta_attributes id="_2TO3_myAddr-meta"><nvpair id="_2TO3_myAddr-start-meta-requires" name="requires" value="nothing"/></meta_attributes></primitive>
 
       <primitive id="myHttpd" class="ocf" provider="heartbeat" type="apache">
         <operations>
diff --git a/xml/test-2/024-rsc-requires-no-selfclash.ref b/xml/test-2/024-rsc-requires-no-selfclash.ref
index 0ea8203e913..5aabac39bad 100644
--- a/xml/test-2/024-rsc-requires-no-selfclash.ref
+++ b/xml/test-2/024-rsc-requires-no-selfclash.ref
@@ -48,7 +48,7 @@
         <instance_attributes id="myAddr2-params">
           <nvpair id="myAddr2-ip" name="ip" value="192.0.2.10"/>
         </instance_attributes>
-      <meta_attributes id="_2TO3_myAddr2-meta"> <nvpair id="_2TO3_myAddr2-start-meta-requires" name="requires" value="nothing"/></meta_attributes></primitive>
+      <meta_attributes id="_2TO3_myAddr2-meta"><nvpair id="_2TO3_myAddr2-start-meta-requires" name="requires" value="nothing"/></meta_attributes></primitive>
 
       <!-- potential clash between multiple op[@name = 'start'
                                                or
@@ -72,7 +72,7 @@
             <!-- demote != promote -->
             <op id="stateful1-demote" interval="0" name="demote" timeout="40s"/>
           </operations>
-        <meta_attributes id="_2TO3_stateful1-meta"> <nvpair id="_2TO3_stateful1-start-meta-requires" name="requires" value="fencing"/></meta_attributes></primitive>
+        <meta_attributes id="_2TO3_stateful1-meta"><nvpair id="_2TO3_stateful1-start-meta-requires" name="requires" value="fencing"/></meta_attributes></primitive>
       </clone>
 
       <!-- potential clash between multiple
diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl
index f016f6485a2..1cd0d42ed6e 100644
--- a/xml/upgrade-2.10.xsl
+++ b/xml/upgrade-2.10.xsl
@@ -1048,7 +1048,7 @@
                 not($InverseMode)">
     <xsl:if test="$InverseMode
                   and
-                  not($InnerSimulation)">
+                  $InnerSimulation">
       <xsl:call-template name="HelperDenormalizedSpace">
         <xsl:with-param name="Source" select="$InnerPass"/>
         <xsl:with-param name="ResultTreeFragment" select="true()"/>
@@ -1441,6 +1441,7 @@
         <xsl:call-template name="ProcessAttrOpMetaAttributes">
           <xsl:with-param name="Source" select="."/>
           <xsl:with-param name="InverseMode" select="true()"/>
+          <xsl:with-param name="InnerSimulation" select="true()"/>
         </xsl:call-template>
       </xsl:for-each>
     </xsl:variable>
@@ -1448,7 +1449,12 @@
     <xsl:if test="normalize-space($ToPropagateFromOp)
                   != $ToPropagateFromOp">
       <meta_attributes id="{concat('_2TO3_', @id, '-meta')}">
-        <xsl:copy-of select="$ToPropagateFromOp"/>
+        <xsl:for-each select="operations/op">
+          <xsl:call-template name="ProcessAttrOpMetaAttributes">
+            <xsl:with-param name="Source" select="."/>
+            <xsl:with-param name="InverseMode" select="true()"/>
+          </xsl:call-template>
+        </xsl:for-each>
       </meta_attributes>
     </xsl:if>
 

From 0940614be086e8fa342fcb84cb2b8adc243ff7ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
Date: Fri, 27 Apr 2018 15:07:35 +0200
Subject: [PATCH 6/9] XML: upgrade-2.10.xsl: space 2/4: extend
 HelperDenormalizedSpace

Now, the superfluous "marking" spaces are only to be emitted in the
"internal oracle" mode, imposing a new expectation that immediate
results gathered like that should not be passed to the output directly,
only to influence the decisions like whether the parent element should
be emitted at all so as not to remain empty.  This is currently not the
case, hence to preserve passing "./regression.sh -B" check for the time
being, set forcibly such a mode at relevant places that should really
be deriving the appropriate value from the callee's closure.
---
 xml/upgrade-2.10.xsl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl
index 1cd0d42ed6e..86a54ef21c9 100644
--- a/xml/upgrade-2.10.xsl
+++ b/xml/upgrade-2.10.xsl
@@ -357,6 +357,7 @@
 <xsl:template name="HelperDenormalizedSpace">
   <xsl:param name="Source"/>
   <xsl:param name="ResultTreeFragment" select="false()"/>
+  <xsl:param name="InnerSimulation" select="false()"/>
   <xsl:choose>
     <xsl:when test="not($ResultTreeFragment)">
       <!-- intention here is that immediately surrounding text (mostly expected
@@ -378,7 +379,7 @@
                       $ExistingSpace/self::text()[
                         normalize-space(.) != string(.)
                       ]
-                    )">
+                    ) and $InnerSimulation">
         <xsl:text> </xsl:text>
       </xsl:if>
     </xsl:when>
@@ -560,6 +561,7 @@
                           )">
               <xsl:call-template name="HelperDenormalizedSpace">
                 <xsl:with-param name="Source" select="."/>
+                <xsl:with-param name="InnerSimulation" select="true()"/>
               </xsl:call-template>
               <xsl:copy>
                 <xsl:for-each select="@*">
@@ -588,6 +590,7 @@
           <xsl:when test="$Replacement">
             <xsl:call-template name="HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
+              <xsl:with-param name="InnerSimulation" select="true()"/>
             </xsl:call-template>
             <xsl:copy>
               <xsl:for-each select="@*">
@@ -614,6 +617,7 @@
           <xsl:otherwise>
             <xsl:call-template name="HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
+              <xsl:with-param name="InnerSimulation" select="true()"/>
             </xsl:call-template>
             <xsl:call-template name="HelperIdentity"/>
           </xsl:otherwise>
@@ -760,6 +764,7 @@
             <!-- plain rename (space helper?) -->
             <xsl:call-template name="HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
+              <xsl:with-param name="InnerSimulation" select="true()"/>
             </xsl:call-template>
             <xsl:copy>
               <xsl:for-each select="@*">
@@ -795,6 +800,7 @@
           <xsl:otherwise>
             <xsl:call-template name="HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
+              <xsl:with-param name="InnerSimulation" select="true()"/>
             </xsl:call-template>
             <xsl:copy>
               <xsl:apply-templates select="@*|node()"/>
@@ -989,6 +995,7 @@
           <xsl:otherwise>
             <xsl:call-template name="HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
+              <xsl:with-param name="InnerSimulation" select="true()"/>
             </xsl:call-template>
             <xsl:call-template name="HelperIdentity"/>
           </xsl:otherwise>

From bab4add316ca464fbde73096456ce4baf4da25f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
Date: Fri, 27 Apr 2018 15:45:35 +0200
Subject: [PATCH 7/9] XML: upgrade-2.10.xsl: space 3/4: refactor InnerPass as a
 passable var.

Depending on the context, this can allow for optimizations (cf. passing
already computed "simulation" value from ProcessNonattrOpMetaAttributes
to the same template called without that flag) within
ProcessAttrOpMetaAttributes) or to discern cases when a template is
entered in an InnerSimulation mode directly from cases when it happens
privately (indicated with INNER-RECURSION value that is, in parallel,
getting introduced as a new convention here).
---
 xml/upgrade-2.10.xsl | 49 +++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl
index 86a54ef21c9..3754e30c540 100644
--- a/xml/upgrade-2.10.xsl
+++ b/xml/upgrade-2.10.xsl
@@ -439,6 +439,16 @@
     moved) at this other part of the tree" contexts; for such cases,
     there's usually InverseMode parameter to be assigned true()
     (implicit default) and false(), respectively
+ E. the common idiom that emerges is: evaluate simulation value,
+    depending on the presence of the "success mark" (cf. A.),
+    possibly emit non-simulation value; since it would (likely)
+    re-evaluate the simulation anew (wastefully) or perhaps
+    this sort of dependency injection can just come handy,
+    common transformation helpers below offer InnerPass
+    parameter to be optionally passed, either as a string (when
+    no-denormalized-space is an internal criterium for the template)
+    or, conventionally, the result tree fragment representing the
+    output of the template at hand called with a simulation flag
 
  -->
 
@@ -453,8 +463,7 @@
   <xsl:param name="Source"/>
   <xsl:param name="InverseMode" select="false()"/>
   <xsl:param name="InnerSimulation" select="false()"/>
-
-  <xsl:variable name="InnerPass">
+  <xsl:param name="InnerPass">
     <xsl:choose>
       <xsl:when test="$InnerSimulation">
         <xsl:value-of select="''"/>
@@ -464,10 +473,11 @@
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="InverseMode" select="$InverseMode"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
+          <xsl:with-param name="InnerPass" select="'INNER-RECURSION'"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
-  </xsl:variable>
+  </xsl:param>
 
   <xsl:for-each select="$Source/node()">
     <xsl:choose>
@@ -645,8 +655,7 @@
   <xsl:param name="Source"/>
   <xsl:param name="InverseMode" select="false()"/>
   <xsl:param name="InnerSimulation" select="false()"/>
-
-  <xsl:variable name="InnerPass">
+  <xsl:param name="InnerPass">
     <xsl:choose>
       <xsl:when test="$InverseMode
                       or
@@ -657,10 +666,11 @@
         <xsl:call-template name="ProcessRscInstanceAttributes">
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
+          <xsl:with-param name="InnerPass" select="'INNER-RECURSION'"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
-  </xsl:variable>
+  </xsl:param>
 
   <!-- B: special-casing nvpair -->
   <xsl:for-each select="$Source/node()">
@@ -834,10 +844,7 @@
   <xsl:param name="Source"/>
   <xsl:param name="InverseMode" select="false()"/>
   <xsl:param name="InnerSimulation" select="false()"/>
-
-  <xsl:variable name="EnclosingTag" select="../../.."/>
-
-  <xsl:variable name="InnerPass">
+  <xsl:param name="InnerPass">
     <xsl:choose>
       <xsl:when test="$InverseMode
                       or
@@ -848,10 +855,13 @@
         <xsl:call-template name="ProcessNonattrOpMetaAttributes">
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
+          <xsl:with-param name="InnerPass" select="'INNER-RECURSION'"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
-  </xsl:variable>
+  </xsl:param>
+
+  <xsl:variable name="EnclosingTag" select="../../.."/>
 
   <xsl:for-each select="$Source/node()">
     <xsl:choose>
@@ -1023,10 +1033,7 @@
   <xsl:param name="Source"/>
   <xsl:param name="InverseMode" select="false()"/>
   <xsl:param name="InnerSimulation" select="false()"/>
-
-  <xsl:variable name="EnclosingTag" select="../.."/>
-
-  <xsl:variable name="InnerPass">
+  <xsl:param name="InnerPass">
     <xsl:choose>
       <xsl:when test="$InnerSimulation">
         <xsl:value-of select="''"/>
@@ -1036,10 +1043,13 @@
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="InverseMode" select="$InverseMode"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
+          <xsl:with-param name="InnerPass" select="'INNER-RECURSION'"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
-  </xsl:variable>
+  </xsl:param>
+
+  <xsl:variable name="EnclosingTag" select="../.."/>
 
   <xsl:if test="(
                   $InverseMode
@@ -1226,7 +1236,12 @@
                           != $ProcessedOpMetaAttributes">
               <xsl:copy>
                 <xsl:apply-templates select="@*"/>
-                <xsl:copy-of select="$ProcessedOpMetaAttributes"/>
+                <xsl:call-template name="ProcessNonattrOpMetaAttributes">
+                  <xsl:with-param name="Source" select="."/>
+                  <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
+                  <!-- cf. trick E. -->
+                  <xsl:with-param name="InnerPass" select="$ProcessedOpMetaAttributes"/>
+                </xsl:call-template>
               </xsl:copy>
             </xsl:if>
           </xsl:when>

From 13a370436f9f18309e0100ca0a4bb2e947a9b817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
Date: Fri, 27 Apr 2018 18:44:04 +0200
Subject: [PATCH 8/9] XML: upgrade-2.10.xsl: space 4/4: prevent the cluster
 properties. batch

This replaces previous inflexible static variables based scheme with
the simulation backed approach already used at other places.
The ultimate impact is that the respective superfluous "marking"
spaces get tackled there as well.
---
 xml/upgrade-2.10.xsl | 359 +++++++++++++++++++++++++------------------
 1 file changed, 208 insertions(+), 151 deletions(-)

diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl
index 3754e30c540..fdcf1c8dcb2 100644
--- a/xml/upgrade-2.10.xsl
+++ b/xml/upgrade-2.10.xsl
@@ -531,7 +531,9 @@
                               ]"/>
         <xsl:if test="$InverseMode = false()
                       and
-                      not($InnerSimulation)">
+                      $InnerSimulation
+                      and
+                      $InnerPass = 'INNER-RECURSION'">
           <xsl:call-template name="MapMsg">
             <xsl:with-param name="Context" select="@id"/>
             <xsl:with-param name="Replacement" select="$Replacement"/>
@@ -571,7 +573,7 @@
                           )">
               <xsl:call-template name="HelperDenormalizedSpace">
                 <xsl:with-param name="Source" select="."/>
-                <xsl:with-param name="InnerSimulation" select="true()"/>
+                <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
               </xsl:call-template>
               <xsl:copy>
                 <xsl:for-each select="@*">
@@ -600,7 +602,7 @@
           <xsl:when test="$Replacement">
             <xsl:call-template name="HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
-              <xsl:with-param name="InnerSimulation" select="true()"/>
+              <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
             </xsl:call-template>
             <xsl:copy>
               <xsl:for-each select="@*">
@@ -627,7 +629,7 @@
           <xsl:otherwise>
             <xsl:call-template name="HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
-              <xsl:with-param name="InnerSimulation" select="true()"/>
+              <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
             </xsl:call-template>
             <xsl:call-template name="HelperIdentity"/>
           </xsl:otherwise>
@@ -666,7 +668,6 @@
         <xsl:call-template name="ProcessRscInstanceAttributes">
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
-          <xsl:with-param name="InnerPass" select="'INNER-RECURSION'"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
@@ -774,7 +775,7 @@
             <!-- plain rename (space helper?) -->
             <xsl:call-template name="HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
-              <xsl:with-param name="InnerSimulation" select="true()"/>
+              <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
             </xsl:call-template>
             <xsl:copy>
               <xsl:for-each select="@*">
@@ -810,7 +811,7 @@
           <xsl:otherwise>
             <xsl:call-template name="HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
-              <xsl:with-param name="InnerSimulation" select="true()"/>
+              <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
             </xsl:call-template>
             <xsl:copy>
               <xsl:apply-templates select="@*|node()"/>
@@ -846,9 +847,7 @@
   <xsl:param name="InnerSimulation" select="false()"/>
   <xsl:param name="InnerPass">
     <xsl:choose>
-      <xsl:when test="$InverseMode
-                      or
-                      $InnerSimulation">
+      <xsl:when test="$InnerSimulation">
         <xsl:value-of select="''"/>
       </xsl:when>
       <xsl:otherwise>
@@ -915,7 +914,7 @@
                                   )
                                 )
                               ]"/>
-        <xsl:if test="not($InverseMode or $InnerSimulation)">
+        <xsl:if test="not($InnerSimulation)">
           <xsl:call-template name="MapMsg">
             <xsl:with-param name="Context" select="../../@id"/>
             <xsl:with-param name="Replacement" select="$Replacement"/>
@@ -1005,7 +1004,7 @@
           <xsl:otherwise>
             <xsl:call-template name="HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
-              <xsl:with-param name="InnerSimulation" select="true()"/>
+              <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
             </xsl:call-template>
             <xsl:call-template name="HelperIdentity"/>
           </xsl:otherwise>
@@ -1043,7 +1042,6 @@
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="InverseMode" select="$InverseMode"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
-          <xsl:with-param name="InnerPass" select="'INNER-RECURSION'"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
@@ -1228,7 +1226,7 @@
             <xsl:variable name="ProcessedOpMetaAttributes">
               <xsl:call-template name="ProcessNonattrOpMetaAttributes">
                 <xsl:with-param name="Source" select="."/>
-                <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
+                <xsl:with-param name="InnerSimulation" select="true()"/>
               </xsl:call-template>
             </xsl:variable>
             <!-- cf. trick A. -->
@@ -1256,6 +1254,125 @@
   </xsl:if>
 </xsl:template>
 
+<!--
+ Source ctxt:    configuration
+ Target ctxt:    {op,rsc}_defaults/meta_attributes [per $Variant, see below]
+ Target-inv ctxt:N/A
+ Dependencies:   ProcessClusterProperties
+
+ Variant:        'op_defaults' | 'rsc_defaults'
+ -->
+<xsl:template name="ProcessDefaultsNonruleClusterProperties">
+  <xsl:param name="Source"/>
+  <xsl:param name="Variant"/>
+  <xsl:param name="InnerSimulation" select="false()"/>
+  <xsl:param name="InnerPass">
+    <xsl:choose>
+      <xsl:when test="$InnerSimulation">
+        <xsl:value-of select="''"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="ProcessDefaultsNonruleClusterProperties">
+          <xsl:with-param name="Source" select="$Source"/>
+          <xsl:with-param name="Variant" select="$Variant"/>
+          <xsl:with-param name="InnerSimulation" select="true()"/>
+          <xsl:with-param name="InnerPass" select="'INNER-RECURSION'"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+
+  <xsl:choose>
+    <xsl:when test="$Source/*[name() = $Variant]/meta_attributes[
+                      not(@id-ref)
+                      and
+                      not(rule)
+                    ]">
+      <xsl:call-template name="ProcessClusterProperties">
+        <xsl:with-param name="Source"
+                        select="$Source/crm_config/cluster_property_set[
+                                  not(@id-ref)
+                                  and
+                                  not(rule)
+                                ]"/>
+        <xsl:with-param name="InverseMode"
+                        select="$Source/*[name() = $Variant]/meta_attributes[
+                                  not(@id-ref)
+                                  and
+                                  not(rule)
+                                ]"/>
+        <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:call-template name="ProcessClusterProperties">
+        <xsl:with-param name="Source"
+                      select="$Source/crm_config/cluster_property_set[
+                                  not(@id-ref)
+                                  and
+                                  not(rule)
+                                ]"/>
+        <xsl:with-param name="InverseMode"
+                        select="$Variant"/>
+        <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
+      </xsl:call-template>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<!--
+ Source ctxt:    configuration
+ Target ctxt:    {op,rsc}_defaults/meta_attributes [per $Variant, see below]
+ Target-inv ctxt:N/A
+ Dependencies:   ProcessClusterProperties
+
+ Variant:        'op_defaults' | 'rsc_defaults'
+ -->
+<xsl:template name="ProcessDefaultsRuleClusterProperties">
+  <xsl:param name="Source"/>
+  <xsl:param name="Variant"/>
+  <xsl:param name="InnerSimulation" select="false()"/>
+  <xsl:param name="InnerPass">
+    <xsl:choose>
+      <xsl:when test="$InnerSimulation">
+        <xsl:value-of select="''"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="ProcessDefaultsRuleClusterProperties">
+          <xsl:with-param name="Source" select="$Source"/>
+          <xsl:with-param name="Variant" select="$Variant"/>
+          <xsl:with-param name="InnerSimulation" select="true()"/>
+          <xsl:with-param name="InnerPass" select="'INNER-RECURSION'"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+
+  <xsl:for-each select="crm_config/cluster_property_set[
+                          not(@id-ref)
+                          and
+                          rule
+                        ]">
+    <xsl:variable name="ProcessedPartial">
+      <xsl:call-template name="ProcessClusterProperties">
+        <xsl:with-param name="Source" select="$Source"/>
+        <xsl:with-param name="InverseMode" select="$Variant"/>
+        <xsl:with-param name="InnerSimulation" select="true()"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:if test="normalize-space($ProcessedPartial)
+                  != $ProcessedPartial">
+      <meta_attributes id="{concat('_2TO3_', @id)}">
+        <xsl-copy-of select="rule"/>
+        <xsl:call-template name="ProcessClusterProperties">
+          <xsl:with-param name="Source" select="$Source"/>
+          <xsl:with-param name="InverseMode" select="$Variant"/>
+        </xsl:call-template>
+      </meta_attributes>
+    </xsl:if>
+  </xsl:for-each>
+</xsl:template>
+
 <!--
 
  ACTUAL TRANSFORMATION
@@ -1276,13 +1393,19 @@
   <xsl:variable name="ProcessedClusterProperties">
     <xsl:call-template name="ProcessClusterProperties">
       <xsl:with-param name="Source" select="."/>
+      <xsl:with-param name="InnerSimulation" select="true()"/>
+      <xsl:with-param name="InnerPass" select="'INNER-RECURSION'"/>
     </xsl:call-template>
   </xsl:variable>
   <xsl:if test="normalize-space($ProcessedClusterProperties)
                 != $ProcessedClusterProperties">
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
-      <xsl:copy-of select="$ProcessedClusterProperties"/>
+      <xsl:call-template name="ProcessClusterProperties">
+        <xsl:with-param name="Source" select="."/>
+        <!-- cf. trick E. -->
+        <xsl:with-param name="InnerPass" select="$ProcessedClusterProperties"/>
+      </xsl:call-template>
     </xsl:copy>
   </xsl:if>
 </xsl:template>
@@ -1418,12 +1541,9 @@
                 <xsl:when test="self::op">
                   <!-- process @*|meta_attributes/nvpair
                        (keep/drop/move elsewhere) -->
-                  <xsl:variable name="ProcessedOpMetaAttributes">
-                    <xsl:call-template name="ProcessAttrOpMetaAttributes">
-                      <xsl:with-param name="Source" select="."/>
-                    </xsl:call-template>
-                  </xsl:variable>
-                  <xsl:copy-of select="$ProcessedOpMetaAttributes"/>
+                  <xsl:call-template name="ProcessAttrOpMetaAttributes">
+                    <xsl:with-param name="Source" select="."/>
+                  </xsl:call-template>
                 </xsl:when>
                 <xsl:otherwise>
                   <xsl:call-template name="HelperIdentity"/>
@@ -1437,6 +1557,7 @@
           <xsl:variable name="ProcessedRscInstanceAttributes">
             <xsl:call-template name="ProcessRscInstanceAttributes">
               <xsl:with-param name="Source" select="."/>
+              <xsl:with-param name="InnerSimulation" select="true()"/>
             </xsl:call-template>
           </xsl:variable>
           <!-- cf. trick A. -->
@@ -1444,7 +1565,11 @@
                         != $ProcessedRscInstanceAttributes">
             <xsl:copy>
               <xsl:apply-templates select="@*"/>
-              <xsl:copy-of select="$ProcessedRscInstanceAttributes"/>
+              <xsl:call-template name="ProcessRscInstanceAttributes">
+                <xsl:with-param name="Source" select="."/>
+                <!-- cf. trick E. -->
+                <xsl:with-param name="InnerPass" select="$ProcessedRscInstanceAttributes"/>
+              </xsl:call-template>
             </xsl:copy>
           </xsl:if>
         </xsl:when>
@@ -1510,122 +1635,34 @@
 </xsl:template>
 
 <xsl:template match="configuration">
+  <xsl:variable name="Configuration" select="."/>
   <xsl:variable name="ProcessedOpDefaultsNonruleClusterProperties">
-    <xsl:choose>
-      <xsl:when test="op_defaults/meta_attributes[
-                        not(@id-ref)
-                        and
-                        not(rule)
-                      ]">
-        <xsl:call-template name="ProcessClusterProperties">
-          <xsl:with-param name="Source"
-                          select="crm_config/cluster_property_set[
-                                    not(@id-ref)
-                                    and
-                                    not(rule)
-                                  ]"/>
-          <xsl:with-param name="InverseMode"
-                          select="op_defaults/meta_attributes[
-                                    not(@id-ref)
-                                    and
-                                    not(rule)
-                                  ]"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="ProcessClusterProperties">
-          <xsl:with-param name="Source"
-                          select="crm_config/cluster_property_set[
-                                    not(@id-ref)
-                                    and
-                                    not(rule)
-                                  ]"/>
-          <xsl:with-param name="InverseMode"
-                          select="'op_defaults'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:call-template name="ProcessDefaultsNonruleClusterProperties">
+      <xsl:with-param name="Source" select="$Configuration"/>
+      <xsl:with-param name="Variant" select="'op_defaults'"/>
+      <xsl:with-param name="InnerSimulation" select="true()"/>
+    </xsl:call-template>
   </xsl:variable>
   <xsl:variable name="ProcessedRscDefaultsNonruleClusterProperties">
-    <xsl:choose>
-      <xsl:when test="rsc_defaults/meta_attributes[
-                        not(@id-ref)
-                        and
-                        not(rule)
-                      ]">
-        <xsl:call-template name="ProcessClusterProperties">
-          <xsl:with-param name="Source"
-                          select="crm_config/cluster_property_set[
-                                    not(@id-ref)
-                                    and
-                                    not(rule)
-                                  ]"/>
-          <xsl:with-param name="InverseMode"
-                          select="rsc_defaults/meta_attributes[
-                                    not(@id-ref)
-                                    and
-                                    not(rule)
-                                  ]"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="ProcessClusterProperties">
-          <xsl:with-param name="Source"
-                          select="crm_config/cluster_property_set[
-                                    not(@id-ref)
-                                    and
-                                    not(rule)
-                                  ]"/>
-          <xsl:with-param name="InverseMode"
-                          select="'rsc_defaults'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:call-template name="ProcessDefaultsNonruleClusterProperties">
+      <xsl:with-param name="Source" select="$Configuration"/>
+      <xsl:with-param name="Variant" select="'rsc_defaults'"/>
+      <xsl:with-param name="InnerSimulation" select="true()"/>
+    </xsl:call-template>
   </xsl:variable>
   <xsl:variable name="ProcessedOpDefaultsRuleClusterProperties">
-    <xsl:for-each select="crm_config/cluster_property_set[
-                            not(@id-ref)
-                            and
-                            rule
-                          ]">
-
-      <xsl:variable name="ProcessedPartial">
-        <xsl:call-template name="ProcessClusterProperties">
-          <xsl:with-param name="Source"
-                          select="."/>
-          <xsl:with-param name="InverseMode" select="'op_defaults'"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="normalize-space($ProcessedPartial)
-                    != $ProcessedPartial">
-        <meta_attributes id="{concat('_2TO3_', @id)}">
-          <xsl-copy-of select="rule"/>
-          <xsl:copy-of select="$ProcessedPartial"/>
-        </meta_attributes>
-      </xsl:if>
-    </xsl:for-each>
+    <xsl:call-template name="ProcessDefaultsNonruleClusterProperties">
+      <xsl:with-param name="Source" select="$Configuration"/>
+      <xsl:with-param name="Variant" select="'op_defaults'"/>
+      <xsl:with-param name="InnerSimulation" select="true()"/>
+    </xsl:call-template>
   </xsl:variable>
   <xsl:variable name="ProcessedRscDefaultsRuleClusterProperties">
-    <xsl:for-each select="crm_config/cluster_property_set[
-                            not(@id-ref)
-                            and
-                            rule
-                          ]">
-      <xsl:variable name="ProcessedPartial">
-        <xsl:call-template name="ProcessClusterProperties">
-          <xsl:with-param name="Source"
-                          select="."/>
-          <xsl:with-param name="InverseMode" select="'rsc_defaults'"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="normalize-space($ProcessedPartial)
-                    != $ProcessedPartial">
-        <meta_attributes id="{concat('_2TO3_', @id)}">
-          <xsl-copy-of select="rule"/>
-          <xsl:copy-of select="$ProcessedPartial"/>
-        </meta_attributes>
-      </xsl:if>
-    </xsl:for-each>
+    <xsl:call-template name="ProcessDefaultsNonruleClusterProperties">
+      <xsl:with-param name="Source" select="$Configuration"/>
+      <xsl:with-param name="Variant" select="'rsc_defaults'"/>
+      <xsl:with-param name="InnerSimulation" select="true()"/>
+    </xsl:call-template>
   </xsl:variable>
 
   <xsl:copy>
@@ -1655,28 +1692,36 @@
                                     )
                                   ]">
                     <xsl:apply-templates select="@*|node()"/>
-                    <xsl:if test="$WhichDefaults = 'op_defaults'">
-                      <xsl:copy-of select="$ProcessedOpDefaultsNonruleClusterProperties"/>
-                    </xsl:if>
-                    <xsl:if test="$WhichDefaults = 'rsc_defaults'">
-                      <xsl:copy-of select="$ProcessedRscDefaultsNonruleClusterProperties"/>
+                    <xsl:if test="$WhichDefaults = 'op_defaults'
+                                  or
+                                  $WhichDefaults = 'rsc_defaults'">
+                      <xsl:call-template name="ProcessDefaultsNonruleClusterProperties">
+                        <xsl:with-param name="Source" select="$Configuration"/>
+                        <xsl:with-param name="Variant" select="$WhichDefaults"/>
+                      </xsl:call-template>
                     </xsl:if>
                   </xsl:when>
                   <xsl:otherwise>
                     <xsl:apply-templates select="@*|node()"/>
                   </xsl:otherwise>
                 </xsl:choose>
-                <xsl:if test="$WhichDefaults = 'op_defaults'
-                              and
-                              normalize-space($ProcessedOpDefaultsRuleClusterProperties)
-                              != $ProcessedOpDefaultsRuleClusterProperties">
-                  <xsl:copy-of select="$ProcessedOpDefaultsRuleClusterProperties"/>
-                </xsl:if>
-                <xsl:if test="$WhichDefaults = 'rsc_defaults'
-                              and
-                              normalize-space($ProcessedRscDefaultsRuleClusterProperties)
-                              != $ProcessedRscDefaultsRuleClusterProperties">
-                  <xsl:copy-of select="$ProcessedRscDefaultsRuleClusterProperties"/>
+                <xsl:if test="(
+                                $WhichDefaults = 'op_defaults'
+                                and
+                                normalize-space($ProcessedOpDefaultsRuleClusterProperties)
+                                != $ProcessedOpDefaultsRuleClusterProperties
+                              )
+                              or
+                              (
+                                $WhichDefaults = 'rsc_defaults'
+                                and
+                                normalize-space($ProcessedRscDefaultsRuleClusterProperties)
+                                != $ProcessedRscDefaultsRuleClusterProperties
+                              )">
+                  <xsl:call-template name="ProcessDefaultsRuleClusterProperties">
+                    <xsl:with-param name="Source" select="$Configuration"/>
+                    <xsl:with-param name="Variant" select="$WhichDefaults"/>
+                  </xsl:call-template>
                 </xsl:if>
               </xsl:copy>
             </xsl:for-each>
@@ -1704,10 +1749,16 @@
         <xsl:if test="normalize-space($ProcessedOpDefaultsNonruleClusterProperties)
                       != $ProcessedOpDefaultsNonruleClusterProperties">
           <meta_attributes id="{concat('_2TO3_', '-op-defaults')}">
-            <xsl:copy-of select="$ProcessedOpDefaultsNonruleClusterProperties"/>
+            <xsl:call-template name="ProcessDefaultsNonruleClusterProperties">
+              <xsl:with-param name="Source" select="$Configuration"/>
+              <xsl:with-param name="Variant" select="'op_defaults'"/>
+            </xsl:call-template>
           </meta_attributes>
         </xsl:if>
-        <xsl:copy-of select="$ProcessedOpDefaultsRuleClusterProperties"/>
+        <xsl:call-template name="ProcessDefaultsRuleClusterProperties">
+          <xsl:with-param name="Source" select="$Configuration"/>
+          <xsl:with-param name="Variant" select="'op_defaults'"/>
+        </xsl:call-template>
         <xsl:apply-templates select="text()[position() = last()]"/>
       </op_defaults>
     </xsl:if>
@@ -1724,10 +1775,16 @@
         <xsl:if test="normalize-space($ProcessedRscDefaultsNonruleClusterProperties)
                       != $ProcessedRscDefaultsNonruleClusterProperties">
           <meta_attributes id="{concat('_2TO3_', '-rsc-defaults')}">
-            <xsl:copy-of select="$ProcessedRscDefaultsNonruleClusterProperties"/>
+            <xsl:call-template name="ProcessDefaultsNonruleClusterProperties">
+              <xsl:with-param name="Source" select="$Configuration"/>
+              <xsl:with-param name="Variant" select="'rsc_defaults'"/>
+            </xsl:call-template>
           </meta_attributes>
         </xsl:if>
-        <xsl:copy-of select="$ProcessedRscDefaultsRuleClusterProperties"/>
+        <xsl:call-template name="ProcessDefaultsRuleClusterProperties">
+          <xsl:with-param name="Source" select="$Configuration"/>
+          <xsl:with-param name="Variant" select="'rsc_defaults'"/>
+        </xsl:call-template>
         <xsl:apply-templates select="text()[position() = last()]"/>
       </rsc_defaults>
     </xsl:if>

From 224e03bb1a842db796283054eb27eee6f00f1a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
Date: Fri, 27 Apr 2018 23:19:22 +0200
Subject: [PATCH 9/9] Low: schema upgrade: suppress temporary fix to avoid
 "mark space" crash

Preceding XML commits try hard to avoid that from the actual output,
so this is a midstep towards removing the "temporary fix" fully.
---
 lib/common/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index 7546fe9fc1f..9eb17531ef1 100644
--- a/lib/common/Makefile.am
+++ b/lib/common/Makefile.am
@@ -6,7 +6,7 @@
 #
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS		+= -I$(top_builddir)/lib/gnu -I$(top_srcdir)/lib/gnu
+AM_CPPFLAGS		+= -I$(top_builddir)/lib/gnu -I$(top_srcdir)/lib/gnu -DPCMK_SCHEMAS_EMERGENCY_XSLT=0
 
 ## libraries
 lib_LTLIBRARIES	= libcrmcommon.la