You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by el...@apache.org on 2020/03/30 13:03:11 UTC
[hadoop-ozone] branch master updated (099ab62 -> a17551e)
This is an automated email from the ASF dual-hosted git repository.
elek pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git.
from 099ab62 HDDS-3273. getConf does not return all OM addresses. (#727)
new d7dcb8b Revert "HDDS-3064. Get Key is hung when READ delay is injected in chunk file path. (#673)"
new f5fa408 Revert "HDDS-3234. Fix retry interval default in Ozone client. (#698)"
new 39e116a HDDS-3294. Disable intermittent TestContainerStateMachineFailureOnRead
new ad37f03 HDDS-2011. Ignore TestRandomKeyGenerator.bigFileThan2GB
new b719173 HDDS-3290. Ignore TestRandomKeyGenerator
new d2082b8 HDDS-3297. Ignore TestOzoneClientKeyGenerator.
new a66aae8 HDDS-3290. Disable all the freon integration tests
new f63c5af HDDS-3298. Ignore TestFailureHandlingByClient.testDatanodeExclusionWithMajorityCommit
new a17551e HDDS-3265. Ignore TestRatisPipelineLeader.java
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/pr.yml | 15 --------------
.../apache/hadoop/hdds/scm/XceiverClientGrpc.java | 9 +--------
.../org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 2 +-
.../org/apache/hadoop/ozone/OzoneConfigKeys.java | 3 ---
.../common/src/main/resources/ozone-default.xml | 11 +----------
.../hadoop/hdds/scm/TestRatisPipelineLeader.java | 6 ++++--
.../TestContainerStateMachineFailureOnRead.java | 16 ++++++++-------
.../client/rpc/TestFailureHandlingByClient.java | 23 +++++++++++-----------
.../ozone/freon/TestOzoneClientKeyGenerator.java | 13 +++++++-----
.../hadoop/ozone/freon/TestRandomKeyGenerator.java | 8 ++++++--
10 files changed, 42 insertions(+), 64 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org
[hadoop-ozone] 08/09: HDDS-3298. Ignore
TestFailureHandlingByClient.testDatanodeExclusionWithMajorityCommit
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit f63c5afae6eb81fed25e6c9a000829c90ab83c9b
Author: Elek Márton <el...@apache.org>
AuthorDate: Sun Mar 29 20:36:52 2020 +0200
HDDS-3298. Ignore TestFailureHandlingByClient.testDatanodeExclusionWithMajorityCommit
---
.../client/rpc/TestFailureHandlingByClient.java | 23 +++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
index cf5ae6d..33285d4 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
@@ -17,6 +17,13 @@
package org.apache.hadoop.ozone.client.rpc;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
import org.apache.hadoop.hdds.HddsUtils;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.client.ReplicationType;
@@ -46,21 +53,14 @@ import org.apache.hadoop.ozone.container.TestHelper;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
+
+import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
import org.junit.After;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.hadoop.fs.CommonConfigurationKeysPublic
- .NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY;
-import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
-
/**
* Tests Exception handling by Ozone Client.
*/
@@ -296,6 +296,7 @@ public class TestFailureHandlingByClient {
}
@Test
+ @Ignore("HDDS-3298")
public void testDatanodeExclusionWithMajorityCommit() throws Exception {
startCluster();
String keyName = UUID.randomUUID().toString();
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org
[hadoop-ozone] 07/09: HDDS-3290. Disable all the freon integration
tests
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit a66aae8613c20171fa78cfa434282bcaf28691ed
Author: Elek Márton <el...@apache.org>
AuthorDate: Sun Mar 29 19:33:25 2020 +0200
HDDS-3290. Disable all the freon integration tests
---
.github/workflows/pr.yml | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index e800e77..119dd0c 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -106,21 +106,6 @@ jobs:
with:
name: acceptance
path: target/acceptance
- it-freon:
- name: it-freon
- runs-on: ubuntu-18.04
- needs:
- - build
- steps:
- - uses: actions/checkout@master
- - uses: ./.github/buildenv
- with:
- args: ./hadoop-ozone/dev-support/checks/integration.sh -Pfreon
- - uses: actions/upload-artifact@master
- if: always()
- with:
- name: it-freon
- path: target/integration
it-filesystem:
name: it-filesystem
runs-on: ubuntu-18.04
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org
[hadoop-ozone] 05/09: HDDS-3290. Ignore TestRandomKeyGenerator
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit b71917389039f8f8fe37fcb6ae7d0faf034550c0
Author: Elek Márton <el...@apache.org>
AuthorDate: Sun Mar 29 15:02:58 2020 +0200
HDDS-3290. Ignore TestRandomKeyGenerator
---
.../test/java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java
index 4649970..b39139d 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java
@@ -36,6 +36,7 @@ import org.junit.Test;
/**
* Tests Freon, with MiniOzoneCluster.
*/
+@Ignore("HDDS-3290")
public class TestRandomKeyGenerator {
private static MiniOzoneCluster cluster;
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org
[hadoop-ozone] 04/09: HDDS-2011. Ignore
TestRandomKeyGenerator.bigFileThan2GB
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit ad37f0310b51a6e2cfec7bba1e6cce250782b958
Author: Elek Márton <el...@apache.org>
AuthorDate: Sat Mar 28 10:29:11 2020 +0100
HDDS-2011. Ignore TestRandomKeyGenerator.bigFileThan2GB
---
.../java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java
index ef6f0f4..4649970 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestRandomKeyGenerator.java
@@ -18,19 +18,21 @@
package org.apache.hadoop.ozone.freon;
+import java.util.concurrent.TimeUnit;
+
import org.apache.hadoop.hdds.client.ReplicationFactor;
import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.hdds.conf.DatanodeRatisServerConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.ratis.RatisHelper;
import org.apache.hadoop.ozone.MiniOzoneCluster;
+
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
-import java.util.concurrent.TimeUnit;
-
/**
* Tests Freon, with MiniOzoneCluster.
*/
@@ -129,6 +131,7 @@ public class TestRandomKeyGenerator {
}
@Test
+ @Ignore("HDDS-2011")
public void bigFileThan2GB() throws Exception {
RandomKeyGenerator randomKeyGenerator =
new RandomKeyGenerator((OzoneConfiguration) cluster.getConf());
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org
[hadoop-ozone] 09/09: HDDS-3265. Ignore TestRatisPipelineLeader.java
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit a17551e8bfa7db4adaaf2b606be6f236c608e3a6
Author: Elek Márton <el...@apache.org>
AuthorDate: Mon Mar 30 12:04:52 2020 +0200
HDDS-3265. Ignore TestRatisPipelineLeader.java
---
.../java/org/apache/hadoop/hdds/scm/TestRatisPipelineLeader.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestRatisPipelineLeader.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestRatisPipelineLeader.java
index 16216e8..ecc1655 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestRatisPipelineLeader.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestRatisPipelineLeader.java
@@ -17,8 +17,6 @@
*/
package org.apache.hadoop.hdds.scm;
-import static org.apache.hadoop.ozone.OzoneConfigKeys.DFS_RATIS_LEADER_ELECTION_MINIMUM_TIMEOUT_DURATION_KEY;
-
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
@@ -32,6 +30,8 @@ import org.apache.hadoop.ozone.HddsDatanodeService;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.container.common.transport.server.ratis.XceiverServerRatis;
import org.apache.hadoop.test.GenericTestUtils;
+
+import static org.apache.hadoop.ozone.OzoneConfigKeys.DFS_RATIS_LEADER_ELECTION_MINIMUM_TIMEOUT_DURATION_KEY;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.ratis.grpc.client.GrpcClientProtocolService;
@@ -42,12 +42,14 @@ import org.apache.ratis.protocol.RaftGroupId;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.LoggerFactory;
/**
* Test pipeline leader information is correctly used.
*/
+@Ignore("HDDS-3265")
public class TestRatisPipelineLeader {
private static MiniOzoneCluster cluster;
private static OzoneConfiguration conf;
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org
[hadoop-ozone] 03/09: HDDS-3294. Disable intermittent
TestContainerStateMachineFailureOnRead
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 39e116a0654fccd382d8e7473f727ad87ed04102
Author: Elek Márton <el...@apache.org>
AuthorDate: Sat Mar 28 08:51:41 2020 +0100
HDDS-3294. Disable intermittent TestContainerStateMachineFailureOnRead
---
.../rpc/TestContainerStateMachineFailureOnRead.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailureOnRead.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailureOnRead.java
index 5bc3a2d..3863801 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailureOnRead.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailureOnRead.java
@@ -17,13 +17,6 @@
*/
package org.apache.hadoop.ozone.client.rpc;
-import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_COMMAND_STATUS_REPORT_INTERVAL;
-import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_REPORT_INTERVAL;
-import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_PIPELINE_REPORT_INTERVAL;
-import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_SCM_WATCHER_TIMEOUT;
-import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_PIPELINE_DESTROY_TIMEOUT;
-import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
-
import java.io.File;
import java.util.HashMap;
import java.util.List;
@@ -52,17 +45,26 @@ import org.apache.hadoop.ozone.container.ContainerTestHelper;
import org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainer;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
import org.apache.hadoop.test.GenericTestUtils;
+
+import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_COMMAND_STATUS_REPORT_INTERVAL;
+import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_REPORT_INTERVAL;
+import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_PIPELINE_REPORT_INTERVAL;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_SCM_WATCHER_TIMEOUT;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_PIPELINE_DESTROY_TIMEOUT;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.ratis.grpc.server.GrpcLogAppender;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
/**
* Test to verify pipeline is closed on readStateMachine failure.
*/
+@Ignore("see HDDS-3294")
public class TestContainerStateMachineFailureOnRead {
private MiniOzoneCluster cluster;
private ObjectStore objectStore;
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org
[hadoop-ozone] 01/09: Revert "HDDS-3064. Get Key is hung when READ
delay is injected in chunk file path. (#673)"
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit d7dcb8ba5073b0bed16a3e191d779986df8afd8d
Author: Elek Márton <el...@apache.org>
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 65db7df..87b43f0 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: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org
[hadoop-ozone] 02/09: Revert "HDDS-3234. Fix retry interval default
in Ozone client. (#698)"
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit f5fa408b5579487d61062cbbc2955efae1da0c50
Author: Elek Márton <el...@apache.org>
AuthorDate: Fri Mar 27 10:16:29 2020 +0100
Revert "HDDS-3234. Fix retry interval default in Ozone client. (#698)"
This reverts commit c64d86f57e38ab19be58b3bc51f8bd1724b65746.
---
.../common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 2 +-
hadoop-hdds/common/src/main/resources/ozone-default.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
index c397bc5..4eda6f8 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
@@ -117,7 +117,7 @@ public final class ScmConfigKeys {
"dfs.ratis.client.request.retry.interval";
public static final TimeDuration
DFS_RATIS_CLIENT_REQUEST_RETRY_INTERVAL_DEFAULT =
- TimeDuration.valueOf(15000, TimeUnit.MILLISECONDS);
+ TimeDuration.valueOf(1000, TimeUnit.MILLISECONDS);
public static final String DFS_RATIS_SERVER_RETRY_CACHE_TIMEOUT_DURATION_KEY =
"dfs.ratis.server.retry-cache.timeout.duration";
public static final TimeDuration
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index 87b43f0..c60af47 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -252,7 +252,7 @@
</property>
<property>
<name>dfs.ratis.client.request.retry.interval</name>
- <value>15000ms</value>
+ <value>1000ms</value>
<tag>OZONE, RATIS, MANAGEMENT</tag>
<description>Interval between successive retries for a ratis client request.
</description>
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org
[hadoop-ozone] 06/09: HDDS-3297. Ignore TestOzoneClientKeyGenerator.
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit d2082b86b9c4e26b60f00e5a14672c6afd9f743d
Author: Elek Márton <el...@apache.org>
AuthorDate: Sun Mar 29 15:09:44 2020 +0200
HDDS-3297. Ignore TestOzoneClientKeyGenerator.
---
.../hadoop/ozone/freon/TestOzoneClientKeyGenerator.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java
index bef3330..f2e23f5 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOzoneClientKeyGenerator.java
@@ -16,23 +16,26 @@
*/
package org.apache.hadoop.ozone.freon;
-import org.apache.commons.io.FileUtils;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.test.GenericTestUtils;
+
+import org.apache.commons.io.FileUtils;
import org.apache.ratis.server.impl.RaftServerImpl;
import org.apache.ratis.server.raftlog.RaftLog;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.event.Level;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
/**
* Test for OzoneClientKeyGenerator.
*/
+@Ignore("HDDS-3297")
public class TestOzoneClientKeyGenerator {
private String path;
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org