hive git commit: HIVE-19589: Disable TestAutoPurge tests (addendum)

2018-05-18 Thread prasanthj 
Repository: hive
Updated Branches:
  refs/heads/master 1f2334c65 -> bfddd44b7


HIVE-19589: Disable TestAutoPurge tests (addendum)


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

Branch: refs/heads/master
Commit: bfddd44b7b3f62851593e2910700b37874910d68
Parents: 1f2334c
Author: Prasanth Jayachandran 
Authored: Fri May 18 18:40:52 2018 -0700
Committer: Prasanth Jayachandran 
Committed: Fri May 18 18:41:16 2018 -0700

--
 .../jdbc/TestTriggersTezSessionPoolManager.java | 39 +---
 .../hive/jdbc/TestTriggersWorkloadManager.java  |  3 --
 2 files changed, 18 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/bfddd44b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java
--
diff --git 
a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java
 
b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java
index 27c5164..de0f31e 100644
--- 
a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java
+++ 
b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java
@@ -29,15 +29,12 @@ import org.apache.hadoop.hive.ql.wm.ExecutionTrigger;
 import org.apache.hadoop.hive.ql.wm.Expression;
 import org.apache.hadoop.hive.ql.wm.ExpressionFactory;
 import org.apache.hadoop.hive.ql.wm.Trigger;
-import org.apache.hive.common.util.RetryTestRunner;
 import org.junit.Test;
 import com.google.common.collect.Lists;
-import org.junit.runner.RunWith;
 
-@RunWith(RetryTestRunner.class)
 public class TestTriggersTezSessionPoolManager extends 
AbstractJdbcTriggersTest {
 
-  @Test(timeout = 6)
+  @Test(timeout = 12)
   public void testTriggerSlowQueryElapsedTime() throws Exception {
 Expression expression = ExpressionFactory.fromString("ELAPSED_TIME > 
2");
 Trigger trigger = new ExecutionTrigger("slow_query", expression, new 
Action(Action.Type.KILL_QUERY));
@@ -47,7 +44,7 @@ public class TestTriggersTezSessionPoolManager extends 
AbstractJdbcTriggersTest
 runQueryWithTrigger(query, null, trigger + " violated");
   }
 
-  @Test(timeout = 6)
+  @Test(timeout = 12)
   public void testTriggerShortQueryElapsedTime() throws Exception {
 Expression expression = ExpressionFactory.fromString("ELAPSED_TIME > 100");
 Trigger trigger = new ExecutionTrigger("slow_query", expression, new 
Action(Action.Type.KILL_QUERY));
@@ -57,7 +54,7 @@ public class TestTriggersTezSessionPoolManager extends 
AbstractJdbcTriggersTest
 runQueryWithTrigger(query, null, trigger + " violated");
   }
 
-  @Test(timeout = 6)
+  @Test(timeout = 12)
   public void testTriggerSlowQueryExecutionTime() throws Exception {
 Expression expression = ExpressionFactory.fromString("EXECUTION_TIME > 
1000");
 Trigger trigger = new ExecutionTrigger("slow_query", expression, new 
Action(Action.Type.KILL_QUERY));
@@ -67,7 +64,7 @@ public class TestTriggersTezSessionPoolManager extends 
AbstractJdbcTriggersTest
 runQueryWithTrigger(query, null, trigger + " violated");
   }
 
-  @Test(timeout = 6)
+  @Test(timeout = 12)
   public void testTriggerHighShuffleBytes() throws Exception {
 Expression expression = ExpressionFactory.fromString("SHUFFLE_BYTES > 
100");
 Trigger trigger = new ExecutionTrigger("big_shuffle", expression, new 
Action(Action.Type.KILL_QUERY));
@@ -82,7 +79,7 @@ public class TestTriggersTezSessionPoolManager extends 
AbstractJdbcTriggersTest
 runQueryWithTrigger(query, cmds, trigger + " violated");
   }
 
-  @Test(timeout = 6)
+  @Test(timeout = 12)
   public void testTriggerHighBytesRead() throws Exception {
 Expression expression = ExpressionFactory.fromString("HDFS_BYTES_READ > 
100");
 Trigger trigger = new ExecutionTrigger("big_read", expression, new 
Action(Action.Type.KILL_QUERY));
@@ -92,7 +89,7 @@ public class TestTriggersTezSessionPoolManager extends 
AbstractJdbcTriggersTest
 runQueryWithTrigger(query, null, trigger + " violated");
   }
 
-  @Test(timeout = 6)
+  @Test(timeout = 12)
   public void testTriggerHighBytesWrite() throws Exception {
 Expression expression = ExpressionFactory.fromString("FILE_BYTES_WRITTEN > 
100");
 Trigger trigger = new ExecutionTrigger("big_write", expression, new 
Action(Action.Type.KILL_QUERY));
@@ -102,7 +99,7 @@ public class TestTriggersTezSessionPoolManager extends 
AbstractJdbcTriggersTest
 runQueryWithTrigger(query, null, trigger + "

hive git commit: HIVE-19589: Disable TestAutoPurge tests (addendum)

2018-05-18 Thread prasanthj 
Repository: hive
Updated Branches:
  refs/heads/master e6f44d2ee -> 0977d3bf4


HIVE-19589: Disable TestAutoPurge tests (addendum)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/0977d3bf
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/0977d3bf
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/0977d3bf

Branch: refs/heads/master
Commit: 0977d3bf4503a8bf05185892a95e7fd88bb203cd
Parents: e6f44d2
Author: Prasanth Jayachandran 
Authored: Fri May 18 17:39:06 2018 -0700
Committer: Prasanth Jayachandran 
Committed: Fri May 18 17:39:06 2018 -0700

--
 .../org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java | 5 -
 .../java/org/apache/hive/jdbc/TestTriggersWorkloadManager.java  | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/0977d3bf/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java
--
diff --git 
a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java
 
b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java
index 1691f44..27c5164 100644
--- 
a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java
+++ 
b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java
@@ -29,9 +29,12 @@ import org.apache.hadoop.hive.ql.wm.ExecutionTrigger;
 import org.apache.hadoop.hive.ql.wm.Expression;
 import org.apache.hadoop.hive.ql.wm.ExpressionFactory;
 import org.apache.hadoop.hive.ql.wm.Trigger;
+import org.apache.hive.common.util.RetryTestRunner;
 import org.junit.Test;
 import com.google.common.collect.Lists;
+import org.junit.runner.RunWith;
 
+@RunWith(RetryTestRunner.class)
 public class TestTriggersTezSessionPoolManager extends 
AbstractJdbcTriggersTest {
 
   @Test(timeout = 6)
@@ -321,4 +324,4 @@ public class TestTriggersTezSessionPoolManager extends 
AbstractJdbcTriggersTest
 }
 TezSessionPoolManager.getInstance().updateTriggers(rp);
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hive/blob/0977d3bf/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersWorkloadManager.java
--
diff --git 
a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersWorkloadManager.java
 
b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersWorkloadManager.java
index 85391ac..948d4d6 100644
--- 
a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersWorkloadManager.java
+++ 
b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersWorkloadManager.java
@@ -32,12 +32,15 @@ import org.apache.hadoop.hive.metastore.api.WMPoolTrigger;
 import org.apache.hadoop.hive.metastore.api.WMResourcePlan;
 import org.apache.hadoop.hive.ql.exec.tez.WorkloadManager;
 import org.apache.hadoop.hive.ql.wm.Trigger;
+import org.apache.hive.common.util.RetryTestRunner;
 import org.apache.hive.jdbc.miniHS2.MiniHS2;
 import org.apache.hive.jdbc.miniHS2.MiniHS2.MiniClusterType;
 import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
 
 import com.google.common.collect.Lists;
 
+@RunWith(RetryTestRunner.class)
 public class TestTriggersWorkloadManager extends 
TestTriggersTezSessionPoolManager {
 
   @BeforeClass