This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-10071 in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit 22a9c38260c8c48d59760e72c018e61bcb2c797b Author: Dmitriy Pavlov <[email protected]> AuthorDate: Mon Dec 3 15:10:16 2018 +0300 IGNITE-10071 Fix for case then background upload of a build and simultaneous bot restart may result in a queued build persisted but actually build is finished --- build.gradle | 1 - .../teamcity/ignited/fatbuild/ProactiveFatBuildSync.java | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 0b9df5e..456061d 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,6 @@ allprojects { ext { jettyVer = '9.4.12.v20180830' - //ignVer = '2.6.0' ignVer = '2.7.0' // ignVer = '2.7.0-SNAPSHOT' diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/ProactiveFatBuildSync.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/ProactiveFatBuildSync.java index e8a30c9..753a12f 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/ProactiveFatBuildSync.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/ProactiveFatBuildSync.java @@ -274,12 +274,12 @@ public class ProactiveFatBuildSync { if (savedVer.isFakeStub()) refCompacted.setId(buildId); //to provide possiblity to save the build - final String srvNme = conn.serverId(); - final int srvIdMask = ITeamcityIgnited.serverIdToInt(srvNme); + final String srvName = conn.serverId(); + final int srvIdMask = ITeamcityIgnited.serverIdToInt(srvName); buildRefDao.save(srvIdMask, refCompacted); - runHistSync.saveToHistoryLater(srvNme, savedVer); + runHistSync.saveToHistoryLater(srvName, savedVer); return savedVer; } @@ -297,8 +297,8 @@ public class ProactiveFatBuildSync { // System.err.println(Thread.currentThread().getName()+ ": Build " + buildId); //todo some sort of locking to avoid double requests - final String srvNme = conn.serverId(); - final int srvIdMask = ITeamcityIgnited.serverIdToInt(srvNme); + final String srvName = conn.serverId(); + final int srvIdMask = ITeamcityIgnited.serverIdToInt(srvName); Build build; List<TestOccurrencesFull> tests = new ArrayList<>(); @@ -340,7 +340,7 @@ public class ProactiveFatBuildSync { } catch (Exception e) { if (Throwables.getRootCause(e) instanceof FileNotFoundException) { - logger.info("Loading build [" + buildId + "] for server [" + srvNme + "] failed:" + e.getMessage(), e); + logger.info("Loading build [" + buildId + "] for server [" + srvName + "] failed:" + e.getMessage(), e); if (existingBuild != null) { build = existingBuild.toBuild(compactor); @@ -358,7 +358,7 @@ public class ProactiveFatBuildSync { build.setCancelled(); } } else { - logger.error("Loading build [" + buildId + "] for server [" + srvNme + "] failed:" + e.getMessage(), e); + logger.error("Loading build [" + buildId + "] for server [" + srvName + "] failed:" + e.getMessage(), e); e.printStackTrace();
