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 c2a934ceb0 HDDS-12470. Revert workaround added by HDDS-8715 to
preserve thread name. (#8004)
c2a934ceb0 is described below
commit c2a934ceb0cf2cc9e5485970ea76145d82d67360
Author: Nandakumar Vadivelu <[email protected]>
AuthorDate: Wed Mar 5 00:39:42 2025 +0530
HDDS-12470. Revert workaround added by HDDS-8715 to preserve thread name.
(#8004)
---
.../main/java/org/apache/hadoop/hdds/HddsUtils.java | 21 ---------------------
.../ozone/HddsDatanodeClientProtocolServer.java | 5 ++---
.../hdds/scm/server/StorageContainerManager.java | 5 ++---
.../org/apache/hadoop/ozone/om/OzoneManager.java | 5 ++---
4 files changed, 6 insertions(+), 30 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
index 60b2598a50..f35141d68a 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
@@ -44,7 +44,6 @@
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import java.io.File;
-import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.InetSocketAddress;
@@ -90,7 +89,6 @@
import org.apache.hadoop.security.token.SecretManager;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.apache.ratis.util.SizeInBytes;
-import org.apache.ratis.util.function.CheckedSupplier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -821,25 +819,6 @@ public static String threadNamePrefix(@Nullable Object id)
{
: "";
}
- /**
- * Execute some code and ensure thread name is not changed
- * (workaround for HADOOP-18433).
- */
- public static <T, E extends IOException> T preserveThreadName(
- CheckedSupplier<T, E> supplier) throws E {
- final Thread thread = Thread.currentThread();
- final String threadName = thread.getName();
-
- try {
- return supplier.get();
- } finally {
- if (!Objects.equals(threadName, thread.getName())) {
- LOG.info("Restoring thread name: {}", threadName);
- thread.setName(threadName);
- }
- }
- }
-
/**
* Transform a protobuf UUID to Java UUID.
*/
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeClientProtocolServer.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeClientProtocolServer.java
index 1613e0467b..623587dd33 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeClientProtocolServer.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeClientProtocolServer.java
@@ -22,7 +22,6 @@
import static
org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_HANDLER_COUNT_KEY;
import static
org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_READ_THREADPOOL_DEFAULT;
import static
org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_READ_THREADPOOL_KEY;
-import static org.apache.hadoop.hdds.HddsUtils.preserveThreadName;
import static
org.apache.hadoop.hdds.protocol.DatanodeDetails.Port.Name.CLIENT_RPC;
import com.google.protobuf.BlockingService;
@@ -114,8 +113,8 @@ private RPC.Server getRpcServer(OzoneConfiguration
configuration,
.ReconfigureProtocolService.newReflectiveBlockingService(
reconfigureServerProtocol);
- return preserveThreadName(() -> startRpcServer(configuration, rpcAddress,
- ReconfigureProtocolDatanodePB.class, reconfigureService, handlerCount,
readThreads));
+ return startRpcServer(configuration, rpcAddress,
+ ReconfigureProtocolDatanodePB.class, reconfigureService, handlerCount,
readThreads);
}
/**
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index 7719742d35..cd8da86f7e 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -17,7 +17,6 @@
package org.apache.hadoop.hdds.scm.server;
-import static org.apache.hadoop.hdds.HddsUtils.preserveThreadName;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_EVENT_REPORT_EXEC_WAIT_THRESHOLD_DEFAULT;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_EVENT_REPORT_QUEUE_WAIT_THRESHOLD_DEFAULT;
import static
org.apache.hadoop.hdds.scm.ScmUtils.checkIfCertSignRequestAllowed;
@@ -1093,7 +1092,7 @@ public static RPC.Server startRpcServer(
int readThreads)
throws IOException {
- RPC.Server rpcServer = preserveThreadName(() -> new RPC.Builder(conf)
+ RPC.Server rpcServer = new RPC.Builder(conf)
.setProtocol(protocol)
.setInstance(instance)
.setBindAddress(addr.getHostString())
@@ -1102,7 +1101,7 @@ public static RPC.Server startRpcServer(
.setNumReaders(readThreads)
.setVerbose(false)
.setSecretManager(null)
- .build());
+ .build();
HddsServerUtil.addPBProtocol(conf, protocol, instance, rpcServer);
return rpcServer;
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 35d5169da9..b758bb8e2f 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -22,7 +22,6 @@
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED;
import static
org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED_DEFAULT;
import static org.apache.hadoop.hdds.HddsUtils.getScmAddressForClients;
-import static org.apache.hadoop.hdds.HddsUtils.preserveThreadName;
import static org.apache.hadoop.hdds.server.ServerUtils.updateRPCListenAddress;
import static org.apache.hadoop.hdds.utils.HAUtils.getScmInfo;
import static org.apache.hadoop.hdds.utils.HddsServerUtil.getRemoteUser;
@@ -1312,7 +1311,7 @@ private RPC.Server startRpcServer(OzoneConfiguration conf,
final int readThreads = conf.getInt(OZONE_OM_READ_THREADPOOL_KEY,
OZONE_OM_READ_THREADPOOL_DEFAULT);
- RPC.Server rpcServer = preserveThreadName(() -> new RPC.Builder(conf)
+ RPC.Server rpcServer = new RPC.Builder(conf)
.setProtocol(OzoneManagerProtocolPB.class)
.setInstance(clientProtocolService)
.setBindAddress(addr.getHostString())
@@ -1321,7 +1320,7 @@ private RPC.Server startRpcServer(OzoneConfiguration conf,
.setNumReaders(readThreads)
.setVerbose(false)
.setSecretManager(delegationTokenMgr)
- .build());
+ .build();
HddsServerUtil.addPBProtocol(conf, OMInterServiceProtocolPB.class,
interOMProtocolService, rpcServer);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
