This is an automated email from the ASF dual-hosted git repository.
xyao pushed a commit to branch HDDS-4
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/HDDS-4 by this push:
new b0f2a33 HDDS-967. Fix failures in TestOzoneConfigurationFields.
Contributed by Ajay Kumar.
b0f2a33 is described below
commit b0f2a333681319cc25606d31c7a1f9a3676909ff
Author: Xiaoyu Yao <[email protected]>
AuthorDate: Thu Jan 10 13:49:17 2019 -0800
HDDS-967. Fix failures in TestOzoneConfigurationFields. Contributed by Ajay
Kumar.
---
.../common/src/main/resources/ozone-default.xml | 107 ++++++++++++++++++++-
.../hadoop/ozone/TestOzoneConfigurationFields.java | 3 +-
2 files changed, 108 insertions(+), 2 deletions(-)
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml
b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index ae2b7d2..e8a92a1 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -1116,7 +1116,8 @@
<property>
<name>ozone.tags.system</name>
-
<value>OZONE,MANAGEMENT,SECURITY,PERFORMANCE,DEBUG,CLIENT,SERVER,OM,SCM,CRITICAL,RATIS,CONTAINER,REQUIRED,REST,STORAGE,PIPELINE,STANDALONE,S3GATEWAY,TOKEN</value>
+ <value>OZONE,MANAGEMENT,SECURITY,PERFORMANCE,DEBUG,CLIENT,SERVER,OM,SCM,
+
CRITICAL,RATIS,CONTAINER,REQUIRED,REST,STORAGE,PIPELINE,STANDALONE,S3GATEWAY,TOKEN,TLS</value>
</property>
@@ -1484,6 +1485,110 @@
assumed.
</description>
</property>
+
+ <property>
+ <name>hdds.grpc.block.token.enabled</name>
+ <value>false</value>
+ <tag>OZONE, HDDS, SECURITY, TOKEN</tag>
+ <description>True if block tokens are enabled, else false.</description>
+ </property>
+ <property>
+ <name>hdds.x509.file.name</name>
+ <value>certificate.crt</value>
+ <tag>OZONE, HDDS, SECURITY</tag>
+ <description>Certificate file name.</description>
+ </property>
+ <property>
+ <name>hdds.grpc.tls.provider</name>
+ <value>OPENSSL</value>
+ <tag>OZONE, HDDS, SECURITY, TLS</tag>
+ <description>HDDS GRPC server TLS provider.</description>
+ </property>
+ <property>
+ <name>hdds.client.cert.chain.file.name</name>
+ <value>client.crt</value>
+ <tag>OZONE, HDDS, SECURITY</tag>
+ <description>Client certificate file name. It is an optional
+ field only required when mutual TLS (hdds.grpc.mutual.tls.required)
+ is set to true .</description>
+ </property>
+ <property>
+ <name>hdds.grpc.mutual.tls.required</name>
+ <value>false</value>
+ <tag>OZONE, HDDS, SECURITY, TLS</tag>
+ <description>If mutual tls check is enabled for GRPC.
+ Considered only if hdds.grpc.tls.enabled is set to true.</description>
+ </property>
+ <property>
+ <name>hdds.grpc.tls.enabled</name>
+ <value>false</value>
+ <tag>OZONE, HDDS, SECURITY, TLS</tag>
+ <description>If HDDS GRPC server TLS is enabled.</description>
+ </property>
+ <property>
+ <name>hdds.server.cert.chain.file.name</name>
+ <value>server.crt</value>
+ <tag>OZONE, HDDS, SECURITY</tag>
+ <description>Hdds server certificate file name.</description>
+ </property>
+ <property>
+ <name>hdds.trust.cert.collection.file.name</name>
+ <value>ca.crt</value>
+ <tag>OZONE, HDDS, SECURITY</tag>
+ <description>HDDS Certificate Authority trust store file
name.</description>
+ </property>
+ <property>
+ <name>hdds.x509.default.duration</name>
+ <value>P365D</value>
+ <tag>OZONE, HDDS, SECURITY</tag>
+ <description>Default duration for which x509 certificates issued by SCM are
+ valid. The formats accepted are based on the ISO-8601 duration format
+ PnDTnHnMn.nS</description>
+ </property>
+ <property>
+ <name>hdds.x509.dir.name</name>
+ <value>certs</value>
+ <tag>OZONE, HDDS, SECURITY</tag>
+ <description>X509 certificate directory name.</description>
+ </property>
+ <property>
+ <name>hdds.x509.max.duration</name>
+ <value>P1865D</value>
+ <tag>OZONE, HDDS, SECURITY</tag>
+ <description>Max time for which certificate issued by SCM CA are valid.
+ . The formats accepted are based on the ISO-8601 duration format
+ PnDTnHnMn.nS</description>
+ </property>
+ <property>
+ <name>hdds.x509.signature.algorithm</name>
+ <value>SHA256withRSA</value>
+ <tag>OZONE, HDDS, SECURITY</tag>
+ <description>X509 signature certificate.</description>
+ </property>
+ <property>
+ <name>ozone.scm.security.handler.count.key</name>
+ <value>2</value>
+ <tag>OZONE, HDDS, SECURITY</tag>
+ <description>Threads configured for
SCMSecurityProtocolServer.</description>
+ </property>
+ <property>
+ <name>ozone.scm.security.service.address</name>
+ <value>0.0.0.0:9961</value>
+ <tag>OZONE, HDDS, SECURITY</tag>
+ <description>Address of SCMSecurityProtocolServer.</description>
+ </property>
+ <property>
+ <name>ozone.scm.security.service.bind.host</name>
+ <value>0.0.0.0</value>
+ <tag>OZONE, HDDS, SECURITY</tag>
+ <description>SCM security server host.</description>
+ </property>
+ <property>
+ <name>ozone.scm.security.service.port</name>
+ <value>9961</value>
+ <tag>OZONE, HDDS, SECURITY</tag>
+ <description>SCM security server port.</description>
+ </property>
<property>
<name>hdds.metadata.dir</name>
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 7b59903..0839292 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
@@ -30,7 +30,7 @@ public class TestOzoneConfigurationFields extends
TestConfigurationFieldsBase {
@Override
public void initializeMemberVariables() {
- xmlFilename = new String("ozone-default.xml");
+ xmlFilename = "ozone-default.xml";
configurationClasses =
new Class[] {OzoneConfigKeys.class, ScmConfigKeys.class,
OMConfigKeys.class, HddsConfigKeys.class,
@@ -44,5 +44,6 @@ public class TestOzoneConfigurationFields extends
TestConfigurationFieldsBase {
private void addPropertiesNotInXml() {
configurationPropsToSkipCompare.add(HddsConfigKeys.HDDS_KEY_ALGORITHM);
configurationPropsToSkipCompare.add(HddsConfigKeys.HDDS_SECURITY_PROVIDER);
+
configurationPropsToSkipCompare.add(HddsConfigKeys.HDDS_GRPC_TLS_TEST_CERT);
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
