Skip to content

HDDS-4987. Import container should not delete container contents if container already exists #2077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChenSammi merged 2 commits into from
Apr 1, 2021
Merged

HDDS-4987. Import container should not delete container contents if container already exists #2077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f18c1d
HDDS-4987. Import container should not delete container contents if c…
ChenSammi Mar 24, 2021
15f66c8
address comment
ChenSammi Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ...r-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,8 @@ public void importContainerData(InputStream input,
+ " as the container descriptor (%s) has already been exist.",
getContainerData().getContainerID(),
getContainerFile().getAbsolutePath());
throw new IOException(errorMessage);
throw new StorageContainerException(errorMessage,
CONTAINER_ALREADY_EXISTS);
}
//copy the values from the input stream to the final destination
// directory.
Expand Down Expand Up @@ -496,11 +497,17 @@ public void importContainerData(InputStream input,
KeyValueContainerUtil.parseKVContainerData(containerData, config);

} catch (Exception ex) {
if (ex instanceof StorageContainerException &&
((StorageContainerException) ex).getResult() ==
CONTAINER_ALREADY_EXISTS) {
throw ex;
}
//delete all the temporary data in case of any exception.
try {
FileUtils.deleteDirectory(new File(containerData.getMetadataPath()));
FileUtils.deleteDirectory(new File(containerData.getChunksPath()));
FileUtils.deleteDirectory(getContainerFile());
FileUtils.deleteDirectory(
new File(getContainerData().getContainerPath()));
} catch (Exception deleteex) {
LOG.error(
"Can not cleanup destination directories after a container import"
Expand Down
25 changes: 25 additions & 0 deletions ...rvice/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,33 @@ public void testContainerImportExport() throws Exception {
fail("Container is imported twice. Previous files are overwritten");
} catch (IOException ex) {
//all good
assertTrue(container.getContainerFile().exists());
}

//Import failure should cleanup the container directory
containerData =
new KeyValueContainerData(containerId + 1,
keyValueContainerData.getLayOutVersion(),
keyValueContainerData.getMaxSize(), UUID.randomUUID().toString(),
datanodeId.toString());
container = new KeyValueContainer(containerData, CONF);

containerVolume = volumeChoosingPolicy.chooseVolume(volumeSet
.getVolumesList(), 1);
hddsVolumeDir = containerVolume.getHddsRootDir().toString();
container.populatePathFields(scmId, containerVolume, hddsVolumeDir);
try {
FileInputStream fis = new FileInputStream(folderToExport);
fis.close();
container.importContainerData(fis, packer);
fail("Container import should fail");
} catch (Exception ex) {
assertTrue(ex instanceof IOException);
} finally {
File directory =
new File(container.getContainerData().getContainerPath());
assertFalse(directory.exists());
}
}

/**
Expand Down