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 ww...@apache.org on 2017/07/06 09:35:41 UTC
hadoop git commit: HDFS-12080. Ozone: Fix UT failure in
TestOzoneConfigurationFields. Contributed by Mukul Kumar Singh.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7240 952009217 -> 8efb1fafd
HDFS-12080. Ozone: Fix UT failure in TestOzoneConfigurationFields. Contributed by Mukul Kumar Singh.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8efb1faf
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8efb1faf
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8efb1faf
Branch: refs/heads/HDFS-7240
Commit: 8efb1fafd598ad4275883906bbeccc9653ffebab
Parents: 9520092
Author: Weiwei Yang <ww...@apache.org>
Authored: Thu Jul 6 17:35:20 2017 +0800
Committer: Weiwei Yang <ww...@apache.org>
Committed: Thu Jul 6 17:35:20 2017 +0800
----------------------------------------------------------------------
.../src/main/resources/ozone-default.xml | 63 +++++++++++++++-----
1 file changed, 48 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8efb1faf/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml
index 766da66..772c69f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml
@@ -168,21 +168,6 @@
</property>
<property>
- <name>ozone.scm.internal.bind.host</name>
- <value>0.0.0.0</value>
- <description>
- The hostname or IP address used by the SCM DataNode handler service
- to bind. This setting is used by the SCM only and never used by
- clients or Data Nodes.
-
- The setting can be useful in multi-homed setups to restrict the
- availability of the SCM to a specific interface.
-
- The default is appropriate for most clusters.
- </description>
- </property>
-
- <property>
<name>ozone.scm.block.client.address</name>
<value></value>
<description>
@@ -586,6 +571,38 @@
<description>
The address that cblock will be bind to, should be a host:port format,
this setting is required for cblock server to start.
+ This address is used for cblock management operations like create,
+ delete, info and list volumes
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.cblock.service.rpc-bind-host</name>
+ <value>0.0.0.0</value>
+ <description>
+ The actual address the cblock service rpc server will bind to. If this
+ optional address is set, it overrides only the hostname portion of
+ dfs.cblock.servicerpc-address.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.cblock.jscsi-address</name>
+ <value></value>
+ <description>
+ The address that cblock will be bind to, should be a host:port format,
+ this setting is required for cblock server to start.
+ This address to be used by jscsi to mount volume.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.cblock.jscsi.rpc-bind-host</name>
+ <value>0.0.0.0</value>
+ <description>
+ The actual address the cblock jscsi rpc server will bind to. If this
+ optional address is set, it overrides only the hostname portion of
+ dfs.cblock.jscsi-address.
</description>
</property>
@@ -737,4 +754,20 @@
The maximum number of retries when writing a block to container.
</description>
</property>
+
+ <property>
+ <name>dfs.cblock.scm.ipaddress</name>
+ <value>127.0.0.1</value>
+ <description>
+ IP address used by cblock to connect to SCM.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.cblock.scm.port</name>
+ <value>9860</value>
+ <description>
+ Port used by cblock to connect to SCM.
+ </description>
+ </property>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org