Repository: hadoop Updated Branches: refs/heads/HDFS-7240 3357ece1b -> 1512c4878
HDFS-12842. Ozone: SCM: During startup SCM should check if the cluster is INITIALIZED. Contributed by Nanda kumar. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1512c487 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1512c487 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1512c487 Branch: refs/heads/HDFS-7240 Commit: 1512c4878eb924115e5f22d80297f824df30d782 Parents: 3357ece Author: Nanda kumar <na...@apache.org> Authored: Thu Nov 23 21:52:34 2017 +0530 Committer: Nanda kumar <na...@apache.org> Committed: Thu Nov 23 21:52:34 2017 +0530 ---------------------------------------------------------------------- .../hadoop/ozone/scm/StorageContainerManager.java | 5 ++--- .../hadoop/ozone/TestStorageContainerManager.java | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1512c487/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/StorageContainerManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/StorageContainerManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/StorageContainerManager.java index fab5b10..b351c84 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/StorageContainerManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/StorageContainerManager.java @@ -238,9 +238,8 @@ public class StorageContainerManager extends ServiceRuntimeInfoImpl initContainerReportCache(conf); scmStorage = new SCMStorage(conf); - String clusterId = scmStorage.getClusterID(); - if (clusterId == null) { - throw new SCMException("clusterId not found", + if (scmStorage.getState() != StorageState.INITIALIZED) { + throw new SCMException("SCM not initialized.", ResultCodes.SCM_NOT_INITIALIZED); } scmNodeManager = new SCMNodeManager(conf, scmStorage.getClusterID(), this); http://git-wip-us.apache.org/repos/asf/hadoop/blob/1512c487/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java index 078e362..3588187 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java @@ -34,6 +34,7 @@ import org.apache.hadoop.ozone.scm.StorageContainerManager; import org.apache.hadoop.ozone.scm.StorageContainerManager.StartupOption; import org.apache.hadoop.ozone.scm.block.DeletedBlockLog; import org.apache.hadoop.ozone.scm.block.SCMBlockDeletingService; +import org.apache.hadoop.ozone.scm.exceptions.SCMException; import org.apache.hadoop.ozone.scm.node.NodeManager; import org.apache.hadoop.scm.XceiverClientManager; import org.apache.hadoop.scm.container.common.helpers.Pipeline; @@ -399,6 +400,19 @@ public class TestStorageContainerManager { } @Test + public void testSCMInitializationFailure() throws IOException { + OzoneConfiguration conf = new OzoneConfiguration(); + final String path = + GenericTestUtils.getTempPath(UUID.randomUUID().toString()); + Path scmPath = Paths.get(path, "scm-meta"); + conf.set(OzoneConfigKeys.OZONE_METADATA_DIRS, scmPath.toString()); + conf.setBoolean(OzoneConfigKeys.OZONE_ENABLED, true); + exception.expect(SCMException.class); + exception.expectMessage("SCM not initialized."); + StorageContainerManager.createSCM(null, conf); + } + + @Test public void testScmInfo() throws Exception { OzoneConfiguration conf = new OzoneConfiguration(); final String path = --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
