Convert to using libpacemaker for managing tickets #144
+312
−26
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
clumens
commented
Jun 25, 2024
src/main.c
Outdated
| @@ -1627,6 +1630,10 @@ int main(int argc, char *argv[], char *envp[]) | |||
| enum qb_log_target_slot i; | |||
| #endif | |||
|
|
|||
| #ifdef LIBPACEMAKER | |||
| crm_xml_init(); | |||
There was a problem hiding this comment.
We've deprecated crm_xml_init in pacemaker. I'm not sure what the replacement for external users is at the moment, if any. We'll have to think of something, though. Looking into it.
There was a problem hiding this comment.
We're going to need to take care of https://projects.clusterlabs.org/T840 before this can be worked on.
jfriesse
reviewed
Jun 27, 2024
Pacemaker already includes a public pacemaker.h which we are going to start using, and gcc doesn't like two header files with the same name in different locations. And rename pacemaker.c to pcmk.c for consistency.
This is required to initialize various internal pacemaker XML structures and schemas before they are used the first time. Without this, calling into libpacemaker will result in tracebacks.
libpacemaker provides a public API for managing tickets. A first step towards using this API is just the setting and removing code, which is pretty straightforward. We can ignore the XML result portion of the API because in these cases it doesn't contain anything more useful than just the return code.
Similar to the previous commit, we can use the new libpacemaker API to also handle atomically modifying a ticket.
While this function isn't currently used, we might as well convert everything to use libpacemaker in case it finds a use in the future. It also provides a good example of how to do this same thing elsewhere in future commits.
This function is now slightly different. Instead of going all the way from reading a file pointer to loading attributes, it now stops before loading the attributes and returns an XML document. The attribute loading happens afterwards in the caller.
The function itself is very simple. The rest of the work is in save_attributes, where it needs to understand both the libpacemaker XML result as well as the result of calling crm_ticket directly. It's still pretty simple, though - just digging around in the XML to set a node pointer correctly. Fixes ClusterLabs#136
|
Rebased to take care of file conflicts and get rid of the couple initial rpm/build patches that were merged elsewhere. We are still working on the libpacemaker initialization stuff, so this is still not ready to go. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've tested this a little bit several weeks ago, but obviously it needs to be more thoroughly tested again. I'd love to come up with a way to do this automatically, because it's kind of a pain to set up a test for it. Suggestions welcome.
For the moment, this is just a draft PR to see if I'm on the right track.