Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-1238. Fix Ratis Snapshot creation error if the snapshot file already exists in ContainerStateMachine. Contributed by Shashikant Banerjee.

This commit is contained in:
Mukul Kumar Singh 2019-03-09 22:46:20 +05:30
parent 0cbe9ad8c2
commit 8458ced11e
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
View File

@ -249,20 +249,13 @@ public class ContainerStateMachine extends BaseStateMachine {
public long takeSnapshot() throws IOException { public long takeSnapshot() throws IOException {
TermIndex ti = getLastAppliedTermIndex(); TermIndex ti = getLastAppliedTermIndex();
LOG.info("Taking snapshot at termIndex:" + ti); LOG.info("Taking snapshot at termIndex:" + ti);
if (ti != null) { if (ti != null && ti.getIndex() != RaftServerConstants.INVALID_LOG_INDEX) {
final File snapshotFile = final File snapshotFile =
storage.getSnapshotFile(ti.getTerm(), ti.getIndex()); storage.getSnapshotFile(ti.getTerm(), ti.getIndex());
LOG.info("Taking a snapshot to file {}", snapshotFile); LOG.info("Taking a snapshot to file {}", snapshotFile);
try { try (FileOutputStream fos = new FileOutputStream(snapshotFile)) {
//TODO: For now, just create the file to save the term index, persistContainerSet(fos);
boolean created = snapshotFile.createNewFile(); } catch (IOException ioe) {
if (!created) {
throw new IOException("Failed to create ratis snapshot file");
}
try (FileOutputStream fos = new FileOutputStream(snapshotFile)) {
persistContainerSet(fos);
}
} catch(IOException ioe) {
LOG.warn("Failed to write snapshot file \"" + snapshotFile LOG.warn("Failed to write snapshot file \"" + snapshotFile
+ "\", last applied index=" + ti); + "\", last applied index=" + ti);
throw ioe; throw ioe;