Repository: hive Updated Branches: refs/heads/master af3b21239 -> 1aebe9d54
HIVE-15168: Flaky test: TestSparkClient.testJobSubmission (still flaky) (Barna Zsombor Klara via Rui Li, reviewed by Xuefu Zhang and Rui Li) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1aebe9d5 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1aebe9d5 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1aebe9d5 Branch: refs/heads/master Commit: 1aebe9d544b8c144f10a29d975529a6dee1c9ded Parents: af3b212 Author: Barna Zsombor Klara <[email protected]> Authored: Fri Nov 25 10:51:36 2016 +0800 Committer: Rui Li <[email protected]> Committed: Fri Nov 25 10:51:36 2016 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hive/spark/client/SparkClientImpl.java | 1 + .../src/test/java/org/apache/hive/spark/client/TestSparkClient.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/1aebe9d5/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java ---------------------------------------------------------------------- diff --git a/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java b/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java index 863aaa8..5191e1f 100644 --- a/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java +++ b/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java @@ -532,6 +532,7 @@ class SparkClientImpl implements SparkClient { @Override public void operationComplete(io.netty.util.concurrent.Future<Void> f) { if (f.isSuccess()) { + // If the spark job finishes before this listener is called, the QUEUED status will not be set handle.changeState(JobHandle.State.QUEUED); } else if (!promise.isDone()) { promise.setFailure(f.cause()); http://git-wip-us.apache.org/repos/asf/hive/blob/1aebe9d5/spark-client/src/test/java/org/apache/hive/spark/client/TestSparkClient.java ---------------------------------------------------------------------- diff --git a/spark-client/src/test/java/org/apache/hive/spark/client/TestSparkClient.java b/spark-client/src/test/java/org/apache/hive/spark/client/TestSparkClient.java index e4bf8ae..a27eb2b 100644 --- a/spark-client/src/test/java/org/apache/hive/spark/client/TestSparkClient.java +++ b/spark-client/src/test/java/org/apache/hive/spark/client/TestSparkClient.java @@ -103,7 +103,6 @@ public class TestSparkClient { // state changes. assertFalse(((JobHandleImpl<String>)handle).changeState(JobHandle.State.SENT)); - verify(listener).onJobQueued(handle); verify(listener).onJobStarted(handle); verify(listener).onJobSucceeded(same(handle), eq(handle.get())); }
