You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pv...@apache.org on 2018/10/03 08:43:39 UTC
hive git commit: HIVE-20575: Fix flaky connection metric tests
(Laszlo Pinter, via Peter Vary)
Repository: hive
Updated Branches:
refs/heads/master c44853c94 -> a06a3703b
HIVE-20575: Fix flaky connection metric tests (Laszlo Pinter, via Peter Vary)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/a06a3703
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/a06a3703
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/a06a3703
Branch: refs/heads/master
Commit: a06a3703b6b73c996978897f8e5ed74f9b837360
Parents: c44853c
Author: Laszlo Pinter <lp...@cloudera.com>
Authored: Wed Oct 3 10:42:12 2018 +0200
Committer: Peter Vary <pv...@cloudera.com>
Committed: Wed Oct 3 10:42:12 2018 +0200
----------------------------------------------------------------------
.../hive/jdbc/miniHS2/TestHs2ConnectionMetricsBinary.java | 7 +++++++
.../hive/jdbc/miniHS2/TestHs2ConnectionMetricsHttp.java | 8 ++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/a06a3703/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHs2ConnectionMetricsBinary.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHs2ConnectionMetricsBinary.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHs2ConnectionMetricsBinary.java
index c823cb3..6677b45 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHs2ConnectionMetricsBinary.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHs2ConnectionMetricsBinary.java
@@ -19,6 +19,8 @@ package org.apache.hive.jdbc.miniHS2;
import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
import org.apache.hadoop.hive.common.metrics.common.MetricsFactory;
import org.apache.hadoop.hive.common.metrics.metrics2.CodahaleMetrics;
import org.apache.hadoop.hive.conf.HiveConf;
@@ -58,13 +60,18 @@ public class TestHs2ConnectionMetricsBinary extends Hs2ConnectionMetrics {
"-e", "show tables;"};
BeeLine beeLine = openBeeLineConnection(beelineArgs);
+ // wait a couple of sec to make sure the connection is open
+ TimeUnit.SECONDS.sleep(3);
verifyConnectionMetrics(metrics.dumpJson(), 1, 1);
beeLine.close();
+ TimeUnit.SECONDS.sleep(3);
verifyConnectionMetrics(metrics.dumpJson(), 0, 1);
beeLine = openBeeLineConnection(beelineArgs);
+ TimeUnit.SECONDS.sleep(3);
verifyConnectionMetrics(metrics.dumpJson(), 1, 2);
beeLine.close();
+ TimeUnit.SECONDS.sleep(3);
verifyConnectionMetrics(metrics.dumpJson(), 0, 2);
http://git-wip-us.apache.org/repos/asf/hive/blob/a06a3703/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHs2ConnectionMetricsHttp.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHs2ConnectionMetricsHttp.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHs2ConnectionMetricsHttp.java
index 65889aa..5852535 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHs2ConnectionMetricsHttp.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHs2ConnectionMetricsHttp.java
@@ -19,6 +19,7 @@ package org.apache.hive.jdbc.miniHS2;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
import org.apache.hadoop.hive.common.metrics.common.MetricsFactory;
import org.apache.hadoop.hive.common.metrics.metrics2.CodahaleMetrics;
@@ -38,7 +39,6 @@ import org.apache.thrift.transport.TTransport;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -59,7 +59,6 @@ public class TestHs2ConnectionMetricsHttp extends Hs2ConnectionMetrics {
Hs2ConnectionMetrics.tearDown();
}
- @Ignore("Flaky test. Should be re-enabled in HIVE-20578")
@Test
public void testOpenConnectionMetrics() throws Exception {
CodahaleMetrics metrics = (CodahaleMetrics) MetricsFactory.getInstance();
@@ -67,19 +66,24 @@ public class TestHs2ConnectionMetricsHttp extends Hs2ConnectionMetrics {
TCLIService.Client httpClient = getHttpClient();
TOpenSessionReq openSessionReq = new TOpenSessionReq();
TOpenSessionResp tOpenSessionResp = httpClient.OpenSession(openSessionReq);
+ // wait a couple of sec to make sure the connection is closed
+ TimeUnit.SECONDS.sleep(3);
verifyConnectionMetrics(metrics.dumpJson(), 0, 1);
TSessionHandle sessionHandle = tOpenSessionResp.getSessionHandle();
TCloseSessionReq closeSessionReq = new TCloseSessionReq(sessionHandle);
httpClient.CloseSession(closeSessionReq);
+ TimeUnit.SECONDS.sleep(3);
verifyConnectionMetrics(metrics.dumpJson(), 0, 2);
tOpenSessionResp = httpClient.OpenSession(openSessionReq);
+ TimeUnit.SECONDS.sleep(3);
verifyConnectionMetrics(metrics.dumpJson(), 0, 3);
sessionHandle = tOpenSessionResp.getSessionHandle();
closeSessionReq = new TCloseSessionReq(sessionHandle);
httpClient.CloseSession(closeSessionReq);
+ TimeUnit.SECONDS.sleep(3);
verifyConnectionMetrics(metrics.dumpJson(), 0, 4);
}