Do not block; show more job info

Author: briandealwis

plugins/com.google.cloud.tools.eclipse.test.util/src/com/google/cloud/tools/eclipse/test/util/project/ProjectUtils.java

@@ -30,6 +30,7 @@
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -206,10 +207,8 @@ public static void waitForProjects(Runnable delayTactic, IProject... projects) {
         // wait a little bit to give the builders a chance
         delayTactic.run();
 
-        // wait for any previously-identified build jobs
-        for (Job job : jobs) {
-          job.join();
-        }
+        // NB: don't join jobs: see #1529
+        // for details: https://github.com/GoogleCloudPlatform/google-cloud-eclipse/pull/1529
 
         // identify any pending build-related jobs
         jobs = findPendingBuildJobs(projects);
@@ -232,7 +231,7 @@ public static void waitForProjects(Runnable delayTactic, IProject... projects) {
           dumpJobsState();
         }
       } while (!jobs.isEmpty() || buildErrorsChanging);
-    } catch (CoreException | InterruptedException ex) {
+    } catch (CoreException ex) {
       throw new RuntimeException(ex);
     }
   }
@@ -266,8 +265,8 @@ private static void dumpJobsState() {
       }
       Object blockingJob = null;
       try {
-        blockingJob =
-            ReflectionUtil.invoke(Job.getJobManager(), "findBlockingJob", InternalJob.class, job);
+        blockingJob = ReflectionUtil.invoke(Job.getJobManager(), "findBlockingJob",
+            new Class<?>[] {InternalJob.class}, InternalJob.class, job);
       } catch (Exception ex) {
         System.err.println("Unable to fetch blocking-job: " + ex);
       }
@@ -294,6 +293,13 @@ private static Collection<Job> findPendingBuildJobs(IProject... projects) {
       Collections.addAll(jobs, jobManager.find(
           project.getName() + ValidatorManager.VALIDATOR_JOB_FAMILY));
     }
+    // remove sleeping jobs
+    for (Iterator<Job> iter = jobs.iterator(); iter.hasNext();) {
+      Job job = iter.next();
+      if (job.getState() == Job.SLEEPING) {
+        iter.remove();
+      }
+    }
     return jobs;
   }
 

plugins/com.google.cloud.tools.eclipse.test.util/src/com/google/cloud/tools/eclipse/test/util/reflection/ReflectionUtil.java

@@ -42,6 +42,13 @@ public static <T> T invoke(Object object, String methodName, Class<T> returnType
     for (int i = 0; i < parameters.length; i++) {
       parameterTypes[i] = parameters[i] == null ? Object.class : parameters[i].getClass();
     }
+    return invoke(object, methodName, parameterTypes, returnType, parameters);
+  }
+
+  /** Invoke a method. */
+  public static <T> T invoke(Object object, String methodName, Class<?>[] parameterTypes,
+      Class<T> returnType, Object... parameters) throws NoSuchMethodException, SecurityException,
+      IllegalAccessException, IllegalArgumentException, InvocationTargetException {
     Method method = object.getClass().getDeclaredMethod(methodName, parameterTypes);
     method.setAccessible(true);
     return returnType.cast(method.invoke(object, parameters));