[41/47] hbase git commit: HBASE-18651 Let ChaosMonkeyRunner expose the chaos monkey runner it creates

2017-09-23 Thread busbey 
HBASE-18651 Let ChaosMonkeyRunner expose the chaos monkey runner it creates

Signed-off-by: Mike Drob 
Signed-off-by: Ted Yu 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5f238b3e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5f238b3e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5f238b3e

Branch: refs/heads/HBASE-18467
Commit: 5f238b3ef46e7d5f31a9fb2dfff0111085af835d
Parents: e393599
Author: Reid Chan 
Authored: Thu Sep 21 11:30:14 2017 +0800
Committer: Mike Drob 
Committed: Thu Sep 21 21:19:25 2017 -0500

--
 .../hbase/chaos/util/ChaosMonkeyRunner.java | 19 +++-
 .../apache/hadoop/hbase/chaos/util/Monkeys.java | 96 
 .../hbase/test/IntegrationTestMonkeys.java  | 67 ++
 3 files changed, 178 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/5f238b3e/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
--
diff --git 
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
 
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
index 5911085..d72111f 100644
--- 
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
+++ 
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
@@ -52,7 +52,6 @@ public class ChaosMonkeyRunner extends AbstractHBaseTool {
   protected boolean noClusterCleanUp = false;
   private String tableName = "ChaosMonkeyRunner.tableName";
   private String familyName = "ChaosMonkeyRunner.familyName";
-  private volatile boolean stop = false;
 
   @Override
   public void addOptions() {
@@ -93,14 +92,26 @@ public class ChaosMonkeyRunner extends AbstractHBaseTool {
   protected int doWork() throws Exception {
 setUpCluster();
 getAndStartMonkey();
-while (!stop) {// loop here until got killed
-  Thread.sleep(1);
+while (!monkey.isStopped()) {
+  // loop here until got killed
+  try {
+// TODO: make sleep time configurable
+Thread.sleep(5000); // 5 seconds
+  } catch (InterruptedException ite) {
+// Chaos monkeys got interrupted.
+// It is ok to stop monkeys and exit.
+monkey.stop("Interruption occurred.");
+break;
+  }
 }
+monkey.waitForStop();
 return 0;
   }
 
   public void stopRunner() {
-stop = true;
+if (monkey != null) {
+  monkey.stop("Program Control");
+}
   }
 
   public void setUpCluster() throws Exception {

http://git-wip-us.apache.org/repos/asf/hbase/blob/5f238b3e/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java
--
diff --git 
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java 
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java
new file mode 100644
index 000..1ce4356
--- /dev/null
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java
@@ -0,0 +1,96 @@
+/**
+ * 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.chaos.util;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.IntegrationTestingUtility;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
+import 
org.apache.hadoop.hbase.shaded.com.google.common.util.concurrent.ThreadFactoryBuilder;
+
+/**
+ * This class can be used to control chaos monkeys life cycle.
+ */
+public class Monkeys implements Closeable {
+  private

hbase git commit: HBASE-18651 Let ChaosMonkeyRunner expose the chaos monkey runner it creates

2017-09-21 Thread mdrob 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 c1f5122fa -> 3a02a2a80


HBASE-18651 Let ChaosMonkeyRunner expose the chaos monkey runner it creates

Signed-off-by: Mike Drob 
Signed-off-by: Ted Yu 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3a02a2a8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3a02a2a8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3a02a2a8

Branch: refs/heads/branch-2
Commit: 3a02a2a80df859db996a98072a4c272a0c81c73d
Parents: c1f5122
Author: Reid Chan 
Authored: Thu Sep 21 11:30:14 2017 +0800
Committer: Mike Drob 
Committed: Thu Sep 21 21:34:07 2017 -0500

--
 .../hbase/chaos/util/ChaosMonkeyRunner.java | 19 +++-
 .../apache/hadoop/hbase/chaos/util/Monkeys.java | 96 
 .../hbase/test/IntegrationTestMonkeys.java  | 67 ++
 3 files changed, 178 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/3a02a2a8/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
--
diff --git 
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
 
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
index 5911085..d72111f 100644
--- 
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
+++ 
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
@@ -52,7 +52,6 @@ public class ChaosMonkeyRunner extends AbstractHBaseTool {
   protected boolean noClusterCleanUp = false;
   private String tableName = "ChaosMonkeyRunner.tableName";
   private String familyName = "ChaosMonkeyRunner.familyName";
-  private volatile boolean stop = false;
 
   @Override
   public void addOptions() {
@@ -93,14 +92,26 @@ public class ChaosMonkeyRunner extends AbstractHBaseTool {
   protected int doWork() throws Exception {
 setUpCluster();
 getAndStartMonkey();
-while (!stop) {// loop here until got killed
-  Thread.sleep(1);
+while (!monkey.isStopped()) {
+  // loop here until got killed
+  try {
+// TODO: make sleep time configurable
+Thread.sleep(5000); // 5 seconds
+  } catch (InterruptedException ite) {
+// Chaos monkeys got interrupted.
+// It is ok to stop monkeys and exit.
+monkey.stop("Interruption occurred.");
+break;
+  }
 }
+monkey.waitForStop();
 return 0;
   }
 
   public void stopRunner() {
-stop = true;
+if (monkey != null) {
+  monkey.stop("Program Control");
+}
   }
 
   public void setUpCluster() throws Exception {

http://git-wip-us.apache.org/repos/asf/hbase/blob/3a02a2a8/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java
--
diff --git 
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java 
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java
new file mode 100644
index 000..1ce4356
--- /dev/null
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java
@@ -0,0 +1,96 @@
+/**
+ * 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.chaos.util;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.IntegrationTestingUtility;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
+import 
org.apache.hadoop.hbase.shaded.com.google.common.util.concurrent.ThreadFactoryBuilder;
+
+/**
+ * This class can be used to control chaos

hbase git commit: HBASE-18651 Let ChaosMonkeyRunner expose the chaos monkey runner it creates

2017-09-21 Thread mdrob 
Repository: hbase
Updated Branches:
  refs/heads/master e39359986 -> 5f238b3ef


HBASE-18651 Let ChaosMonkeyRunner expose the chaos monkey runner it creates

Signed-off-by: Mike Drob 
Signed-off-by: Ted Yu 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5f238b3e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5f238b3e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5f238b3e

Branch: refs/heads/master
Commit: 5f238b3ef46e7d5f31a9fb2dfff0111085af835d
Parents: e393599
Author: Reid Chan 
Authored: Thu Sep 21 11:30:14 2017 +0800
Committer: Mike Drob 
Committed: Thu Sep 21 21:19:25 2017 -0500

--
 .../hbase/chaos/util/ChaosMonkeyRunner.java | 19 +++-
 .../apache/hadoop/hbase/chaos/util/Monkeys.java | 96 
 .../hbase/test/IntegrationTestMonkeys.java  | 67 ++
 3 files changed, 178 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/5f238b3e/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
--
diff --git 
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
 
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
index 5911085..d72111f 100644
--- 
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
+++ 
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java
@@ -52,7 +52,6 @@ public class ChaosMonkeyRunner extends AbstractHBaseTool {
   protected boolean noClusterCleanUp = false;
   private String tableName = "ChaosMonkeyRunner.tableName";
   private String familyName = "ChaosMonkeyRunner.familyName";
-  private volatile boolean stop = false;
 
   @Override
   public void addOptions() {
@@ -93,14 +92,26 @@ public class ChaosMonkeyRunner extends AbstractHBaseTool {
   protected int doWork() throws Exception {
 setUpCluster();
 getAndStartMonkey();
-while (!stop) {// loop here until got killed
-  Thread.sleep(1);
+while (!monkey.isStopped()) {
+  // loop here until got killed
+  try {
+// TODO: make sleep time configurable
+Thread.sleep(5000); // 5 seconds
+  } catch (InterruptedException ite) {
+// Chaos monkeys got interrupted.
+// It is ok to stop monkeys and exit.
+monkey.stop("Interruption occurred.");
+break;
+  }
 }
+monkey.waitForStop();
 return 0;
   }
 
   public void stopRunner() {
-stop = true;
+if (monkey != null) {
+  monkey.stop("Program Control");
+}
   }
 
   public void setUpCluster() throws Exception {

http://git-wip-us.apache.org/repos/asf/hbase/blob/5f238b3e/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java
--
diff --git 
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java 
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java
new file mode 100644
index 000..1ce4356
--- /dev/null
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/Monkeys.java
@@ -0,0 +1,96 @@
+/**
+ * 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.chaos.util;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.IntegrationTestingUtility;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
+import 
org.apache.hadoop.hbase.shaded.com.google.common.util.concurrent.ThreadFactoryBuilder;
+
+/**
+ * This class can be used to control chaos