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

HADOOP-17142. Fix outdated properties of JournalNode when performing rollback. Contributed by Deegue. 

(cherry picked from commit 82de07c794)
(cherry picked from commit 12bfd9194a)
This commit is contained in:
Yizhong Zhang 2020-11-11 01:11:31 +08:00 committed by Wei-Chiu Chuang
parent 4af5f55623
commit 52c2ce53c2
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JNStorage.java
View File

@ -236,6 +236,10 @@ class JNStorage extends Storage {
void analyzeStorage() throws IOException { void analyzeStorage() throws IOException {
this.state = sd.analyzeStorage(StartupOption.REGULAR, this); this.state = sd.analyzeStorage(StartupOption.REGULAR, this);
refreshStorage();
}
void refreshStorage() throws IOException {
if (state == StorageState.NORMAL) { if (state == StorageState.NORMAL) {
readProperties(sd); readProperties(sd);
} }

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
View File

@ -1178,6 +1178,8 @@ public class Journal implements Closeable {
// directory will be renamed. It will be reopened lazily on next access. // directory will be renamed. It will be reopened lazily on next access.
IOUtils.cleanupWithLogger(LOG, committedTxnId); IOUtils.cleanupWithLogger(LOG, committedTxnId);
storage.getJournalManager().doRollback(); storage.getJournalManager().doRollback();
// HADOOP-17142: refresh properties after rollback performed.
storage.refreshStorage();
} }
synchronized void discardSegments(long startTxId) throws IOException { synchronized void discardSegments(long startTxId) throws IOException {