Skip to content

libcib and based refactors: Simplify cib_perform_op(), and assorted other changes #4042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nrwahl2 merged 41 commits into from
Feb 11, 2026
Merged

libcib and based refactors: Simplify cib_perform_op(), and assorted other changes #4042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
181ad84
Test: cts-cli: Use word boundaries for CIB version attributes
nrwahl2 Jan 2, 2026
c40b5b4
Feature: libcib, tools: Empty CIB contains admin_epoch before epoch
nrwahl2 Jan 2, 2026
a10420b
Refactor: libcrmcommon: New pcmk__xml_replace_with_copy()
nrwahl2 Jan 2, 2026
97164e6
Refactor: libcib: Replace CIB with a copy of input in same doc
nrwahl2 Jan 2, 2026
1802cc9
Refactor: libcib: Use result_cib in cib__process_query()
nrwahl2 Jan 29, 2026
ea25071
Refactor: libcib: Merge existing_cib and result_cib args of cib__op_fn_t
nrwahl2 Dec 31, 2025
d1e4510
Refactor: libcib: Return standard code from cib_file.c:process_request()
nrwahl2 Dec 31, 2025
1472a1c
Refactor: libcib: Return standard code from cib__extend_transaction()
nrwahl2 Dec 31, 2025
1e151fe
Refactor: libcib: Return standard code from cib__create_op()
nrwahl2 Dec 31, 2025
ee84255
Refactor: libcib: Assert *current_cib != scratch when make_copy true
nrwahl2 Dec 31, 2025
e37beb5
Refactor: various: Simplify calling function variables
nrwahl2 Feb 10, 2026
f929270
Refactor: libcib: Rename scratch to working_cib in cib_perform_op()
nrwahl2 Dec 31, 2025
2d5d018
Refactor: libcib: New set_update_origin() for cib_perform_op()
nrwahl2 Dec 31, 2025
48e3a90
Log: libcib: Drop unhelpful trace message
nrwahl2 Dec 31, 2025
937c0d0
Low: libcrmcommon: Handle NULL PCMK_XA_FORMAT and PCMK_XA_DIGEST
nrwahl2 Dec 31, 2025
e7ea3fb
Test: cts-cli: Update outputs for "(no digest)"
nrwahl2 Dec 31, 2025
35fb26b
Refactor: libcib: Add digest in cib_perform_op if and only if tracing
nrwahl2 Dec 31, 2025
5c6a51e
Refactor: libcib: Drop test apply-patchset when tracing cib_perform_op()
nrwahl2 Dec 31, 2025
d47dbf9
Refactor: libcib: Drop make_copy variable
nrwahl2 Dec 31, 2025
89b1857
Refactor: libcib: Functionize checking versions in cib_perform_op()
nrwahl2 Dec 31, 2025
885b4bb
Refactor: libcib: Simplify some return-code handling in cib_perform_op()
nrwahl2 Dec 31, 2025
1bea489
Refactor: libcib: Drop redundant NULL check in cib_perform_op()
nrwahl2 Dec 31, 2025
3913201
Refactor: libcib: cib_perform_op() takes enum cib_variant arg
nrwahl2 Dec 31, 2025
5b788c7
Refactor: libcib: Functionize checking new feature set in cib_perform_op
nrwahl2 Dec 31, 2025
2a07982
API: libcrmcommon: xml_create_patchset() source argument is now const
nrwahl2 Dec 31, 2025
b5e5a00
Refactor: libcib: Clarify patchset_cib variable
nrwahl2 Dec 31, 2025
2d6631d
Refactor: libcib: Assert on NULL diff in cib_perform_op()
nrwahl2 Jan 1, 2026
fe8973e
Refactor: libcrmcommon: Drop redundant check in xml_create_patchset_v2()
nrwahl2 Jan 1, 2026
901f78f
Refactor: libcib: goto done if *diff is NULL in cib_perform_op()
nrwahl2 Jan 1, 2026
fa3caba
Log: libcib: Drop logging XML changes and raw patchset in cib_perform_op
nrwahl2 Jan 1, 2026
c9f2d4c
Refactor: libcib: Move pcmk__xml_commit_changes() call
nrwahl2 Jan 1, 2026
eaa66bd
Refactor: based: Drop dead code for PCMK__XA_CIB_UPDATE
nrwahl2 Jan 2, 2026
d32f284
Refactor: based: Drop based_process_apply_patch, send_sync_request, etc.
nrwahl2 Jan 2, 2026
cf016f8
Refactor: based: Drop based_process_replace()
nrwahl2 Jan 2, 2026
367e6c8
Refactor: libcib, based: Drop cib__op_sync_to_one and related things
nrwahl2 Jan 2, 2026
8e21f87
Refactor: libcib: Rename *_sync_to_all to *_sync
nrwahl2 Jan 2, 2026
ef028fd
Fix: libcib: Don't convert -pcmk_err_diff_resync to pcmk_ok
nrwahl2 Jan 2, 2026
5a7c88b
Feature: libcrmcommon: xml_apply_patchset doesn't return diff_resync err
nrwahl2 Jan 2, 2026
ca285c5
Log: controller: Don't treat patchset-apply errors as OK
nrwahl2 Jan 2, 2026
4853a97
Refactor: based: Drop pcmk_rc_diff_resync from switch
nrwahl2 Jan 2, 2026
9dd165d
Log: based: Don't log specially for PCMK__XA_CIB_UPDATE
nrwahl2 Jan 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cts/cli/regression.access_render.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
=#=#=#= Begin test: Configure some ACLs =#=#=#=
=#=#=#= Current cib after: Configure some ACLs =#=#=#=
<cib epoch="2" num_updates="0" admin_epoch="0">
<cib admin_epoch="0" epoch="2" num_updates="0">
<configuration>
<crm_config/>
<nodes/>
Expand All @@ -23,7 +23,7 @@
* Passed: cibadmin - Configure some ACLs
=#=#=#= Begin test: Enable ACLs =#=#=#=
=#=#=#= Current cib after: Enable ACLs =#=#=#=
<cib epoch="3" num_updates="0" admin_epoch="0">
<cib admin_epoch="0" epoch="3" num_updates="0">
<configuration>
<crm_config>
<cluster_property_set id="cib-bootstrap-options">
Expand All @@ -50,7 +50,7 @@
* Passed: crm_attribute - Enable ACLs
=#=#=#= Begin test: An instance of ACLs render (into color) =#=#=#=
<!-- ACLs as evaluated for user tony -->
<cib epoch="3" num_updates="0" admin_epoch="0">
<cib admin_epoch="0" epoch="3" num_updates="0">
<configuration>
<crm_config>
<cluster_property_set id="cib-bootstrap-options">
Expand All @@ -77,7 +77,7 @@
* Passed: cibadmin - An instance of ACLs render (into color)
=#=#=#= Begin test: An instance of ACLs render (into namespacing) =#=#=#=
<!-- ACLs as evaluated for user tony -->
<pcmk-access-readable:cib epoch="3" num_updates="0" admin_epoch="0" xmlns:pcmk-access-writable="http://clusterlabs.org/ns/pacemaker/access/writable" xmlns:pcmk-access-readable="http://clusterlabs.org/ns/pacemaker/access/readable" xmlns:pcmk-access-denied="http://clusterlabs.org/ns/pacemaker/access/denied">
<pcmk-access-readable:cib admin_epoch="0" epoch="3" num_updates="0" xmlns:pcmk-access-writable="http://clusterlabs.org/ns/pacemaker/access/writable" xmlns:pcmk-access-readable="http://clusterlabs.org/ns/pacemaker/access/readable" xmlns:pcmk-access-denied="http://clusterlabs.org/ns/pacemaker/access/denied">
<configuration>
<crm_config>
<cluster_property_set id="cib-bootstrap-options">
Expand Down Expand Up @@ -105,7 +105,7 @@
=#=#=#= Begin test: An instance of ACLs render (into text) =#=#=#=
<!-- ACLs as evaluated for user tony -->
vvv---[ READABLE ]---vvv
<cib epoch="3" num_updates="0" admin_epoch="0">
<cib admin_epoch="0" epoch="3" num_updates="0">
<configuration>
<crm_config>
<cluster_property_set id="cib-bootstrap-options">
Expand Down
74 changes: 37 additions & 37 deletions cts/cli/regression.acls.exp
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions cts/cli/regression.cibadmin.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
=#=#=#= Begin test: Validate CIB =#=#=#=
<cib epoch="4" num_updates="0" admin_epoch="0">
<cib admin_epoch="0" epoch="4" num_updates="0">
<configuration>
<crm_config>
<cluster_property_set id="cib-bootstrap-options">
Expand All @@ -17,7 +17,7 @@
<status/>
</cib>
=#=#=#= Current cib after: Validate CIB =#=#=#=
<cib epoch="4" num_updates="0" admin_epoch="0">
<cib admin_epoch="0" epoch="4" num_updates="0">
<configuration>
<crm_config>
<cluster_property_set id="cib-bootstrap-options">
Expand All @@ -38,7 +38,7 @@
* Passed: cibadmin - Validate CIB
=#=#=#= Begin test: Validate CIB (XML) =#=#=#=
<pacemaker-result api-version="X" request="cibadmin --output-as=xml -Q">
<output><![CDATA[<cib epoch="4" num_updates="0" admin_epoch="0">
<output><![CDATA[<cib admin_epoch="0" epoch="4" num_updates="0">
<configuration>
<crm_config>
<cluster_property_set id="cib-bootstrap-options">
Expand All @@ -59,7 +59,7 @@
<status code="0" message="OK"/>
</pacemaker-result>
=#=#=#= Current cib after: Validate CIB (XML) =#=#=#=
<cib epoch="4" num_updates="0" admin_epoch="0">
<cib admin_epoch="0" epoch="4" num_updates="0">
<configuration>
<crm_config>
<cluster_property_set id="cib-bootstrap-options">
Expand All @@ -79,20 +79,20 @@
=#=#=#= End test: Validate CIB (XML) - OK (0) =#=#=#=
* Passed: cibadmin - Validate CIB (XML)
=#=#=#= Begin test: Digest calculation =#=#=#=
9130d6f39c2b83bd032a00e76621508c
1f3492630cde57d6b7ee45de4d390469
=#=#=#= End test: Digest calculation - OK (0) =#=#=#=
* Passed: cibadmin - Digest calculation
=#=#=#= Begin test: Digest calculation (XML) =#=#=#=
<pacemaker-result api-version="X" request="cibadmin --output-as=xml -5 -p">
<md5-sum digest="9130d6f39c2b83bd032a00e76621508c"/>
<md5-sum digest="1f3492630cde57d6b7ee45de4d390469"/>
<status code="0" message="OK"/>
</pacemaker-result>
=#=#=#= End test: Digest calculation (XML) - OK (0) =#=#=#=
* Passed: cibadmin - Digest calculation (XML)
=#=#=#= Begin test: Require --force for CIB erasure =#=#=#=
cibadmin: The supplied command is considered dangerous. To prevent accidental destruction of the cluster, the --force flag is required in order to proceed.
=#=#=#= Current cib after: Require --force for CIB erasure =#=#=#=
<cib epoch="4" num_updates="0" admin_epoch="0">
<cib admin_epoch="0" epoch="4" num_updates="0">
<configuration>
<crm_config>
<cluster_property_set id="cib-bootstrap-options">
Expand Down Expand Up @@ -120,7 +120,7 @@ cibadmin: The supplied command is considered dangerous. To prevent accidental de
</status>
</pacemaker-result>
=#=#=#= Current cib after: Require --force for CIB erasure (XML) =#=#=#=
<cib epoch="4" num_updates="0" admin_epoch="0">
<cib admin_epoch="0" epoch="4" num_updates="0">
<configuration>
<crm_config>
<cluster_property_set id="cib-bootstrap-options">
Expand Down Expand Up @@ -149,7 +149,7 @@ cibadmin: The supplied command is considered dangerous. To prevent accidental de
=#=#=#= End test: Allow CIB erasure with --force (XML) - OK (0) =#=#=#=
* Passed: cibadmin - Allow CIB erasure with --force (XML)
=#=#=#= Begin test: Query CIB =#=#=#=
<cib epoch="1" num_updates="0" admin_epoch="0">
<cib admin_epoch="0" epoch="1" num_updates="0">
<configuration>
<crm_config/>
<nodes/>
Expand All @@ -159,7 +159,7 @@ cibadmin: The supplied command is considered dangerous. To prevent accidental de
<status/>
</cib>
=#=#=#= Current cib after: Query CIB =#=#=#=
<cib epoch="1" num_updates="0" admin_epoch="0">
<cib admin_epoch="0" epoch="1" num_updates="0">
<configuration>
<crm_config/>
<nodes/>
Expand All @@ -172,7 +172,7 @@ cibadmin: The supplied command is considered dangerous. To prevent accidental de
* Passed: cibadmin - Query CIB
=#=#=#= Begin test: Query CIB (XML) =#=#=#=
<pacemaker-result api-version="X" request="cibadmin --output-as=xml -Q">
<output><![CDATA[<cib epoch="1" num_updates="0" admin_epoch="0">
<output><![CDATA[<cib admin_epoch="0" epoch="1" num_updates="0">
<configuration>
<crm_config/>
<nodes/>
Expand All @@ -185,7 +185,7 @@ cibadmin: The supplied command is considered dangerous. To prevent accidental de
<status code="0" message="OK"/>
</pacemaker-result>
=#=#=#= Current cib after: Query CIB (XML) =#=#=#=
<cib epoch="1" num_updates="0" admin_epoch="0">
<cib admin_epoch="0" epoch="1" num_updates="0">
<configuration>
<crm_config/>
<nodes/>
Expand Down
Loading