Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.NoSuchFileException;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.ratis.proto.RaftProtos.LogEntryProto;
import org.apache.ratis.server.RaftConfiguration;
Expand Down Expand Up @@ -153,14 +152,16 @@ public void writeRaftConfiguration(LogEntryProto conf) {

public RaftConfiguration readRaftConfiguration() {
File confFile = storageDir.getMetaConfFile();
try (InputStream fio = FileUtils.newInputStream(confFile)) {
LogEntryProto confProto = LogEntryProto.newBuilder().mergeFrom(fio).build();
return LogProtoUtils.toRaftConfiguration(confProto);
} catch (FileNotFoundException | NoSuchFileException e) {
return null;
} catch (Exception e) {
LOG.error("Failed reading configuration from file:" + confFile, e);
if (!confFile.exists()) {
return null;
} else {
try (InputStream fio = FileUtils.newInputStream(confFile)) {
LogEntryProto confProto = LogEntryProto.newBuilder().mergeFrom(fio).build();
return LogProtoUtils.toRaftConfiguration(confProto);
} catch (Exception e) {
LOG.error("Failed reading configuration from file:" + confFile, e);
return null;
}
}
}

Expand Down