HDFS-16537.Fix oev decode xml error#8311
Open
GuoPhilipse wants to merge 25 commits intoapache:trunkfrom
Open
Conversation
Member
Author
|
For the old pr "#4160" not follow the latest branch, so i create a new pr for it. |
There was a problem hiding this comment.
Pull request overview
This PR addresses HDFS-16537 by fixing XML decoding for FSEditLogOp.TruncateOp (used by Offline Edits Viewer / XML-based edit log parsing) and adds regression tests to validate correct truncateBlock parsing behavior.
Changes:
- Update
TruncateOp#fromXmlto parse the<BLOCK>stanza as a child element rather than the root stanza. - Add unit tests covering XML decoding with and without a
<BLOCK>stanza forTruncateOp.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSEditLogOp.java |
Adds regression coverage for TruncateOp#fromXml behavior with/without <BLOCK>. |
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java |
Fixes TruncateOp#fromXml to read block fields from the <BLOCK> child stanza. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| import org.apache.hadoop.hdfs.protocol.Block; | ||
| import org.apache.hadoop.hdfs.util.XMLUtils.InvalidXmlException; | ||
| import org.apache.hadoop.hdfs.util.XMLUtils.Stanza; | ||
| import org.junit.Test; |
There was a problem hiding this comment.
This test class mixes JUnit 5 assertions with a JUnit 4 @Test annotation (org.junit.Test). In this module most tests use JUnit Jupiter annotations (e.g., TestAddBlock.java imports org.junit.jupiter.api.Test), and mixing frameworks can cause tests not to be discovered depending on the configured runner. Switch to org.junit.jupiter.api.Test (or consistently use JUnit 4 assertions/runner) to match the existing test setup.
Suggested change
| import org.junit.Test; | |
| import org.junit.jupiter.api.Test; |
Comment on lines
2944
to
2950
| this.clientName = st.getValue("CLIENTNAME"); | ||
| this.clientMachine = st.getValue("CLIENTMACHINE"); | ||
| this.newLength = Long.parseLong(st.getValue("NEWLENGTH")); | ||
| this.timestamp = Long.parseLong(st.getValue("TIMESTAMP")); | ||
| if (st.hasChildren("BLOCK")) | ||
| this.truncateBlock = FSEditLogOp.blockFromXml(st); | ||
| this.truncateBlock = FSEditLogOp.blockFromXml(st.getChildren("BLOCK").get(0)); | ||
| } |
There was a problem hiding this comment.
TruncateOp#fromXml only updates truncateBlock when a stanza is present; if the stanza is missing, truncateBlock retains its previous value. This breaks XML decoding correctness (and should fail the new test that expects truncateBlock to be reset to null). Consider explicitly clearing truncateBlock at the start of fromXml (and/or in resetSubFields) and validating there is exactly one BLOCK child before parsing (consistent with the <=1 block invariant used in readFields).
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
Member
Author
This file contains hidden or 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
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.
JIRA:HDFS-16537