You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by di...@apache.org on 2020/06/21 03:03:07 UTC
[hadoop-ozone] branch master updated: HDDS-3428. Fix failing test
cases in TestOzoneRpcClientWithRatis. (#1095)
This is an automated email from the ASF dual-hosted git repository.
dineshc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 1326aaa HDDS-3428. Fix failing test cases in TestOzoneRpcClientWithRatis. (#1095)
1326aaa is described below
commit 1326aaa45f0ec0125c7c778607ba0ad6b76d00da
Author: prashantpogde <pr...@gmail.com>
AuthorDate: Sat Jun 20 20:03:01 2020 -0700
HDDS-3428. Fix failing test cases in TestOzoneRpcClientWithRatis. (#1095)
---
.../ozone/client/rpc/TestOzoneRpcClientAbstract.java | 15 +++++++++------
.../ozone/client/rpc/TestOzoneRpcClientWithRatis.java | 2 ++
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
index 562a3be..591f5c6 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
@@ -2727,11 +2727,14 @@ public abstract class TestOzoneRpcClientAbstract {
keyName);
RepeatedOmKeyInfo deletedKeys =
omMetadataManager.getDeletedTable().get(objectKey);
- Map<String, String> deletedKeyMetadata =
- deletedKeys.getOmKeyInfoList().get(0).getMetadata();
- Assert.assertFalse(deletedKeyMetadata.containsKey(OzoneConsts.GDPR_FLAG));
- Assert.assertFalse(deletedKeyMetadata.containsKey(OzoneConsts.GDPR_SECRET));
- Assert.assertFalse(
- deletedKeyMetadata.containsKey(OzoneConsts.GDPR_ALGORITHM));
+ if (deletedKeys != null) {
+ Map<String, String> deletedKeyMetadata =
+ deletedKeys.getOmKeyInfoList().get(0).getMetadata();
+ Assert.assertFalse(deletedKeyMetadata.containsKey(OzoneConsts.GDPR_FLAG));
+ Assert.assertFalse(
+ deletedKeyMetadata.containsKey(OzoneConsts.GDPR_SECRET));
+ Assert.assertFalse(
+ deletedKeyMetadata.containsKey(OzoneConsts.GDPR_ALGORITHM));
+ }
}
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithRatis.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithRatis.java
index 73a7de5..10400b3 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithRatis.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithRatis.java
@@ -63,6 +63,8 @@ public class TestOzoneRpcClientWithRatis extends TestOzoneRpcClientAbstract {
public static void init() throws Exception {
conf = new OzoneConfiguration();
conf.setInt(ScmConfigKeys.OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT, 1);
+ conf.setBoolean(ScmConfigKeys.OZONE_SCM_PIPELINE_AUTO_CREATE_FACTOR_ONE,
+ false);
conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, true);
conf.setBoolean(OzoneConfigKeys.OZONE_NETWORK_TOPOLOGY_AWARE_READ_KEY,
true);
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org