This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new 7355602 Parallelism fixed for recent build resolve; Timing of get
requests fixed.
7355602 is described below
commit 73556024caf49ffd127a0ba0d3f2e3d5ee94b6af
Author: Dmitriy Pavlov <dpav...@apache.org>
AuthorDate: Thu Sep 20 11:09:20 2018 +0300
Parallelism fixed for recent build resolve;
Timing of get requests fixed.
---
.../main/java/org/apache/ignite/ci/BuildChainProcessor.java | 12 +++++++++---
.../src/main/java/org/apache/ignite/ci/util/HttpUtil.java | 4 +++-
jetty-launcher/build.gradle | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/BuildChainProcessor.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/BuildChainProcessor.java
index fde6b77..4d0326b 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/BuildChainProcessor.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/BuildChainProcessor.java
@@ -114,15 +114,21 @@ public class BuildChainProcessor {
.unordered()
.flatMap(ref -> dependencies(teamcity,
ref)).filter(Objects::nonNull)
.flatMap(ref -> dependencies(teamcity,
ref)).filter(Objects::nonNull)
- .filter(ref -> ensureUnique(unique, ref));
+ .filter(ref -> ensureUnique(unique, ref))
+ ;
- uniqueBuldsInvolved
+ final List<Future<Stream<BuildRef>>> phase1Submitted =
uniqueBuldsInvolved
.map((buildRef) -> executor.submit(
() -> replaceWithRecent(teamcity,
includeLatestRebuild, unique, buildRef, entryPoints.size())))
+ .collect(Collectors.toList());
+
+ final List<Future<? extends Stream<? extends BuildRef>>>
phase2Submitted = phase1Submitted.stream()
.map(FutureUtil::getResult)
.map((s) -> executor.submit(
() -> processBuildList(teamcity, buildsCtxMap, s)))
- .forEach(FutureUtil::getResult);
+ .collect(Collectors.toList());
+
+ phase2Submitted.forEach(FutureUtil::getResult);
ArrayList<MultBuildRunCtx> contexts = new
ArrayList<>(buildsCtxMap.values());
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/util/HttpUtil.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/util/HttpUtil.java
index 4730606..a703c12 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/util/HttpUtil.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/util/HttpUtil.java
@@ -74,8 +74,10 @@ public class HttpUtil {
con.setRequestProperty("Keep-Alive", "header");
con.setRequestProperty("accept-charset",
StandardCharsets.UTF_8.toString());
+ int resCode = con.getResponseCode();
+
logger.info(Thread.currentThread().getName() + ": Required: " +
started.elapsed(TimeUnit.MILLISECONDS)
- + "ms : Sending 'GET' request to : " + url);
+ + "ms : Sending 'GET' request to : " + url + " Response: " +
resCode);
return getInputStream(con);
}
diff --git a/jetty-launcher/build.gradle b/jetty-launcher/build.gradle
index b9560b6..cdaeaea 100644
--- a/jetty-launcher/build.gradle
+++ b/jetty-launcher/build.gradle
@@ -29,7 +29,7 @@ repositories {
mainClassName = 'org.apache.ignite.ci.TcHelperJettyLauncher'
applicationDefaultJvmArgs = ["-Dteamcity.helper.home=../work",
"-Dteamcity.bot.regionsize=16", // 16g Durable
Memory region
- "-Dhttp.maxConnections=100",
+ "-Dhttp.maxConnections=120",
"-server",
"-Xmx10g",
"-XX:+AlwaysPreTouch",
