You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2015/01/30 22:00:07 UTC
svn commit: r1656119 - in /hive/branches/branch-1.1: ./
spark-client/src/main/java/org/apache/hive/spark/client/RemoteDriver.java
Author: brock
Date: Fri Jan 30 21:00:07 2015
New Revision: 1656119
URL: http://svn.apache.org/r1656119
Log:
HIVE-9493: Failed job may not throw exceptions [Spark Branch] (Rui via Xuefu)
Modified:
hive/branches/branch-1.1/ (props changed)
hive/branches/branch-1.1/spark-client/src/main/java/org/apache/hive/spark/client/RemoteDriver.java
Propchange: hive/branches/branch-1.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 30 21:00:07 2015
@@ -1,6 +1,6 @@
/hive/branches/branch-0.11:1480385,1480458,1481120,1481344,1481346,1481348,1481352,1483872,1505184
/hive/branches/cbo:1605012-1627125
-/hive/branches/spark:1608589-1654414,1654553,1654869,1654873
+/hive/branches/spark:1608589-1654414,1654553,1654869,1654873,1655427
/hive/branches/tez:1494760-1622766
/hive/branches/vectorization:1466908-1527856
/hive/trunk:1655202,1655210,1655213,1655436,1655460,1655894-1655895,1656114
Modified: hive/branches/branch-1.1/spark-client/src/main/java/org/apache/hive/spark/client/RemoteDriver.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-1.1/spark-client/src/main/java/org/apache/hive/spark/client/RemoteDriver.java?rev=1656119&r1=1656118&r2=1656119&view=diff
==============================================================================
--- hive/branches/branch-1.1/spark-client/src/main/java/org/apache/hive/spark/client/RemoteDriver.java (original)
+++ hive/branches/branch-1.1/spark-client/src/main/java/org/apache/hive/spark/client/RemoteDriver.java Fri Jan 30 21:00:07 2015
@@ -354,6 +354,11 @@ public class RemoteDriver {
if (sparkCounters != null) {
counters = sparkCounters.snapshot();
}
+ // make sure job has really succeeded
+ // at this point, future.get shall not block us
+ for (JavaFutureAction<?> future : jobs) {
+ future.get();
+ }
protocol.jobFinished(req.id, result, null, counters);
} catch (Throwable t) {
// Catch throwables in a best-effort to report job status back to the client. It's