big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-12554. Ozone: Fix TestDatanodeStateMachine#testDatanodeStateMachineWithInvalidConfiguration. Contributed by Ajay Kumar.

Browse Source
This commit is contained in:
Xiaoyu Yao 2017-09-27 15:44:04 -07:00 committed by Owen O'Malley
parent 9530153f33
commit 13fdb58490
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/utils/OzoneUtils.java
View File

@ -270,7 +270,7 @@ public static File getScmMetadirPath(Configuration conf) {
*/ */
public static String getDatanodeIDPath(Configuration conf) { public static String getDatanodeIDPath(Configuration conf) {
String dataNodeIDPath = conf.get(ScmConfigKeys.OZONE_SCM_DATANODE_ID); String dataNodeIDPath = conf.get(ScmConfigKeys.OZONE_SCM_DATANODE_ID);
if (Strings.isNullOrEmpty(dataNodeIDPath)) { if (dataNodeIDPath == null) {
String metaPath = conf.get(OzoneConfigKeys.OZONE_METADATA_DIRS); String metaPath = conf.get(OzoneConfigKeys.OZONE_METADATA_DIRS);
if (Strings.isNullOrEmpty(metaPath)) { if (Strings.isNullOrEmpty(metaPath)) {
// this means meta data is not found, in theory should not happen at // this means meta data is not found, in theory should not happen at

6
hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/OzoneGettingStarted.md.vm
View File

@ -139,9 +139,9 @@ place and not mingled with HDFS settings.
``` ```
* _*ozone.scm.datanode.id*_ Each datanode that speaks to SCM generates an ID * _*ozone.scm.datanode.id*_ Each datanode that speaks to SCM generates an ID
just like HDFS. This ID is stored is a location pointed by this setting. If just like HDFS. This is an optional setting. Please note:
this setting is not valid, datanodes will fail to come up. Please note: This path will be created by datanodes if it doesn't exist already. Here is an
This path that is will created by datanodes to store the datanode ID. Here is an example, example,
``` ```
<property> <property>