This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new e2d7e72 HADOOP-17142. Fix outdated properties of JournalNode when
performing rollback. Contributed by Deegue.
e2d7e72 is described below
commit e2d7e72c1b8a0050e6b6ad08e4824617b7a5529a
Author: Yizhong Zhang <[email protected]>
AuthorDate: Wed Nov 11 01:11:31 2020 +0800
HADOOP-17142. Fix outdated properties of JournalNode when performing
rollback. Contributed by Deegue.
(cherry picked from commit 82de07c794fe119946bec2e563c1937f312e8ac9)
(cherry picked from commit 12bfd9194a1b6ff89fb31f1f49e69c727f844155)
(cherry picked from commit 52c2ce53c25738713c6bc2b710249dd708c3d9de)
---
.../main/java/org/apache/hadoop/hdfs/qjournal/server/JNStorage.java | 4 ++++
.../src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java | 2 ++
2 files changed, 6 insertions(+)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JNStorage.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JNStorage.java
index ee99e2b..be81859 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JNStorage.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JNStorage.java
@@ -236,6 +236,10 @@ class JNStorage extends Storage {
void analyzeStorage() throws IOException {
this.state = sd.analyzeStorage(StartupOption.REGULAR, this);
+ refreshStorage();
+ }
+
+ void refreshStorage() throws IOException {
if (state == StorageState.NORMAL) {
readProperties(sd);
}
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
index d745562..46c9fa7 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
@@ -1178,6 +1178,8 @@ public class Journal implements Closeable {
// directory will be renamed. It will be reopened lazily on next access.
IOUtils.cleanup(LOG, committedTxnId);
storage.getJournalManager().doRollback();
+ // HADOOP-17142: refresh properties after rollback performed.
+ storage.refreshStorage();
}
synchronized void discardSegments(long startTxId) throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
