diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java index 624854e..620c2e3 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java @@ -116,7 +116,7 @@ public class IntegrationTestingUtility extends HBaseTestingUtility { * cluster or a local cluster. * @see IntegrationTestingUtility#setUseDistributedCluster(Configuration) */ - private boolean isDistributedCluster() { + public boolean isDistributedCluster() { Configuration conf = getConfiguration(); boolean isDistributedCluster = false; isDistributedCluster = Boolean.parseBoolean(System.getProperty(IS_DISTRIBUTED_CLUSTER, "false")); diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java index a8847f6..e99619d 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java @@ -148,9 +148,9 @@ import org.junit.experimental.categories.Category; @Category(IntegrationTests.class) public class IntegrationTestBigLinkedList extends Configured implements Tool { - private static final String TABLE_NAME_KEY = "IntegrationTestBigLinkedList.table"; + protected static String TABLE_NAME_KEY = "IntegrationTestBigLinkedList.table"; - private static final String DEFAULT_TABLE_NAME = "IntegrationTestBigLinkedList"; + protected static String DEFAULT_TABLE_NAME = "IntegrationTestBigLinkedList"; private static byte[] FAMILY_NAME = Bytes.toBytes("meta"); @@ -170,6 +170,8 @@ public class IntegrationTestBigLinkedList extends Configured implements Tool { private static final String GENERATOR_NUM_MAPPERS_KEY = "IntegrationTestBigLinkedList.generator.map.tasks"; + protected int NUM_SLAVES_BASE = 3; // number of slaves for the cluster + static class CINode { long key; long prev; @@ -648,7 +650,7 @@ public class IntegrationTestBigLinkedList extends Configured implements Tool { * Executes Generate and Verify in a loop. Data is not cleaned between runs, so each iteration * adds more data. */ - private static class Loop extends Configured implements Tool { + static class Loop extends Configured implements Tool { private static final Log LOG = LogFactory.getLog(Loop.class); @@ -916,12 +918,12 @@ public class IntegrationTestBigLinkedList extends Configured implements Tool { return node; } - private IntegrationTestingUtility util; + protected IntegrationTestingUtility util; @Before public void setUp() throws Exception { util = getTestingUtil(); - util.initializeCluster(3); + util.initializeCluster(this.NUM_SLAVES_BASE); this.setConf(util.getConfiguration()); } @@ -939,7 +941,7 @@ public class IntegrationTestBigLinkedList extends Configured implements Tool { org.junit.Assert.assertEquals(0, ret); } - private IntegrationTestingUtility getTestingUtil() { + protected IntegrationTestingUtility getTestingUtil() { if (this.util == null) { if (getConf() == null) { this.util = new IntegrationTestingUtility(); diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java new file mode 100644 index 0000000..5c37f53 --- /dev/null +++ hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java @@ -0,0 +1,98 @@ +/** + * 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.test; + +import java.io.IOException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.IntegrationTestingUtility; +import org.apache.hadoop.hbase.IntegrationTests; +import org.apache.hadoop.hbase.util.ChaosMonkey; +import org.apache.hadoop.util.ToolRunner; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + + +/** + * This is the same integration test as {@link IntegrationTestBigLinkedList} while killing the + * region servers and the master(s) randomly + */ +@Category(IntegrationTests.class) +public class IntegrationTestBigLinkedListWithChaosMonkey extends IntegrationTestBigLinkedList { + private static final Log LOG = LogFactory + .getLog(IntegrationTestBigLinkedListWithChaosMonkey.class); + + private ChaosMonkey monkey; + + public IntegrationTestBigLinkedListWithChaosMonkey() { + super(); + TABLE_NAME_KEY = "IntegrationTestBigLinkedListWithChaosMonkey.table"; + DEFAULT_TABLE_NAME = "IntegrationTestBigLinkedListWithChaosMonkey"; + } + + @Before + public void setUp() throws Exception { + if (!getTestingUtil().isDistributedCluster()) { + this.NUM_SLAVES_BASE = 5; // only used in MiniCluster mode + } + super.setUp(); + monkey = new ChaosMonkey(util, ChaosMonkey.EVERY_MINUTE_RANDOM_ACTION_POLICY); + LOG.info("Chaos Monkey Starting"); + monkey.start(); + } + + @After + public void tearDown() throws Exception { + if (monkey != null) { + monkey.stop("test has finished, that's why"); + monkey.waitForStop(); + } + super.tearDown(); + } + + @Test + public void testContinuousIngest() throws IOException, Exception { + // Loop + int ret = ToolRunner.run( + getTestingUtil().getConfiguration(), + new Loop(), + new String[] { "1", "1", "1000000", + util.getDataTestDirOnTestFS("IntegrationTestBigLinkedListWithChaosMonkey").toString(), + "1" }); + org.junit.Assert.assertEquals(0, ret); + } + + public static void main(String[] args) throws Exception { + + IntegrationTestBigLinkedListWithChaosMonkey test = + new IntegrationTestBigLinkedListWithChaosMonkey(); + IntegrationTestingUtility.setUseDistributedCluster(test.getTestingUtil().getConfiguration()); + // set minimum cluster size requirements + test.NUM_SLAVES_BASE = 3; + test.setUp(); + + // run the test + int ret = ToolRunner.run(test.getConf(), test, args); + + test.tearDown(); + System.exit(ret); + } +} diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index fc1a4b6..05f5315 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -930,7 +930,7 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa } //fsOk flag may be changed when closing regions throws exception. - if (!this.killed && this.fsOk) { + if (this.fsOk) { closeWAL(!abortRequested); }