Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-11668. Ozone: misc improvements for SCM CLI. Contributed by Weiwei Yang.

This commit is contained in:
Xiaoyu Yao 2017-04-20 11:32:13 -07:00 committed by Owen O'Malley
parent 5984d40b86
commit 1a245accb5
4 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/StateContext.java
View File

@ -23,6 +23,8 @@ import org.apache.hadoop.ozone.container.common.states.datanode.RunningDatanodeS
import org.apache.hadoop.ozone.protocol.commands.SCMCommand;
import org.apache.hadoop.ozone.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMNodeReport;
import org.apache.hadoop.ozone.protocol.proto.StorageContainerDatanodeProtocolProtos.ReportState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.LinkedList;
import java.util.Queue;
@ -42,6 +44,8 @@ import static org.apache.hadoop.ozone.protocol.proto
* Current Context of State Machine.
*/
public class StateContext {
static final Logger LOG =
LoggerFactory.getLogger(StateContext.class);
private final Queue<SCMCommand> commandQueue;
private final Lock lock;
private final DatanodeStateMachine parent;
@ -187,6 +191,10 @@ public class StateContext {
task.execute(service);
DatanodeStateMachine.DatanodeStates newState = task.await(time, unit);
if (this.state != newState) {
if (LOG.isDebugEnabled()) {
LOG.debug("Task {} executed, state transited from {} to {}",
task.getClass().getSimpleName(), this.state, newState);
}
if (isExiting(newState)) {
task.onExit();
}

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/InitDatanodeState.java
View File

@ -105,6 +105,12 @@ public class InitDatanodeState implements DatanodeState,
*/
private void persistContainerDatanodeID() throws IOException {
String dataNodeIDPath = conf.get(ScmConfigKeys.OZONE_SCM_DATANODE_ID);
if (Strings.isNullOrEmpty(dataNodeIDPath)) {
LOG.error("A valid file path is needed for config setting {}",
ScmConfigKeys.OZONE_SCM_DATANODE_ID);
this.context.setState(DatanodeStateMachine.DatanodeStates.SHUTDOWN);
return;
}
File idPath = new File(dataNodeIDPath);
int containerPort = this.context.getContainerPort();
DatanodeID datanodeID = this.context.getParent().getDatanodeID();

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/cli/container/CreateContainerHandler.java
View File

@ -56,7 +56,7 @@ public class CreateContainerHandler extends OzoneCommandHandler {
}
}
String pipelineID = cmd.getOptionValue(PIPELINE_ID);
LOG.info("Create container :" + pipelineID + " " + getScmClient());
LOG.info("Create container : {}", pipelineID);
getScmClient().createContainer(pipelineID);
LOG.debug("Container creation returned");
}

45
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
View File

@ -16,6 +16,7 @@
*/
package org.apache.hadoop.ozone.container.common;
import com.google.common.collect.Maps;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.DFSTestUtil;
@ -46,6 +47,7 @@ import java.net.URL;
import java.nio.file.Paths;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
@ -294,21 +296,40 @@ public class TestDatanodeStateMachine {
}
/**
* Test state transition with a list of invalid SCM names,
* Test state transition with a list of invalid scm configurations,
* and verify the state transits to SHUTDOWN each time.
*/
@Test
public void testDatanodeStateMachineWithInvalidSCMNames()
public void testDatanodeStateMachineWithInvalidConfiguration()
throws Exception {
for (String name : new String[] {
"", // Empty
"x..y", // Invalid schema
"scm:xyz", // Invalid port
"scm:123456" // Port out of range
}) {
conf.setStrings(ScmConfigKeys.OZONE_SCM_NAMES, name);
LinkedList<Map.Entry<String, String>> confList =
new LinkedList<Map.Entry<String, String>>();
confList.add(Maps.immutableEntry(ScmConfigKeys.OZONE_SCM_NAMES, ""));
// Invalid ozone.scm.names
/** Empty **/
confList.add(Maps.immutableEntry(
ScmConfigKeys.OZONE_SCM_NAMES, ""));
/** Invalid schema **/
confList.add(Maps.immutableEntry(
ScmConfigKeys.OZONE_SCM_NAMES, "x..y"));
/** Invalid port **/
confList.add(Maps.immutableEntry(
ScmConfigKeys.OZONE_SCM_NAMES, "scm:xyz"));
/** Port out of range **/
confList.add(Maps.immutableEntry(
ScmConfigKeys.OZONE_SCM_NAMES, "scm:123456"));
// Invalid ozone.scm.datanode.id
/** Empty **/
confList.add(Maps.immutableEntry(
ScmConfigKeys.OZONE_SCM_DATANODE_ID, ""));
confList.forEach((entry) -> {
Configuration perTestConf = new Configuration(conf);
perTestConf.setStrings(entry.getKey(), entry.getValue());
try (DatanodeStateMachine stateMachine =
new DatanodeStateMachine(conf)) {
new DatanodeStateMachine(perTestConf)) {
DatanodeStateMachine.DatanodeStates currentState =
stateMachine.getContext().getState();
Assert.assertEquals(DatanodeStateMachine.DatanodeStates.INIT,
@ -320,7 +341,9 @@ public class TestDatanodeStateMachine {
task.await(2, TimeUnit.SECONDS);
Assert.assertEquals(DatanodeStateMachine.DatanodeStates.SHUTDOWN,
newState);
} catch (Exception e) {
Assert.fail("Unexpected exception found");
}
}
});
}
}