This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 0112a71615 HDDS-9943. TokenRenewer should close OzoneClient after use
(#5809)
0112a71615 is described below
commit 0112a71615538c1714abb0529f5a6366f0173a89
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Dec 18 21:06:48 2023 +0100
HDDS-9943. TokenRenewer should close OzoneClient after use (#5809)
---
.../fs/ozone/BasicOzoneClientAdapterImpl.java | 53 ---------------
.../ozone/BasicRootedOzoneClientAdapterImpl.java | 52 --------------
.../fs/ozone/OzoneDelegationTokenRenewer.java | 79 ++++++++++++++++++++++
.../org.apache.hadoop.security.token.TokenRenewer | 3 +-
.../org.apache.hadoop.security.token.TokenRenewer | 3 +-
5 files changed, 81 insertions(+), 109 deletions(-)
diff --git
a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java
b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java
index a60134d4f6..e6892d9784 100644
---
a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java
+++
b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java
@@ -29,7 +29,6 @@ import java.util.Iterator;
import java.util.List;
import com.google.common.annotations.VisibleForTesting;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.crypto.key.KeyProvider;
import org.apache.hadoop.fs.BlockLocation;
import org.apache.hadoop.fs.FileAlreadyExistsException;
@@ -37,7 +36,6 @@ import org.apache.hadoop.fs.FileChecksum;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathIsNotEmptyDirectoryException;
import org.apache.hadoop.fs.SafeModeAction;
-import org.apache.hadoop.hdds.annotation.InterfaceAudience;
import org.apache.hadoop.hdds.client.ReplicationConfig;
import org.apache.hadoop.hdds.client.ReplicationFactor;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
@@ -69,7 +67,6 @@ import org.apache.hadoop.ozone.security.OzoneTokenIdentifier;
import org.apache.hadoop.ozone.snapshot.SnapshotDiffReportOzone;
import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse;
import org.apache.hadoop.security.token.Token;
-import org.apache.hadoop.security.token.TokenRenewer;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -470,56 +467,6 @@ public class BasicOzoneClientAdapterImpl implements
OzoneClientAdapter {
this.clock = monotonicClock;
}
- /**
- * Ozone Delegation Token Renewer.
- */
- @InterfaceAudience.Private
- public static class Renewer extends TokenRenewer {
-
- //Ensure that OzoneConfiguration files are loaded before trying to use
- // the renewer.
- static {
- OzoneConfiguration.activate();
- }
-
- public Text getKind() {
- return OzoneTokenIdentifier.KIND_NAME;
- }
-
- @Override
- public boolean handleKind(Text kind) {
- return getKind().equals(kind);
- }
-
- @Override
- public boolean isManaged(Token<?> token) throws IOException {
- return true;
- }
-
- @Override
- public long renew(Token<?> token, Configuration conf)
- throws IOException, InterruptedException {
- Token<OzoneTokenIdentifier> ozoneDt =
- (Token<OzoneTokenIdentifier>) token;
-
- OzoneClient ozoneClient =
- OzoneClientFactory.getOzoneClient(OzoneConfiguration.of(conf),
- ozoneDt);
- return ozoneClient.getObjectStore().renewDelegationToken(ozoneDt);
- }
-
- @Override
- public void cancel(Token<?> token, Configuration conf)
- throws IOException, InterruptedException {
- Token<OzoneTokenIdentifier> ozoneDt =
- (Token<OzoneTokenIdentifier>) token;
- OzoneClient ozoneClient =
- OzoneClientFactory.getOzoneClient(OzoneConfiguration.of(conf),
- ozoneDt);
- ozoneClient.getObjectStore().cancelDelegationToken(ozoneDt);
- }
- }
-
/**
* Adapter to convert OzoneKey to a safe and simple Key implementation.
*/
diff --git
a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java
b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java
index 085a2300fd..e565c2bedf 100644
---
a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java
+++
b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java
@@ -32,7 +32,6 @@ import java.util.stream.Collectors;
import com.google.common.base.Preconditions;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.crypto.key.KeyProvider;
import org.apache.hadoop.fs.BlockLocation;
import org.apache.hadoop.fs.FileAlreadyExistsException;
@@ -43,7 +42,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathIsNotEmptyDirectoryException;
import org.apache.hadoop.fs.SafeModeAction;
import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.hdds.annotation.InterfaceAudience;
import org.apache.hadoop.hdds.client.ReplicationConfig;
import org.apache.hadoop.hdds.client.ReplicationFactor;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
@@ -80,7 +78,6 @@ import
org.apache.hadoop.ozone.snapshot.SnapshotDiffReportOzone;
import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
-import org.apache.hadoop.security.token.TokenRenewer;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -958,55 +955,6 @@ public class BasicRootedOzoneClientAdapterImpl
return objectStore.getCanonicalServiceName();
}
- /**
- * Ozone Delegation Token Renewer.
- */
- @InterfaceAudience.Private
- public static class Renewer extends TokenRenewer {
-
- //Ensure that OzoneConfiguration files are loaded before trying to use
- // the renewer.
- static {
- OzoneConfiguration.activate();
- }
-
- public Text getKind() {
- return OzoneTokenIdentifier.KIND_NAME;
- }
-
- @Override
- public boolean handleKind(Text kind) {
- return getKind().equals(kind);
- }
-
- @Override
- public boolean isManaged(Token<?> token) throws IOException {
- return true;
- }
-
- @Override
- public long renew(Token<?> token, Configuration conf)
- throws IOException, InterruptedException {
- Token<OzoneTokenIdentifier> ozoneDt =
- (Token<OzoneTokenIdentifier>) token;
- OzoneClient ozoneClient =
- OzoneClientFactory.getOzoneClient(OzoneConfiguration.of(conf),
- ozoneDt);
- return ozoneClient.getObjectStore().renewDelegationToken(ozoneDt);
- }
-
- @Override
- public void cancel(Token<?> token, Configuration conf)
- throws IOException, InterruptedException {
- Token<OzoneTokenIdentifier> ozoneDt =
- (Token<OzoneTokenIdentifier>) token;
- OzoneClient ozoneClient =
- OzoneClientFactory.getOzoneClient(OzoneConfiguration.of(conf),
- ozoneDt);
- ozoneClient.getObjectStore().cancelDelegationToken(ozoneDt);
- }
- }
-
/**
* Adapter to convert OzoneKey to a safe and simple Key implementation.
*/
diff --git
a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneDelegationTokenRenewer.java
b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneDelegationTokenRenewer.java
new file mode 100644
index 0000000000..b64c0a2dbb
--- /dev/null
+++
b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneDelegationTokenRenewer.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.fs.ozone;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdds.annotation.InterfaceAudience;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.ozone.client.OzoneClient;
+import org.apache.hadoop.ozone.security.OzoneTokenIdentifier;
+import org.apache.hadoop.security.token.Token;
+import org.apache.hadoop.security.token.TokenRenewer;
+
+import java.io.IOException;
+
+import static org.apache.hadoop.ozone.client.OzoneClientFactory.getOzoneClient;
+
+/**
+ * Ozone Delegation Token Renewer.
+ */
[email protected]
+public class OzoneDelegationTokenRenewer extends TokenRenewer {
+
+ //Ensure that OzoneConfiguration files are loaded before trying to use
+ // the renewer.
+ static {
+ OzoneConfiguration.activate();
+ }
+
+ public Text getKind() {
+ return OzoneTokenIdentifier.KIND_NAME;
+ }
+
+ @Override
+ public boolean handleKind(Text kind) {
+ return getKind().equals(kind);
+ }
+
+ @Override
+ public boolean isManaged(Token<?> token) {
+ return true;
+ }
+
+ @Override
+ public long renew(Token<?> token, Configuration conf) throws IOException {
+ Token<OzoneTokenIdentifier> ozoneDt =
+ (Token<OzoneTokenIdentifier>) token;
+ OzoneConfiguration ozoneConf = OzoneConfiguration.of(conf);
+ try (OzoneClient ozoneClient = getOzoneClient(ozoneConf, ozoneDt)) {
+ return ozoneClient.getObjectStore().renewDelegationToken(ozoneDt);
+ }
+ }
+
+ @Override
+ public void cancel(Token<?> token, Configuration conf)
+ throws IOException, InterruptedException {
+ Token<OzoneTokenIdentifier> ozoneDt =
+ (Token<OzoneTokenIdentifier>) token;
+ OzoneConfiguration ozoneConf = OzoneConfiguration.of(conf);
+ try (OzoneClient ozoneClient = getOzoneClient(ozoneConf, ozoneDt)) {
+ ozoneClient.getObjectStore().cancelDelegationToken(ozoneDt);
+ }
+ }
+}
diff --git
a/hadoop-ozone/ozonefs-hadoop3/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer
b/hadoop-ozone/ozonefs-hadoop3/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer
index ac1b3cf677..a5de85b69c 100644
---
a/hadoop-ozone/ozonefs-hadoop3/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer
+++
b/hadoop-ozone/ozonefs-hadoop3/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer
@@ -16,5 +16,4 @@
# limitations under the License.
#
-org.apache.hadoop.fs.ozone.BasicOzoneClientAdapterImpl$Renewer
-org.apache.hadoop.fs.ozone.BasicRootedOzoneClientAdapterImpl$Renewer
+org.apache.hadoop.fs.ozone.OzoneDelegationTokenRenewer
diff --git
a/hadoop-ozone/ozonefs/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer
b/hadoop-ozone/ozonefs/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer
index ac1b3cf677..a5de85b69c 100644
---
a/hadoop-ozone/ozonefs/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer
+++
b/hadoop-ozone/ozonefs/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer
@@ -16,5 +16,4 @@
# limitations under the License.
#
-org.apache.hadoop.fs.ozone.BasicOzoneClientAdapterImpl$Renewer
-org.apache.hadoop.fs.ozone.BasicRootedOzoneClientAdapterImpl$Renewer
+org.apache.hadoop.fs.ozone.OzoneDelegationTokenRenewer
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
