HDFS-16338. Correct fsimage error configuration message #3684
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -86,6 +86,7 @@ | |
| import org.junit.Test; | ||
|
|
||
| import static org.junit.Assert.assertArrayEquals; | ||
| import static org.junit.Assert.fail; | ||
|
|
||
| public class TestFSImage { | ||
|
|
||
|
|
@@ -275,6 +276,31 @@ public void testSaveAndLoadStripedINodeFile() throws IOException{ | |
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testImportCheckpoint() throws IOException{ | ||
|
||
| Configuration conf = new Configuration(); | ||
| conf.set(DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_EDITS_DIR_KEY,""); | ||
| MiniDFSCluster cluster = null; | ||
| try { | ||
GuoPhilipse marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| cluster = new MiniDFSCluster.Builder(conf).build(); | ||
| cluster.waitActive(); | ||
| FSNamesystem fsn = cluster.getNamesystem(); | ||
| FSImage fsImage= new FSImage(conf); | ||
| try { | ||
| fsImage.doImportCheckpoint(fsn); | ||
| 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); | ||
| } | ||
| } finally { | ||
| if (cluster != null) { | ||
| cluster.shutdown(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Test if a INodeFileUnderConstruction with BlockInfoStriped can be | ||
| * saved and loaded by FSImageSerialization | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Btw
checkpointDirsandcheckpointEditsDirswill not be null as they are assigned values returned byFSImage.getCheckpointDirsandFSImage.getCheckpointEditsDirsrespectively.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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).