svn commit: r1821165 - in /pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/spark/JobStatisticCollector.java

[szita]

Author: szita
Date: Mon Jan 15 15:11:21 2018
New Revision: 1821165

URL: http://svn.apache.org/viewvc?rev=1821165&view=rev
Log:
PIG-5320: TestCubeOperator#testRollupBasic is flaky on Spark 2.2 (nkollar via 
szita)

Modified:
    pig/trunk/CHANGES.txt
    
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/spark/JobStatisticCollector.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1821165&r1=1821164&r2=1821165&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Jan 15 15:11:21 2018
@@ -64,6 +64,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-5320: TestCubeOperator#testRollupBasic is flaky on Spark 2.2 (nkollar via 
szita)
+
 PIG-5327: Check for DAG status before trying to kill (rohini)
 
 PIG-5325: Schema disambiguation can't be turned off for nested schemas (szita)

Modified: 
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/spark/JobStatisticCollector.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/spark/JobStatisticCollector.java?rev=1821165&r1=1821164&r2=1821165&view=diff
==============================================================================
--- 
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/spark/JobStatisticCollector.java
 (original)
+++ 
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/spark/JobStatisticCollector.java
 Mon Jan 15 15:11:21 2018
@@ -52,15 +52,13 @@ public class JobStatisticCollector {
         }
     }
 
-    public boolean waitForJobToEnd(int jobId) throws InterruptedException {
+    public void waitForJobToEnd(int jobId) throws InterruptedException {
         synchronized (sparkListener) {
-            if (finishedJobIds.contains(jobId)) {
-                finishedJobIds.remove(jobId);
-                return true;
+            while (!finishedJobIds.contains(jobId)) {
+                sparkListener.wait();
             }
 
-            sparkListener.wait();
-            return false;
+            finishedJobIds.remove(jobId);
         }
     }