Merge branch 'slxu-fix-network-backpressure' into slxu-kill-query-at-…

…aborted-downloading
uwescience · Aug 25, 2014 · 5219f84 · 5219f84
2 parents 30dda95 + 9aec93b
commit 5219f84
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/systemtest/edu/washington/escience/myria/systemtest/SystemTestBase.java b/systemtest/edu/washington/escience/myria/systemtest/SystemTestBase.java
@@ -102,7 +102,8 @@ protected void starting(Description description) {
 
   public static final int DEFAULT_REST_PORT = 8753;
 
-  public int WORKER_BOOTUP_TIMEOUT_IN_SECOND_PER_WORKER = 5; // wait for 10 seconds for workers to get booted
+  /** Wait up to 15 seconds per work for workers to start. */
+  public int WORKER_BOOTUP_TIMEOUT_IN_SECOND_PER_WORKER = 15;
 
   public volatile int masterPort;
   public volatile int masterDaemonPort = DEFAULT_REST_PORT;