[ignite-teamcity-bot] branch performance updated: Non silent results processing from the future

[dpavlov]

This is an automated email from the ASF dual-hosted git repository.

dpavlov pushed a commit to branch performance
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git


The following commit(s) were added to refs/heads/performance by this push:
     new 489cdf5  Non silent results processing from the future
489cdf5 is described below

commit 489cdf58300441ba3e6afa54077ab56ef0b6a75f
Author: Dmitriy Pavlov <dpav...@apache.org>
AuthorDate: Wed Sep 19 18:17:52 2018 +0300

    Non silent results processing from the future
---
 .../org/apache/ignite/ci/BuildChainProcessor.java  |  4 ++--
 .../org/apache/ignite/ci/util/ExceptionUtil.java   |  3 +++
 .../java/org/apache/ignite/ci/util/FutureUtil.java | 26 ++++++++++++++++++++++
 .../org/apache/ignite/ci/web/model/Version.java    |  2 +-
 4 files changed, 32 insertions(+), 3 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 b75418a..8b1e690 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
@@ -121,12 +121,12 @@ public class BuildChainProcessor {
                 .map((buildRef) -> executor.submit(() -> {
                     return replaceWithRecent(teamcity, includeLatestRebuild, 
unique, buildRef, entryPoints.size());
                 }))
-                .map(FutureUtil::getResultSilent)
+                .map(FutureUtil::getResult)
                 .map((s) -> executor.submit(()-> {
                     return processBuildList(teamcity, buildsCtxMap, s);
                         }
                 ))
-                .forEach(FutureUtil::getResultSilent);
+                .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/ExceptionUtil.java
 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/util/ExceptionUtil.java
index c1741d1..78ea494 100644
--- 
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/util/ExceptionUtil.java
+++ 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/util/ExceptionUtil.java
@@ -30,6 +30,9 @@ public class ExceptionUtil {
      * @param e Exception.
      */
     public static RuntimeException propagateException(Exception e) {
+        if(e instanceof InterruptedException)
+            Thread.currentThread().interrupt();
+
         final Optional<Throwable> any = Throwables.getCausalChain(e)
             .stream()
             .filter(th -> (th instanceof 
ServiceUnauthorizedException)).findAny();
diff --git 
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/util/FutureUtil.java 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/util/FutureUtil.java
index f2a3ddc..4309ce1 100644
--- 
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/util/FutureUtil.java
+++ 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/util/FutureUtil.java
@@ -53,4 +53,30 @@ public class FutureUtil {
 
         return logCheckRes;
     }
+
+    /**
+     * @param fut Future.
+     * @return result or null if calculation failed
+     */
+    @Nullable public static <V> V getResult(Future<V> fut) {
+        V logCheckRes = null;
+
+        try {
+            logCheckRes = fut.get();
+        }
+        catch (InterruptedException e) {
+            logger.info("Future get reported interrupt ", e);
+
+            throw ExceptionUtil.propagateException(e);
+        }
+        catch (ExecutionException e) {
+            e.printStackTrace();
+
+            logger.error("Failed to get future result", e);
+
+            throw ExceptionUtil.propagateException(e);
+        }
+
+        return logCheckRes;
+    }
 }
diff --git 
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
index 024b08e..1a08ce6 100644
--- 
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
+++ 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
@@ -22,7 +22,7 @@ package org.apache.ignite.ci.web.model;
     public static final String DEFAULT_CONTACT = "d...@ignite.apache.org";
 
     /** TC Helper Version. */
-    public String version = "20180917";
+    public String version = "20180919";
 
     /** Ignite version. */
     public String ignVer;