This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch master-stable in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 1d4227b5d0bb3fbe6aa6197efad8a72701a8302b Author: Elek Márton <[email protected]> AuthorDate: Fri Mar 27 10:15:44 2020 +0100 Revert "HDDS-3064. Get Key is hung when READ delay is injected in chunk file path. (#673)" This reverts commit c8b6fff5cc5d87491802f42e26878a5d510b302c. --- .../main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java | 9 +-------- .../src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java | 3 --- hadoop-hdds/common/src/main/resources/ozone-default.xml | 9 --------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java index 715d1a3..668fdaa 100644 --- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java +++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java @@ -189,14 +189,7 @@ public class XceiverClientGrpc extends XceiverClientSpi { ManagedChannel channel = channelBuilder.build(); XceiverClientProtocolServiceStub asyncStub = XceiverClientProtocolServiceGrpc.newStub(channel); - long duration = config.getTimeDuration(OzoneConfigKeys. - OZONE_CLIENT_READ_TIMEOUT, OzoneConfigKeys - .OZONE_CLIENT_READ_TIMEOUT_DEFAULT, TimeUnit.SECONDS); - - // set the grpc dealine here so as if the response is not received - // in the configured time, the rpc will fail with DEADLINE_EXCEEDED here - asyncStubs.put(dn.getUuid(), asyncStub.withDeadlineAfter(duration, - TimeUnit.SECONDS)); + asyncStubs.put(dn.getUuid(), asyncStub); channels.put(dn.getUuid(), channel); } diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java index c71e0d6..a83aa61 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java @@ -365,9 +365,6 @@ public final class OzoneConfigKeys { public static final String OZONE_CLIENT_VERIFY_CHECKSUM = "ozone.client.verify.checksum"; public static final boolean OZONE_CLIENT_VERIFY_CHECKSUM_DEFAULT = true; - public static final String OZONE_CLIENT_READ_TIMEOUT - = "ozone.client.read.timeout"; - public static final String OZONE_CLIENT_READ_TIMEOUT_DEFAULT = "30s"; public static final String OZONE_ACL_AUTHORIZER_CLASS = "ozone.acl.authorizer.class"; public static final String OZONE_ACL_AUTHORIZER_CLASS_DEFAULT = diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml index ca107c0..6ab4df5 100644 --- a/hadoop-hdds/common/src/main/resources/ozone-default.xml +++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml @@ -1533,15 +1533,6 @@ </property> <property> - <name>ozone.client.read.timeout</name> - <value>30s</value> - <tag>OZONE, CLIENT, MANAGEMENT</tag> - <description> - Timeout for ozone grpc client during read. - </description> - </property> - - <property> <name>ozone.om.lock.fair</name> <value>false</value> <description>If this is true, the Ozone Manager lock will be used in Fair --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
