You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by we...@apache.org on 2020/11/10 17:30:23 UTC
[hadoop] branch branch-3.2 updated: HADOOP-17142. Fix outdated
properties of JournalNode when performing rollback. Contributed by Deegue.
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 52c2ce5 HADOOP-17142. Fix outdated properties of JournalNode when performing rollback. Contributed by Deegue.
52c2ce5 is described below
commit 52c2ce53c25738713c6bc2b710249dd708c3d9de
Author: Yizhong Zhang <zy...@163.com>
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)
---
.../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 b7d6523..aaf9d1b 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 a886b7c..53d14e4 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.cleanupWithLogger(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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org