Skip to content

Reorganize CIB op handler functions and start on based_remote.c#4021

Merged
nrwahl2 merged 35 commits intoClusterLabs:mainfrom
nrwahl2:nrwahl2-based_first
Jan 13, 2026
Merged

Reorganize CIB op handler functions and start on based_remote.c#4021
nrwahl2 merged 35 commits intoClusterLabs:mainfrom
nrwahl2:nrwahl2-based_first

Conversation

@nrwahl2
Copy link
Contributor

@nrwahl2 nrwahl2 commented Jan 9, 2026

This is the next batch from #4011

nrwahl2 added 30 commits January 9, 2026 13:55
@nrwahl2
Refactor: based: New based_messages.h
c91c23d 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: Return void from cib_read_config()
bfc606c 
Nothing uses the return value.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: based: Best practices for cib_process_delete_absolute()
b36d70b 
* Use "based_" prefix.
* Add Doxygen.
* Move definition to align with order in based_operation.c table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: based: cib_server_process_diff -> based_process_apply_patch
61c4b11 
Rename the function to match the request name. Also move the definition
to match the order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: based: Drop send_sync_request() argument
9ba8341 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: cib_process_diff -> cib__process_apply_patch
095c0ca 
Rename the function to match the request name and to use the internal
prefix. Also move the definition to match the order in the operation
table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: cib_process_bump() -> cib__process_bump()
1d653fd 
Rename the function to use the internal prefix. Also move the definition
to match the order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: based: Rename cib_process_commit_transaction()
e480b19 
...to based_process_commit_transact().

Rename the function to match the request name. Also move the definition
to match the order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: Stop using "cib_" prefix in static cib_file.c funcs
53d38f4 
To avoid using the public API prefix.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: Drop "cib_" from some internal cib_file.c symbols
0941b08 
To avoid using the public API prefix.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: Move commit_transact handler above functions table
24d40bd 
We can't avoid a forward declaration altogether, but forward-declare
get_op_functions() instead.

It seems more reasonable for the commit_transact handler to be defined
above the table that uses it.

No code changes (aside from renaming file_get_op_functions() to
get_op_functions()); it only moves.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: Don't use gboolean in cib_file.c
8cc43b4 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: Move some static variable declarations to top of file
619b017 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: Drop CIB_SERIES_BZIP
f1890cd 
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: cib_process_create() -> cib__process_create()
3a971fa 
Rename the function to use the internal prefix. Also move the definition
to match the order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: cib_process_delete() -> cib__process_delete()
448559d 
Rename the function to use the internal prefix. Also move the definition
to match the order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: Make cib_process_xpath() static
6e2d1b1 
And rename to process_xpath(), to avoid using the public API prefix.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Doc: various: Update a few copyright dates
0bf543e 
These were missed in recent commits.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: cib_process_erase() -> cib__process_erase()
a2fc8d5 
Rename the function to use the internal prefix. Also move the definition
to match the order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: based: New based_process_is_primary()
65d66f5 
The new function's name matches the request name.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: cib_process_modify() -> cib__process_modify()
1117ed1 
Rename the function to use the internal prefix. Also move the definition
to match the order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: based: cib_process_noop() -> based_process_noop()
b35965b 
Avoid using the public API prefix. Also move the definition to match the
order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: based: cib_process_ping() -> based_process_ping()
9bb0a91 
Avoid using the public API prefix. Also move the definition to match the
order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: based: New based_process_primary()
e3f1fbb 
The new function's name matches the request name.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: cib_process_query() -> cib__process_query()
dc448f5 
Rename the function to use the internal prefix.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: based: cib_process_replace_svr() -> based_process_replace()
1801167 
Avoid using the public API prefix. Also move the definition to match the
order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: based: cib_process_readwrite() -> based_process_secondary()
30e0a62 
Avoid using the public API prefix. The new function's name also matches
the request name.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: based: cib_process_shutdown_req() -> based_process_shutdown()
0bbd2b5 
Avoid using the public API prefix. Rename to match request name. Also
move the definition to match the order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: cib__op_sync_{all,one} -> cib__op_sync_to_{all,one}
15f0e4a 
To match the request names.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: based: cib_process_sync() -> based_process_sync_to_all()
0ea8461 
Avoid using the public API prefix. Rename to match request name. Also
move the definition to match the order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
nrwahl2 added 5 commits January 9, 2026 13:55
@nrwahl2
Refactor: based: cib_process_sync_one() -> based_process_sync_to_one()
13b023d 
Avoid using the public API prefix. Rename to match request name. Also
move the definition to match the order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: based: cib_process_upgrade_server() -> based_process_upgrade()
db3c0a7 
Avoid using the public API prefix. Rename to match request name. Also
move the definition to match the order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: based: cib_process_schemas() -> based_process_schemas()
30bea45 
Avoid using the public API prefix. Also move the definition to match the
order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: cib_process_replace() -> cib__process_replace()
30457ad 
Rename the function to use the internal prefix. Also move the definition
to match the order in the operation table.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2
Refactor: libcib: cib_process_upgrade() -> cib__process_upgrade()
be9e788 
Rename the function to use the internal prefix.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
@nrwahl2 nrwahl2 requested a review from clumens January 9, 2026 22:00
nrwahl2
nrwahl2 commented Jan 9, 2026
View reviewed changes
daemons/based/based_messages.c
* \internal
* \brief Process a \c PCMK__CIB_REQUEST_ABS_DELETE
*
* \param[in] op Ignored
Copy link
Contributor Author

@nrwahl2 nrwahl2 Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ended up not getting around to Doxygen for others yet. Probably at some point.

@nrwahl2
Copy link
Contributor Author

nrwahl2 commented Jan 9, 2026 •
edited
Loading

@clumens Almost all of this is trivial, so don't let the number of commits or lines changed discourage you

@nrwahl2 nrwahl2 force-pushed the nrwahl2-based_first branch from a7f2155 to fcbb547 Compare January 9, 2026 22:12
nrwahl2
nrwahl2 commented Jan 9, 2026
View reviewed changes
daemons/based/pacemaker-based.c Outdated
}

cib_read_config(config_hash, cib);
cib_read_config(config_hash, the_cib);
Copy link
Contributor Author

@nrwahl2 nrwahl2 Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI we end up getting rid of config_hash completely and dropping this call, but that commit didn't make it into this PR.

@nrwahl2 nrwahl2 force-pushed the nrwahl2-based_first branch from fcbb547 to 1211540 Compare January 11, 2026 00:55
@clumens
Copy link
Contributor

clumens commented Jan 13, 2026

Everything before Refactor: based: New based_remote.h looks good, if you want to go ahead and merge just that part now. You can also wait and I'll take a look at the rest soon.

@nrwahl2 nrwahl2 force-pushed the nrwahl2-based_first branch from 1211540 to be9e788 Compare January 13, 2026 19:58
@nrwahl2
Copy link
Contributor Author

nrwahl2 commented Jan 13, 2026

Everything before Refactor: based: New based_remote.h looks good, if you want to go ahead and merge just that part now. You can also wait and I'll take a look at the rest soon.

Dropped all commits starting with based_remote.h. Merging.

@nrwahl2 nrwahl2 merged commit edeec74 into ClusterLabs:main Jan 13, 2026
1 check was pending
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@clumens clumens Awaiting requested review from clumens

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@nrwahl2 @clumens