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 2021/02/22 07:32:59 UTC
[hadoop] branch branch-3.3 updated: HDFS-15826. Solve the problem
of incorrect progress of delegation tokens when loading FsImage. (#2686)
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new ee0e32a HDFS-15826. Solve the problem of incorrect progress of delegation tokens when loading FsImage. (#2686)
ee0e32a is described below
commit ee0e32abdcfd08582e4545c30e7dca120e5dafd3
Author: jianghuazhu <74...@qq.com>
AuthorDate: Mon Feb 22 15:22:32 2021 +0800
HDFS-15826. Solve the problem of incorrect progress of delegation tokens when loading FsImage. (#2686)
Co-authored-by: zhujianghua <zh...@zhujianghuadeMacBook-Pro.local>
(cherry picked from commit 98ffd65d8bf96cf5a1ec75134fb67fdeb955e5b6)
---
.../security/token/delegation/DelegationTokenSecretManager.java | 3 ++-
.../apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java | 3 +--
.../java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 6 ++++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenSecretManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenSecretManager.java
index b061d4b..68f3dd6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenSecretManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenSecretManager.java
@@ -191,7 +191,7 @@ public class DelegationTokenSecretManager
}
}
- public synchronized void loadSecretManagerState(SecretManagerState state)
+ public synchronized void loadSecretManagerState(SecretManagerState state, Counter counter)
throws IOException {
Preconditions.checkState(!running,
"Can't load state from image in a running SecretManager.");
@@ -211,6 +211,7 @@ public class DelegationTokenSecretManager
id.setSequenceNumber(t.getSequenceNumber());
id.setMasterKeyId(t.getMasterKeyId());
addPersistedDelegationToken(id, t.getExpiryDate());
+ counter.increment();
}
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java
index 838ad8a..92a2083 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java
@@ -538,10 +538,9 @@ public final class FSImageFormatProtobuf {
Counter counter = prog.getCounter(Phase.LOADING_FSIMAGE, currentStep);
for (int i = 0; i < numTokens; ++i) {
tokens.add(SecretManagerSection.PersistToken.parseDelimitedFrom(in));
- counter.increment();
}
- fsn.loadSecretManagerState(s, keys, tokens);
+ fsn.loadSecretManagerState(s, keys, tokens, counter);
}
private void loadCacheManagerSection(InputStream in, StartupProgress prog,
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index afd1814..245aa92 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -6166,8 +6166,10 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
void loadSecretManagerState(SecretManagerSection s,
List<SecretManagerSection.DelegationKey> keys,
- List<SecretManagerSection.PersistToken> tokens) throws IOException {
- dtSecretManager.loadSecretManagerState(new SecretManagerState(s, keys, tokens));
+ List<SecretManagerSection.PersistToken> tokens,
+ StartupProgress.Counter counter) throws IOException {
+ dtSecretManager.loadSecretManagerState(new SecretManagerState(s, keys, tokens),
+ counter);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org