Correctly handle xml comments #1225
Merged
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
…m getting into infinite election loop With b7fa323, crmd could still get into an infinite election loop when there was more than one comment with the exactly same text at the same level within a CIB XML element. For example: ''' <!--# "Fri Feb 10 11:20:40 CET 2017--> <!--#============================================================================--> <!--#--> <!--# Administrator A--> <!--#--> <!--# Pacemaker basic config file for Cluster A--> <!--#============================================================================--> <!--#--> ''' Basically, it'd produce big messes if using the diff operation "move" for XML comments in such a case. With this commit, it strictly tries to match the XML comments at the exactly same offsets when comparing v2 patchset, so that only the diff operations "create" and "delete" will be used for XML comments.
…ositions Previously, v2 patchset was not able to define which exact XML comments were expected to be deleted in a CIB XML element. It was a problem if there was more than one comment at the same level within a CIB XML element. This commit resolves it by adding and handling a "position" field in the diff operation "delete" for XML comments.
gao-yan
force-pushed
the
handle-xml-comment
branch
from
60e482c
to
362f028
Compare
|
Wow, that's a long run for a short slide ;-) |
|
;-) Well, I'm quite surprised that some users really like to comment in their cib. |
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.
No description provided.