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 2019/06/19 05:33:40 UTC
[hadoop] branch trunk updated: HDFS-14537. Journaled Edits Cache is
not cleared when formatting the JN. Contributed by Ranith Sardar.
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 48e564f HDFS-14537. Journaled Edits Cache is not cleared when formatting the JN. Contributed by Ranith Sardar.
48e564f is described below
commit 48e564f7e2f9223ba8521c36431358adb47d8bf6
Author: Wei-Chiu Chuang <we...@apache.org>
AuthorDate: Tue Jun 18 22:28:21 2019 -0700
HDFS-14537. Journaled Edits Cache is not cleared when formatting the JN. Contributed by Ranith Sardar.
---
.../hadoop/hdfs/qjournal/server/Journal.java | 24 ++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
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 17c09fe..f684f30 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
@@ -138,12 +138,14 @@ public class Journal implements Closeable {
private final FileJournalManager fjm;
- private final JournaledEditsCache cache;
+ private JournaledEditsCache cache;
private final JournalMetrics metrics;
private long lastJournalTimestamp = 0;
+ private Configuration conf = null;
+
// This variable tracks, have we tried to start journalsyncer
// with nameServiceId. This will help not to start the journalsyncer
// on each rpc call, if it has failed to start
@@ -157,6 +159,7 @@ public class Journal implements Closeable {
Journal(Configuration conf, File logDir, String journalId,
StartupOption startOpt, StorageErrorReporter errorReporter)
throws IOException {
+ this.conf = conf;
storage = new JNStorage(conf, logDir, startOpt, errorReporter);
this.journalId = journalId;
@@ -164,13 +167,8 @@ public class Journal implements Closeable {
this.fjm = storage.getJournalManager();
- if (conf.getBoolean(DFSConfigKeys.DFS_HA_TAILEDITS_INPROGRESS_KEY,
- DFSConfigKeys.DFS_HA_TAILEDITS_INPROGRESS_DEFAULT)) {
- this.cache = new JournaledEditsCache(conf);
- } else {
- this.cache = null;
- }
-
+ this.cache = createCache();
+
this.metrics = JournalMetrics.create(this);
EditLogFile latest = scanStorageForLatestEdits();
@@ -179,6 +177,15 @@ public class Journal implements Closeable {
}
}
+ private JournaledEditsCache createCache() {
+ if (conf.getBoolean(DFSConfigKeys.DFS_HA_TAILEDITS_INPROGRESS_KEY,
+ DFSConfigKeys.DFS_HA_TAILEDITS_INPROGRESS_DEFAULT)) {
+ return new JournaledEditsCache(conf);
+ } else {
+ return null;
+ }
+ }
+
public void setTriedJournalSyncerStartedwithnsId(boolean started) {
this.triedJournalSyncerStartedwithnsId = started;
}
@@ -248,6 +255,7 @@ public class Journal implements Closeable {
LOG.info("Formatting journal id : " + journalId + " with namespace info: " +
nsInfo + " and force: " + force);
storage.format(nsInfo, force);
+ this.cache = createCache();
refreshCachedData();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org