anmolnar commented on code in PR #6887: URL: https://github.com/apache/hbase/pull/6887#discussion_r2069418121
########## hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestActiveClusterSuffix.java: ########## @@ -0,0 +1,133 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.regionserver; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import org.apache.hadoop.fs.FSDataOutputStream; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.HBaseClassTestRule; +import org.apache.hadoop.hbase.HBaseTestingUtil; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.master.MasterFileSystem; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.util.CommonFSUtils; +import org.apache.hadoop.hbase.util.JVMClusterUtil; +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +/** + * Test Active Cluster Suffix file. + */ +@Category({ RegionServerTests.class, MediumTests.class }) +public class TestActiveClusterSuffix { + + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestActiveClusterSuffix.class); + + private final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil(); + + private JVMClusterUtil.RegionServerThread rst; + + @Before + public void setUp() throws Exception { + TEST_UTIL.getConfiguration().setBoolean(ShutdownHook.RUN_SHUTDOWN_HOOK, false); + } + + @After + public void tearDown() throws Exception { + TEST_UTIL.shutdownMiniCluster(); + if (rst != null && rst.getRegionServer() != null) { + rst.getRegionServer().stop("end of test"); + rst.join(); + } + } + + @Test + public void testActiveClusterSuffixCreated() throws Exception { + TEST_UTIL.startMiniZKCluster(); + TEST_UTIL.startMiniDFSCluster(1); + TEST_UTIL.createRootDir(); + TEST_UTIL.startMiniHBaseCluster(); + Path rootDir = CommonFSUtils.getRootDir(TEST_UTIL.getConfiguration()); + FileSystem fs = rootDir.getFileSystem(TEST_UTIL.getConfiguration()); + Path filePath = new Path(rootDir, HConstants.ACTIVE_CLUSTER_SUFFIX_FILE_NAME); + + assertTrue(filePath + " should exists ", fs.exists(filePath)); + assertTrue(filePath + " should not be empty ", fs.getFileStatus(filePath).getLen() > 0); + } + + @Test + public void testSuffixFileOnRestart() throws Exception { + TEST_UTIL.startMiniZKCluster(); + TEST_UTIL.startMiniDFSCluster(1); + TEST_UTIL.createRootDir(); Review Comment: Same here. ########## hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestActiveClusterSuffix.java: ########## @@ -0,0 +1,133 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.regionserver; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import org.apache.hadoop.fs.FSDataOutputStream; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.HBaseClassTestRule; +import org.apache.hadoop.hbase.HBaseTestingUtil; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.master.MasterFileSystem; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.util.CommonFSUtils; +import org.apache.hadoop.hbase.util.JVMClusterUtil; +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +/** + * Test Active Cluster Suffix file. + */ +@Category({ RegionServerTests.class, MediumTests.class }) +public class TestActiveClusterSuffix { + + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestActiveClusterSuffix.class); + + private final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil(); + + private JVMClusterUtil.RegionServerThread rst; + + @Before + public void setUp() throws Exception { + TEST_UTIL.getConfiguration().setBoolean(ShutdownHook.RUN_SHUTDOWN_HOOK, false); + } + + @After + public void tearDown() throws Exception { + TEST_UTIL.shutdownMiniCluster(); + if (rst != null && rst.getRegionServer() != null) { + rst.getRegionServer().stop("end of test"); + rst.join(); + } + } + + @Test + public void testActiveClusterSuffixCreated() throws Exception { + TEST_UTIL.startMiniZKCluster(); + TEST_UTIL.startMiniDFSCluster(1); + TEST_UTIL.createRootDir(); Review Comment: I don't think this is needed, since the next method (start mini cluster) will call it anyways. ########## hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestActiveClusterSuffix.java: ########## @@ -0,0 +1,133 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.regionserver; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import org.apache.hadoop.fs.FSDataOutputStream; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.HBaseClassTestRule; +import org.apache.hadoop.hbase.HBaseTestingUtil; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.master.MasterFileSystem; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.util.CommonFSUtils; +import org.apache.hadoop.hbase.util.JVMClusterUtil; +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +/** + * Test Active Cluster Suffix file. + */ +@Category({ RegionServerTests.class, MediumTests.class }) +public class TestActiveClusterSuffix { + + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestActiveClusterSuffix.class); + + private final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil(); + + private JVMClusterUtil.RegionServerThread rst; + + @Before + public void setUp() throws Exception { + TEST_UTIL.getConfiguration().setBoolean(ShutdownHook.RUN_SHUTDOWN_HOOK, false); + } + + @After + public void tearDown() throws Exception { + TEST_UTIL.shutdownMiniCluster(); + if (rst != null && rst.getRegionServer() != null) { + rst.getRegionServer().stop("end of test"); + rst.join(); + } + } + + @Test + public void testActiveClusterSuffixCreated() throws Exception { + TEST_UTIL.startMiniZKCluster(); + TEST_UTIL.startMiniDFSCluster(1); + TEST_UTIL.createRootDir(); + TEST_UTIL.startMiniHBaseCluster(); + Path rootDir = CommonFSUtils.getRootDir(TEST_UTIL.getConfiguration()); + FileSystem fs = rootDir.getFileSystem(TEST_UTIL.getConfiguration()); + Path filePath = new Path(rootDir, HConstants.ACTIVE_CLUSTER_SUFFIX_FILE_NAME); + + assertTrue(filePath + " should exists ", fs.exists(filePath)); + assertTrue(filePath + " should not be empty ", fs.getFileStatus(filePath).getLen() > 0); + } + + @Test + public void testSuffixFileOnRestart() throws Exception { Review Comment: This test could be the 2nd of two positive test case mentioned previously. ########## hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestActiveClusterSuffix.java: ########## @@ -0,0 +1,133 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.regionserver; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import org.apache.hadoop.fs.FSDataOutputStream; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.HBaseClassTestRule; +import org.apache.hadoop.hbase.HBaseTestingUtil; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.master.MasterFileSystem; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.util.CommonFSUtils; +import org.apache.hadoop.hbase.util.JVMClusterUtil; +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +/** + * Test Active Cluster Suffix file. + */ +@Category({ RegionServerTests.class, MediumTests.class }) +public class TestActiveClusterSuffix { + + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestActiveClusterSuffix.class); + + private final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil(); + + private JVMClusterUtil.RegionServerThread rst; + + @Before + public void setUp() throws Exception { + TEST_UTIL.getConfiguration().setBoolean(ShutdownHook.RUN_SHUTDOWN_HOOK, false); + } + + @After + public void tearDown() throws Exception { + TEST_UTIL.shutdownMiniCluster(); + if (rst != null && rst.getRegionServer() != null) { + rst.getRegionServer().stop("end of test"); + rst.join(); + } + } + + @Test + public void testActiveClusterSuffixCreated() throws Exception { + TEST_UTIL.startMiniZKCluster(); + TEST_UTIL.startMiniDFSCluster(1); + TEST_UTIL.createRootDir(); + TEST_UTIL.startMiniHBaseCluster(); + Path rootDir = CommonFSUtils.getRootDir(TEST_UTIL.getConfiguration()); + FileSystem fs = rootDir.getFileSystem(TEST_UTIL.getConfiguration()); + Path filePath = new Path(rootDir, HConstants.ACTIVE_CLUSTER_SUFFIX_FILE_NAME); + + assertTrue(filePath + " should exists ", fs.exists(filePath)); + assertTrue(filePath + " should not be empty ", fs.getFileStatus(filePath).getLen() > 0); Review Comment: This test should be the first positive case of the following two: - start with empty root dir: active cluster id file created and contents verified by the test, - start with existing root dir with existing active cluster id file, contents suitable for the cluster and starts up correctly. ########## hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestActiveClusterSuffix.java: ########## @@ -0,0 +1,133 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.regionserver; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import org.apache.hadoop.fs.FSDataOutputStream; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.HBaseClassTestRule; +import org.apache.hadoop.hbase.HBaseTestingUtil; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.master.MasterFileSystem; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.util.CommonFSUtils; +import org.apache.hadoop.hbase.util.JVMClusterUtil; +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +/** + * Test Active Cluster Suffix file. + */ +@Category({ RegionServerTests.class, MediumTests.class }) +public class TestActiveClusterSuffix { + + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestActiveClusterSuffix.class); + + private final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil(); + + private JVMClusterUtil.RegionServerThread rst; + + @Before + public void setUp() throws Exception { + TEST_UTIL.getConfiguration().setBoolean(ShutdownHook.RUN_SHUTDOWN_HOOK, false); + } + + @After + public void tearDown() throws Exception { + TEST_UTIL.shutdownMiniCluster(); + if (rst != null && rst.getRegionServer() != null) { + rst.getRegionServer().stop("end of test"); + rst.join(); + } + } + + @Test + public void testActiveClusterSuffixCreated() throws Exception { + TEST_UTIL.startMiniZKCluster(); + TEST_UTIL.startMiniDFSCluster(1); + TEST_UTIL.createRootDir(); + TEST_UTIL.startMiniHBaseCluster(); + Path rootDir = CommonFSUtils.getRootDir(TEST_UTIL.getConfiguration()); + FileSystem fs = rootDir.getFileSystem(TEST_UTIL.getConfiguration()); + Path filePath = new Path(rootDir, HConstants.ACTIVE_CLUSTER_SUFFIX_FILE_NAME); + + assertTrue(filePath + " should exists ", fs.exists(filePath)); + assertTrue(filePath + " should not be empty ", fs.getFileStatus(filePath).getLen() > 0); + } + + @Test + public void testSuffixFileOnRestart() throws Exception { + TEST_UTIL.startMiniZKCluster(); + TEST_UTIL.startMiniDFSCluster(1); + TEST_UTIL.createRootDir(); + TEST_UTIL.startMiniHBaseCluster(); + Path rootDir = CommonFSUtils.getRootDir(TEST_UTIL.getConfiguration()); + FileSystem fs = rootDir.getFileSystem(TEST_UTIL.getConfiguration()); + Path filePath = new Path(rootDir, HConstants.ACTIVE_CLUSTER_SUFFIX_FILE_NAME); + assertTrue(filePath + " should exists ", fs.exists(filePath)); + + MasterFileSystem mfs = TEST_UTIL.getHBaseCluster().getMaster().getMasterFileSystem(); + // Compute string using currently set suffix and the cluster id + String cluster_suffix1 = + new String(mfs.getSuffixFileDataToCompare(), StandardCharsets.US_ASCII); + // Compute string member variable + String cluster_suffix2 = mfs.getActiveClusterSuffix().toString(); + assertEquals(cluster_suffix1, cluster_suffix2); + } + + @Test + public void testVerifyErrorWhenSuffixNotMatched() throws Exception { Review Comment: This one is the only negative case and fine as it is: - start with existing root with active cluster id file for a different cluster. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@hbase.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
