You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2017/11/02 03:21:21 UTC
[10/50] [abbrv] incubator-edgent git commit: fix earlier
AbstractTester change and reduce 'ci' tmo multiplier
fix earlier AbstractTester change and reduce 'ci' tmo multiplier
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/9bd024d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/9bd024d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/9bd024d8
Branch: refs/heads/develop
Commit: 9bd024d88a32ca2d84bdc92cb9dfdcfc6537b65b
Parents: fcfaf77
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 24 19:43:38 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 24 19:43:38 2017 -0400
----------------------------------------------------------------------
.../test/java/org/apache/edgent/test/topology/TStreamTest.java | 2 +-
.../main/java/org/apache/edgent/runtime/etiao/Executable.java | 2 +-
.../org/apache/edgent/topology/spi/tester/AbstractTester.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/9bd024d8/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
----------------------------------------------------------------------
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java b/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
index 0e55fe2..441d43f 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
+++ b/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
@@ -859,7 +859,7 @@ public abstract class TStreamTest extends TopologyAbstractTest {
// in the face of overloaded/slow build/test servers.
if (Boolean.getBoolean("edgent.build.ci")) {
// could do something like base the decision of the current value of timeout and/or units
- return timeout * 10;
+ return timeout * 2; // try to minimize
}
return timeout;
}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/9bd024d8/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
----------------------------------------------------------------------
diff --git a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
index 453003c..46c7de0 100644
--- a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
+++ b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
@@ -212,7 +212,7 @@ public class Executable implements RuntimeServices {
// in the face of overloaded/slow build/test servers.
if (Boolean.getBoolean("edgent.build.ci")) {
// could do something like base the decision of the current value of timeout and/or units
- return timeout * 10;
+ return timeout * 2; // try to minimize
}
return timeout;
}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/9bd024d8/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
----------------------------------------------------------------------
diff --git a/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java b/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
index 07b72d2..0c10a08 100644
--- a/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
+++ b/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
@@ -49,7 +49,7 @@ public abstract class AbstractTester implements Tester {
if (Boolean.getBoolean("edgent.build.ci")) {
// could do something like base the decision of the current value of timeout and/or units
- return timeout * 10;
+ return timeout * 2; // minimize the multiplier because of the aforementioned await-tmo test cases
}
return timeout;
}
@@ -59,8 +59,8 @@ public abstract class AbstractTester implements Tester {
long timeout, TimeUnit unit) throws Exception {
long tmoMsec = Math.max(unit.toMillis(timeout), 1000);
- long maxTime = System.currentTimeMillis() + tmoMsec;
tmoMsec = getTimeoutValue(tmoMsec, TimeUnit.MILLISECONDS);
+ long maxTime = System.currentTimeMillis() + tmoMsec;
Future<?> future = submitter.submit(topology(), config);
// wait at most tmoMsec for the submit to create the job