HDFS-16338. Correct fsimage error configuration message #3684
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
|
💔 -1 overall
This message was automatically generated. |
cxorm
approved these changes
Nov 22, 2021
|
🎊 +1 overall
This message was automatically generated. |
|
@cxorm Thanks for your review :) |
tomscut
reviewed
Nov 25, 2021
| @@ -275,6 +276,31 @@ public void testSaveAndLoadStripedINodeFile() throws IOException{ | |||
| } | |||
| } | |||
|
|
|||
| @Test | |||
| public void testImportCheckpoint() throws IOException{ | |||
There was a problem hiding this comment.
A little advice. You can consider using try with resources for MiniDFSCluster cluster = new MiniDFSCluster.Builder(config).build().
There was a problem hiding this comment.
Thanks @tomscut for your advice , it seems simpler code.
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
tomscut
reviewed
Nov 26, 2021
| @@ -587,7 +587,7 @@ void doImportCheckpoint(FSNamesystem target) throws IOException { | |||
|
|
|||
| if (checkpointEditsDirs == null || checkpointEditsDirs.isEmpty()) { | |||
| throw new IOException("Cannot import image from a checkpoint. " | |||
| + "\"dfs.namenode.checkpoint.dir\" is not set." ); | |||
| + "\"dfs.namenode.checkpoint.edits.dir\" is not set." ); | |||
There was a problem hiding this comment.
Looks like there are some checktyles that need fixing. Maybe you can configure checkstyle.xml in your IDE. See ./hadoop-github/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml. The other changes look good to me.
There was a problem hiding this comment.
great! Thanks @tomscut for your advice,
|
🎊 +1 overall
This message was automatically generated. |
ayushtkn
reviewed
Dec 4, 2021
...fs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImage.java
Outdated
Show resolved
Hide resolved
Comment on lines
290
to
294
| fail("Expect to throw IOException."); | ||
| } catch (IOException e) { | ||
| GenericTestUtils.assertExceptionContains( | ||
| "Cannot import image from a checkpoint. " | ||
| + "\"dfs.namenode.checkpoint.edits.dir\" is not set.", e); |
There was a problem hiding this comment.
Use LambdaTestUtils instead of try-catch-assert
There was a problem hiding this comment.
Thanks @ayushtkn for your advice, just updated.
|
💔 -1 overall
This message was automatically generated. |
ayushtkn
approved these changes
Dec 4, 2021
|
💔 -1 overall
This message was automatically generated. |
ayushtkn
reviewed
Dec 5, 2021
There was a problem hiding this comment.
Checkstyle needs to be corrected:
https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-3684/10/artifact/out/results-checkstyle-hadoop-hdfs-project_hadoop-hdfs.txt
Thanks @ayushtkn for your check, have just updated. |
|
🎊 +1 overall
This message was automatically generated. |
|
Merged, Thanx Everyone!!! |
virajjasani
reviewed
Dec 6, 2021
There was a problem hiding this comment.
Belated +1 (non-binding). Thanks @GuoPhilipse. Left one minor nit if you would like to take it up later. Thanks
| @@ -582,12 +582,12 @@ void doImportCheckpoint(FSNamesystem target) throws IOException { | |||
|
|
|||
| if (checkpointDirs == null || checkpointDirs.isEmpty()) { | |||
| throw new IOException("Cannot import image from a checkpoint. " | |||
| + "\"dfs.namenode.checkpoint.dir\" is not set." ); | |||
| + "\"dfs.namenode.checkpoint.dir\" is not set."); | |||
| } | |||
|
|
|||
| if (checkpointEditsDirs == null || checkpointEditsDirs.isEmpty()) { | |||
There was a problem hiding this comment.
Btw checkpointDirs and checkpointEditsDirs will not be null as they are assigned values returned by FSImage.getCheckpointDirs and FSImage.getCheckpointEditsDirs respectively.
There was a problem hiding this comment.
hmm, my IntelliJ was giving that warning as well, but that was something not touched here....
I thought Todd added it just for future safety, Didn't research why there was a null check considering it harmless.
There was a problem hiding this comment.
Yeah it seems fine, just an additional null check, not a big deal. Also good to keep it for future safety as you predicted correctly, just in case if the methods themselves start returning null (less likely but still doable).
HarshitGupta11
pushed a commit
to HarshitGupta11/hadoop
that referenced
this pull request
Nov 28, 2022
…. Contributed by guophilipse. Reviewed-by: cxorm <lianp964@gmail.com> Reviewed-by: tomscut <litao@bigo.sg> Signed-off-by: Ayush Saxena <ayushsaxena@apache.org>
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.
dfs.namenode.checkpoint.edits.dirmay be different fromdfs.namenode.checkpoint.dir, ifcheckpointEditsDirsis null or empty, error message should warn the edit dir configuration, we can fix it.