You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2013/01/12 03:07:25 UTC
svn commit: r1432358 - in /hbase/trunk:
hbase-common/src/test/java/org/apache/hadoop/hbase/
hbase-server/src/test/java/org/apache/hadoop/hbase/
hbase-server/src/test/java/org/apache/hadoop/hbase/master/
hbase-server/src/test/java/org/apache/hadoop/hbas...
Author: enis
Date: Sat Jan 12 02:07:25 2013
New Revision: 1432358
URL: http://svn.apache.org/viewvc?rev=1432358&view=rev
Log:
HBASE-7384 Introducing waitForCondition function into test cases (Jeffrey Zhong)
Added:
hbase/trunk/hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java
Modified:
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java
Added: hbase/trunk/hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java?rev=1432358&view=auto
==============================================================================
--- hbase/trunk/hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java (added)
+++ hbase/trunk/hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java Sat Jan 12 02:07:25 2013
@@ -0,0 +1,204 @@
+/**
+ *
+ * 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;
+
+import java.text.MessageFormat;
+
+import junit.framework.Assert;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.conf.Configuration;
+
+/**
+ * A class that provides a standard waitFor pattern
+ * See details at https://issues.apache.org/jira/browse/HBASE-7384
+ */
+@InterfaceAudience.Private
+public final class Waiter {
+
+ private static final Log LOG = LogFactory.getLog(Waiter.class);
+
+ /**
+ * System property name whose value is a scale factor to increase time out values dynamically used
+ * in {@link #sleep(Configuration, long)}, {@link #waitFor(Configuration, long, Predicate)},
+ * {@link #waitFor(Configuration, long, long, Predicate)}, and
+ * {@link #waitFor(Configuration, long, long, boolean, Predicate)} method
+ * <p/>
+ * The actual time out value will equal to hbase.test.wait.for.ratio * passed-in timeout
+ */
+ public static final String HBASE_TEST_WAIT_FOR_RATIO = "hbase.test.wait.for.ratio";
+
+ private static float HBASE_WAIT_FOR_RATIO_DEFAULT = 1;
+
+ private static float waitForRatio = -1;
+
+ private Waiter() {
+ }
+
+ /**
+ * Returns the 'wait for ratio' used in the {@link #sleep(Configuration, long)},
+ * {@link #waitFor(Configuration, long, Predicate)},
+ * {@link #waitFor(Configuration, long, long, Predicate)} and
+ * {@link #waitFor(Configuration, long, long, boolean, Predicate)} methods of the class
+ * <p/>
+ * This is useful to dynamically adjust max time out values when same test cases run in different
+ * test machine settings without recompiling & re-deploying code.
+ * <p/>
+ * The value is obtained from the Java System property or configuration setting
+ * <code>hbase.test.wait.for.ratio</code> which defaults to <code>1</code>.
+ * @param conf the configuration
+ * @return the 'wait for ratio' for the current test run.
+ */
+ public static float getWaitForRatio(Configuration conf) {
+ if (waitForRatio < 0) {
+ // System property takes precedence over configuration setting
+ if (System.getProperty(HBASE_TEST_WAIT_FOR_RATIO) != null) {
+ waitForRatio = Float.parseFloat(System.getProperty(HBASE_TEST_WAIT_FOR_RATIO));
+ } else {
+ waitForRatio = conf.getFloat(HBASE_TEST_WAIT_FOR_RATIO, HBASE_WAIT_FOR_RATIO_DEFAULT);
+ }
+ }
+ return waitForRatio;
+ }
+
+ /**
+ * A predicate 'closure' used by the {@link Waiter#waitFor(Configuration, long, Predicate)} and
+ * {@link Waiter#waitFor(Configuration, long, Predicate)} and
+ * {@link Waiter#waitFor(Configuration, long, long, boolean, Predicate) methods.
+ */
+ @InterfaceAudience.Private
+ public static interface Predicate<E extends Exception> {
+
+ /**
+ * Perform a predicate evaluation.
+ * @return the boolean result of the evaluation.
+ * @throws Exception thrown if the predicate evaluation could not evaluate.
+ */
+ public boolean evaluate() throws E;
+
+ }
+
+ /**
+ * Makes the current thread sleep for the duration equal to the specified time in milliseconds
+ * multiplied by the {@link #getWaitForRatio(Configuration)}.
+ * @param conf the configuration
+ * @param time the number of milliseconds to sleep.
+ */
+ public static void sleep(Configuration conf, long time) {
+ try {
+ Thread.sleep((long) (getWaitForRatio(conf) * time));
+ } catch (InterruptedException ex) {
+ LOG.warn(MessageFormat.format("Sleep interrupted, {0}", ex.toString()));
+ }
+ }
+
+ /**
+ * Waits up to the duration equal to the specified timeout multiplied by the
+ * {@link #getWaitForRatio(Configuration)} for the given {@link Predicate} to become
+ * <code>true</code>, failing the test if the timeout is reached and the Predicate is still
+ * <code>false</code>.
+ * <p/>
+ * @param conf the configuration
+ * @param timeout the timeout in milliseconds to wait for the predicate.
+ * @param predicate the predicate to evaluate.
+ * @return the effective wait, in milli-seconds until the predicate becomes <code>true</code> or
+ * wait is interrupted otherwise <code>-1</code> when times out
+ */
+ public static <E extends Exception> long waitFor(Configuration conf, long timeout,
+ Predicate<E> predicate) throws E {
+ return waitFor(conf, timeout, 100, true, predicate);
+ }
+
+ /**
+ * Waits up to the duration equal to the specified timeout multiplied by the
+ * {@link #getWaitForRatio(Configuration)} for the given {@link Predicate} to become
+ * <code>true</code>, failing the test if the timeout is reached and the Predicate is still
+ * <code>false</code>.
+ * <p/>
+ * @param conf the configuration
+ * @param timeout the max timeout in milliseconds to wait for the predicate.
+ * @param interval the interval in milliseconds to evaluate predicate.
+ * @param predicate the predicate to evaluate.
+ * @return the effective wait, in milli-seconds until the predicate becomes <code>true</code> or
+ * wait is interrupted otherwise <code>-1</code> when times out
+ */
+ public static <E extends Exception> long waitFor(Configuration conf, long timeout, long interval,
+ Predicate<E> predicate) throws E {
+ return waitFor(conf, timeout, interval, true, predicate);
+ }
+
+ /**
+ * Waits up to the duration equal to the specified timeout multiplied by the
+ * {@link #getWaitForRatio(Configuration)} for the given {@link Predicate} to become
+ * <code>true</code>, failing the test if the timeout is reached, the Predicate is still
+ * <code>false</code> and failIfTimeout is set as <code>true</code>.
+ * <p/>
+ * @param conf the configuration
+ * @param timeout the timeout in milliseconds to wait for the predicate.
+ * @param interval the interval in milliseconds to evaluate predicate.
+ * @param failIfTimeout indicates if should fail current test case when times out.
+ * @param predicate the predicate to evaluate.
+ * @return the effective wait, in milli-seconds until the predicate becomes <code>true</code> or
+ * wait is interrupted otherwise <code>-1</code> when times out
+ */
+ public static <E extends Exception> long waitFor(Configuration conf, long timeout, long interval,
+ boolean failIfTimeout, Predicate<E> predicate) throws E {
+ long started = System.currentTimeMillis();
+ long adjustedTimeout = (long) (getWaitForRatio(conf) * timeout);
+ long mustEnd = started + adjustedTimeout;
+ long remainderWait = 0;
+ long sleepInterval = 0;
+ Boolean eval = false;
+ Boolean interrupted = false;
+
+ try {
+ LOG.info(MessageFormat.format("Waiting up to [{0}] milli-secs(wait.for.ratio=[{1}])",
+ adjustedTimeout, getWaitForRatio(conf)));
+ while (!(eval = predicate.evaluate())
+ && (remainderWait = mustEnd - System.currentTimeMillis()) > 0) {
+ try {
+ // handle tail case when remainder wait is less than one interval
+ sleepInterval = (remainderWait > interval) ? interval : remainderWait;
+ Thread.sleep(sleepInterval);
+ } catch (InterruptedException e) {
+ eval = predicate.evaluate();
+ interrupted = true;
+ break;
+ }
+ }
+ if (!eval) {
+ if (interrupted) {
+ LOG.warn(MessageFormat.format("Waiting interrupted after [{0}] msec",
+ System.currentTimeMillis() - started));
+ } else if (failIfTimeout) {
+ Assert.fail(MessageFormat.format("Waiting timed out after [{0}] msec", adjustedTimeout));
+ } else {
+ LOG.warn(MessageFormat.format("Waiting timed out after [{0}] msec", adjustedTimeout));
+ }
+ }
+ return (eval || interrupted) ? (System.currentTimeMillis() - started) : -1;
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+}
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=1432358&r1=1432357&r2=1432358&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Sat Jan 12 02:07:25 2013
@@ -52,6 +52,7 @@ import org.apache.hadoop.classification.
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.Waiter.Predicate;
import org.apache.hadoop.hbase.catalog.MetaEditor;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Get;
@@ -2349,4 +2350,28 @@ public class HBaseTestingUtility extends
public void setFileSystemURI(String fsURI) {
FS_URI = fsURI;
}
+
+ /**
+ * Wrapper method for {@link Waiter#waitFor(Configuration, long, Predicate)}.
+ */
+ public <E extends Exception> long waitFor(long timeout, Predicate<E> predicate)
+ throws E {
+ return Waiter.waitFor(this.conf, timeout, predicate);
+ }
+
+ /**
+ * Wrapper method for {@link Waiter#waitFor(Configuration, long, long, Predicate)}.
+ */
+ public <E extends Exception> long waitFor(long timeout, long interval, Predicate<E> predicate)
+ throws E {
+ return Waiter.waitFor(this.conf, timeout, interval, predicate);
+ }
+
+ /**
+ * Wrapper method for {@link Waiter#waitFor(Configuration, long, long, boolean, Predicate)}.
+ */
+ public <E extends Exception> long waitFor(long timeout, long interval,
+ boolean failIfTimeout, Predicate<E> predicate) throws E {
+ return Waiter.waitFor(this.conf, timeout, interval, failIfTimeout, predicate);
+ }
}
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java?rev=1432358&r1=1432357&r2=1432358&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java Sat Jan 12 02:07:25 2013
@@ -51,6 +51,7 @@ import org.apache.hadoop.hbase.MediumTes
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.SplitLogTask;
import org.apache.hadoop.hbase.Stoppable;
+import org.apache.hadoop.hbase.Waiter;
import org.apache.hadoop.hbase.master.SplitLogManager.Task;
import org.apache.hadoop.hbase.master.SplitLogManager.TaskBatch;
import org.apache.hadoop.hbase.regionserver.TestMasterAddressManager.NodeCreationListener;
@@ -142,7 +143,8 @@ public class TestSplitLogManager {
public long eval();
}
- private void waitForCounter(final AtomicLong ctr, long oldval, long newval, long timems) {
+ private void waitForCounter(final AtomicLong ctr, long oldval, long newval, long timems)
+ throws Exception {
Expr e = new Expr() {
public long eval() {
return ctr.get();
@@ -152,23 +154,17 @@ public class TestSplitLogManager {
return;
}
- private void waitForCounter(Expr e, long oldval, long newval,
- long timems) {
- long curt = System.currentTimeMillis();
- long endt = curt + timems;
- while (curt < endt) {
- if (e.eval() == oldval) {
- try {
- Thread.sleep(10);
- } catch (InterruptedException eintr) {
+ private void waitForCounter(final Expr e, final long oldval, long newval, long timems)
+ throws Exception {
+
+ TEST_UTIL.waitFor(timems, 10, new Waiter.Predicate<Exception>() {
+ @Override
+ public boolean evaluate() throws Exception {
+ return (e.eval() != oldval);
}
- curt = System.currentTimeMillis();
- } else {
- assertEquals(newval, e.eval());
- return;
- }
- }
- assertTrue(false);
+ });
+
+ assertEquals(newval, e.eval());
}
private String submitTaskAndWait(TaskBatch batch, String name)
@@ -550,4 +546,3 @@ public class TestSplitLogManager {
}
}
-
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java?rev=1432358&r1=1432357&r2=1432358&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java Sat Jan 12 02:07:25 2013
@@ -31,6 +31,7 @@ import org.apache.hadoop.hbase.MediumTes
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.SplitLogCounters;
import org.apache.hadoop.hbase.SplitLogTask;
+import org.apache.hadoop.hbase.Waiter;
import org.apache.hadoop.hbase.util.CancelableProgressable;
import org.apache.hadoop.hbase.zookeeper.ZKSplitLog;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
@@ -56,29 +57,34 @@ public class TestSplitLogWorker {
private ZooKeeperWatcher zkw;
private SplitLogWorker slw;
- private void waitForCounter(AtomicLong ctr, long oldval, long newval,
- long timems) {
+ private void waitForCounter(AtomicLong ctr, long oldval, long newval, long timems)
+ throws Exception {
assertTrue("ctr=" + ctr.get() + ", oldval=" + oldval + ", newval=" + newval,
waitForCounterBoolean(ctr, oldval, newval, timems));
}
- private boolean waitForCounterBoolean(AtomicLong ctr, long oldval, long newval,
- long timems) {
- long curt = System.currentTimeMillis();
- long endt = curt + timems;
- while (curt < endt) {
- if (ctr.get() == oldval) {
- try {
- Thread.sleep(10);
- } catch (InterruptedException e) {
- }
- curt = System.currentTimeMillis();
- } else {
- assertEquals(newval, ctr.get());
- return true;
+ private boolean waitForCounterBoolean(final AtomicLong ctr, final long oldval, long newval,
+ long timems) throws Exception {
+
+ return waitForCounterBoolean(ctr, oldval, newval, timems, true);
+ }
+
+ private boolean waitForCounterBoolean(final AtomicLong ctr, final long oldval, long newval,
+ long timems, boolean failIfTimeout) throws Exception {
+
+ long timeWaited = TEST_UTIL.waitFor(timems, 10, failIfTimeout,
+ new Waiter.Predicate<Exception>() {
+ @Override
+ public boolean evaluate() throws Exception {
+ return (ctr.get() != oldval);
}
+ });
+
+ if( timeWaited > 0) {
+ // when not timed out
+ assertEquals(newval, ctr.get());
}
- return false;
+ return true;
}
@Before
@@ -173,7 +179,7 @@ public class TestSplitLogWorker {
waitForCounter(SplitLogCounters.tot_wkr_task_acquired, 0, 1, 1000);
// Assert that either the tot_wkr_failed_to_grab_task_owned count was set of if
// not it, that we fell through to the next counter in line and it was set.
- assertTrue(waitForCounterBoolean(SplitLogCounters.tot_wkr_failed_to_grab_task_owned, 0, 1, 1000) ||
+ assertTrue(waitForCounterBoolean(SplitLogCounters.tot_wkr_failed_to_grab_task_owned, 0, 1, 1000, false) ||
SplitLogCounters.tot_wkr_failed_to_grab_task_lost_race.get() == 1);
byte [] bytes = ZKUtil.getData(zkw, ZKSplitLog.getEncodedNodeName(zkw, TRFT));
SplitLogTask slt = SplitLogTask.parseFrom(bytes);