diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
index 47eb79be2ab..a9719ecea82 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
@@ -74,10 +74,6 @@ public final class OzoneConfigKeys {
public static final String OZONE_ADMINISTRATORS =
"ozone.administrators";
- public static final String OZONE_CONTAINER_TASK_WAIT =
- "ozone.container.task.wait.seconds";
- public static final long OZONE_CONTAINER_TASK_WAIT_DEFAULT = 5;
-
public static final String OZONE_CLIENT_SOCKET_TIMEOUT_MS =
"ozone.client.socket.timeout.ms";
public static final int OZONE_CLIENT_SOCKET_TIMEOUT_MS_DEFAULT = 5000;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KSMConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KSMConfigKeys.java
index 21f7cadcdca..289cc634543 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KSMConfigKeys.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KSMConfigKeys.java
@@ -30,7 +30,7 @@ public final class KSMConfigKeys {
public static final String OZONE_KSM_HANDLER_COUNT_KEY =
- "ozone.scm.handler.count.key";
+ "ozone.ksm.handler.count.key";
public static final int OZONE_KSM_HANDLER_COUNT_DEFAULT = 200;
public static final String OZONE_KSM_ADDRESS_KEY =
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 5bfe76d0ed5..17cd329d760 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
@@ -44,6 +44,63 @@
+
+ ozone.localstorage.root
+ /tmp/ozone
+
+
+
+
+
+ ozone.trace.enabled
+ false
+
+
+
+
+
+ ozone.container.metadata.dirs
+
+
+ Ozone metadata dir path.
+
+
+
+
+ ozone.key.cache.size
+ 1024
+
+
+
+
+
+ ozone.administrators
+
+
+ Ozone administrator users delimited by comma.
+ If not set, only the user who launches an ozone service will be the
+ admin user. This property must be set if ozone services are started by
+ different users. Otherwise the RPC layer will reject calls from
+ other servers which are started by users not in the list.
+
+
+
+
+ ozone.client.socket.timeout.ms
+ 5000
+
+ Socket timeout for Ozone client in milliseconds.
+
+
+
+
+ ozone.client.connection.timeout.ms
+ 5000
+
+ Connection timeout for Ozone client in milliseconds.
+
+
+
ozone.scm.client.address
@@ -56,6 +113,14 @@
+
+ ozone.scm.client.port
+ 9860
+
+ The port number of the Ozone SCM client service.
+
+
+
ozone.scm.datanode.address
@@ -72,6 +137,22 @@
+
+ ozone.scm.datanode.bind.host
+
+
+ The hostname or IP address used by the SCM service endpoint to bind.
+
+
+
+
+ ozone.scm.datanode.port
+ 9861
+
+ The port number of the Ozone SCM service.
+
+
+
ozone.scm.client.bind.host
0.0.0.0
@@ -101,6 +182,31 @@
+
+ ozone.scm.block.client.address
+
+
+ The address of the Ozone SCM block client service.
+
+
+
+
+ ozone.scm.block.client.bind.host
+ 0.0.0.0
+
+ The hostname or IP address used by the SCM block client
+ endpoint to bind.
+
+
+
+
+ ozone.scm.block.client.port
+ 9863
+
+ The port number of the Ozone SCM block client service.
+
+
+
ozone.scm.handler.count.key
20
@@ -122,4 +228,227 @@
size.
+
+
+ ozone.scm.heartbeat.interval.seconds
+ 30
+
+ The heartbeat interval from a datanode to SCM in seconds.
+
+
+
+
+ ozone.scm.stale.node.interval.ms
+ 90000
+
+ The interval in milliseconds for stale node flagging.
+
+
+
+
+ ozone.scm.dead.node.interval.ms
+ 600000
+
+ The interval in milliseconds for dead node flagging.
+
+
+
+
+ ozone.scm.max.hb.count.to.process
+ 5000
+
+ The maximum number of heartbeat to process per loop of the process
+ thread.
+
+
+
+
+ ozone.scm.heartbeat.thread.interval.ms
+ 3000
+
+ The interval in milliseconds that the heartbeat processor thread runs.
+
+
+
+
+ ozone.scm.heartbeat.rpc-timeout
+ 1000
+
+ Timeout value for the RPC from Datanode to SCM in milliseconds.
+
+
+
+
+ ozone.scm.heartbeat.log.warn.interval.count
+ 10
+
+ Defines how frequently we will log the missing of heartbeat to SCM.
+ For example in the default case, we will write a warning message for each 10
+ sequential heartbeats that we miss to SCM.
+
+
+
+
+ ozone.scm.names
+
+
+ The value of this property is a set of DNS | DNS:PORT | IP Address | IP:PORT.
+ Written as a comma separated string. e.g. scm1, scm2:8020, 7.7.7.7:7777.
+ This property allows datanodes to discover where SCM is, so that
+ datanodes can send heartbeat to SCM.
+
+
+
+
+ ozone.scm.datanode.id
+
+
+ The path that datanodes will created to store the datanode ID.
+ If this value is not set, datanodes will fail to come up.
+
+
+
+
+ ozone.scm.db.cache.size.mb
+ 128
+
+ The cache size for SCM level db store in MB.
+
+
+
+
+ ozone.scm.container.size.gb
+ 5
+
+ Storage container size in GB for block allocations.
+
+
+
+
+ ozone.scm.container.placement.impl
+ org.apache.hadoop.ozone.scm.container.placement.algorithms.SCMContainerPlacementRandom
+
+ Placement policy class for containers.
+ Defaults to SCMContainerPlacementRandom.class
+
+
+
+
+ ozone.scm.container.provision_batch_size
+ 1
+
+ Pre-provision specified number of containers to creare for
+ block creation.
+
+
+
+
+ dfs.container.ipc
+ 50011
+
+ The ipc port number of container.
+
+
+
+
+ dfs.container.ipc.random.port
+ false
+
+ Whether allocates a random free port for ozone container.
+
+
+
+
+ scm.container.client.idle.threshold
+ 10000
+
+
+
+
+
+ scm.container.client.max.size
+ 256
+
+
+
+
+
+ dfs.container.ratis.enabled
+ false
+
+
+
+
+
+ dfs.container.ratis.rpc.type
+ GRPC
+
+
+
+
+
+ dfs.container.ratis.server.id
+
+
+ The unique ID to identify a Ratis server.
+
+
+
+
+ dfs.container.ratis.datanode.storage.dir
+
+
+
+
+
+
+
+
+ ozone.ksm.handler.count.key
+ 200
+
+ The number of RPC handler threads for each KSM service endpoint.
+
+
+
+
+ ozone.ksm.address
+ 0.0.0.0
+
+ The address of the Ozone KSM service.
+
+
+
+
+ ozone.ksm.leveldb.cache.size.mb
+ 128
+
+ The size of KSM LevelDB cache in MB that used for caching files.
+
+
+
+
+ ozone.ksm.user.max.volume
+ 1024
+
+ The maximum number of volumes that each user can create.
+
+
+
+
+ ozone.ksm.user.rights
+ READ_WRITE
+
+ Default user permissions in Ozone KSM.
+
+
+
+
+ ozone.ksm.group.rights
+ READ_WRITE
+
+ Default group permissions in Ozone KSM.
+
+
+