You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2018/01/09 04:52:47 UTC
[03/43] hbase git commit: HBASE-19731
TestFromClientSide#testCheckAndDeleteWithCompareOp and testNullQualifier are
flakey
HBASE-19731 TestFromClientSide#testCheckAndDeleteWithCompareOp and testNullQualifier are flakey
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2509a150
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2509a150
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2509a150
Branch: refs/heads/HBASE-19397
Commit: 2509a150c0792e914429264453510b9028250c29
Parents: 2af6171
Author: zhangduo <zh...@apache.org>
Authored: Mon Jan 8 16:18:30 2018 +0800
Committer: Michael Stack <st...@apache.org>
Committed: Mon Jan 8 10:35:36 2018 -0800
----------------------------------------------------------------------
.../hbase/util/NonRepeatedEnvironmentEdge.java | 44 ++++++++++++++++++++
.../hadoop/hbase/client/TestFromClientSide.java | 3 ++
2 files changed, 47 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/2509a150/hbase-common/src/test/java/org/apache/hadoop/hbase/util/NonRepeatedEnvironmentEdge.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/NonRepeatedEnvironmentEdge.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/NonRepeatedEnvironmentEdge.java
new file mode 100644
index 0000000..c5f320b
--- /dev/null
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/NonRepeatedEnvironmentEdge.java
@@ -0,0 +1,44 @@
+/**
+ * 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.util;
+
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.yetus.audience.InterfaceAudience;
+
+/**
+ * An clock which will never return the same clock twice.
+ */
+@InterfaceAudience.Private
+public class NonRepeatedEnvironmentEdge implements EnvironmentEdge {
+
+ private final AtomicLong prevTime = new AtomicLong(0L);
+
+ @Override
+ public long currentTime() {
+ for (long current;;) {
+ current = System.currentTimeMillis();
+ long prev = prevTime.get();
+ if (current <= prev) {
+ current = prev + 1;
+ }
+ if (prevTime.compareAndSet(prev, current)) {
+ return current;
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/hbase/blob/2509a150/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
index f17c291..3af245f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
@@ -100,6 +100,7 @@ import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
+import org.apache.hadoop.hbase.util.NonRepeatedEnvironmentEdge;
import org.apache.hadoop.hbase.util.Pair;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -139,6 +140,8 @@ public class TestFromClientSide {
//((Log4JLogger)RpcServer.LOG).getLogger().setLevel(Level.ALL);
//((Log4JLogger)RpcClient.LOG).getLogger().setLevel(Level.ALL);
//((Log4JLogger)ScannerCallable.LOG).getLogger().setLevel(Level.ALL);
+ // make sure that we do not get the same ts twice, see HBASE-19731 for more details.
+ EnvironmentEdgeManager.injectEdge(new NonRepeatedEnvironmentEdge());
Configuration conf = TEST_UTIL.getConfiguration();
conf.setStrings(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY,
MultiRowMutationEndpoint.class.getName());