You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bh...@apache.org on 2019/09/09 03:44:16 UTC
[hadoop] branch trunk updated: HDDS-2087. Remove the hard coded
config key in ChunkManager (#1409)
This is an automated email from the ASF dual-hosted git repository.
bharat pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3b9584d HDDS-2087. Remove the hard coded config key in ChunkManager (#1409)
3b9584d is described below
commit 3b9584d12b06a6b66abd737e768d9d684ff92c78
Author: Vivek Ratnavel Subramanian <vi...@gmail.com>
AuthorDate: Sun Sep 8 20:44:07 2019 -0700
HDDS-2087. Remove the hard coded config key in ChunkManager (#1409)
---
.../src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java | 4 ++++
hadoop-hdds/common/src/main/resources/ozone-default.xml | 2 +-
.../hadoop/ozone/container/keyvalue/impl/ChunkManagerFactory.java | 8 +++++---
.../org/apache/hadoop/ozone/TestOzoneConfigurationFields.java | 1 -
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
index c541f9b..548948e 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
@@ -241,6 +241,10 @@ public final class HddsConfigKeys {
"hdds.container.chunk.persistdata";
public static final boolean HDDS_CONTAINER_PERSISTDATA_DEFAULT = true;
+ public static final String HDDS_CONTAINER_SCRUB_ENABLED =
+ "hdds.container.scrub.enabled";
+ public static final boolean HDDS_CONTAINER_SCRUB_ENABLED_DEFAULT = false;
+
public static final String HDDS_DATANODE_HTTP_ENABLED_KEY =
"hdds.datanode.http.enabled";
public static final String HDDS_DATANODE_HTTP_BIND_HOST_KEY =
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index 22f1a3c..52e8369 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -1367,7 +1367,7 @@
</property>
<property>
- <name>hdds.containerscrub.enabled</name>
+ <name>hdds.container.scrub.enabled</name>
<value>false</value>
<tag>DATANODE</tag>
<description>
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerFactory.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerFactory.java
index 673e289..8549578 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerFactory.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerFactory.java
@@ -26,6 +26,8 @@ import org.slf4j.LoggerFactory;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_PERSISTDATA;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_PERSISTDATA_DEFAULT;
+import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_SCRUB_ENABLED;
+import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_SCRUB_ENABLED_DEFAULT;
/**
* Select an appropriate ChunkManager implementation as per config setting.
@@ -64,12 +66,12 @@ public final class ChunkManagerFactory {
if (!persist) {
boolean scrubber = config.getBoolean(
- "hdds.containerscrub.enabled",
- false);
+ HDDS_CONTAINER_SCRUB_ENABLED,
+ HDDS_CONTAINER_SCRUB_ENABLED_DEFAULT);
if (scrubber) {
// Data Scrubber needs to be disabled for non-persistent chunks.
LOG.warn("Failed to set " + HDDS_CONTAINER_PERSISTDATA + " to false."
- + " Please set hdds.containerscrub.enabled"
+ + " Please set " + HDDS_CONTAINER_SCRUB_ENABLED
+ " also to false to enable non-persistent containers.");
persist = true;
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
index cbd6a0b..fa0e73d 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
@@ -44,7 +44,6 @@ public class TestOzoneConfigurationFields extends TestConfigurationFieldsBase {
errorIfMissingXmlProps = true;
xmlPropsToSkipCompare.add("hadoop.tags.custom");
xmlPropsToSkipCompare.add("ozone.om.nodes.EXAMPLEOMSERVICEID");
- xmlPropsToSkipCompare.add("hdds.containerscrub.enabled");
addPropertiesNotInXml();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org