This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10562
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-10562 by this push:
new cbd2ffd IGNITE-10562 TC Bot DB contains invalid values for build
references ID maps to value with other ID.
cbd2ffd is described below
commit cbd2ffd5b9d708d5498753301936894b18c41ab2
Author: Dmitriy Pavlov <[email protected]>
AuthorDate: Thu Dec 6 14:21:55 2018 +0300
IGNITE-10562 TC Bot DB contains invalid values for build references ID maps
to value with other ID.
---
.../java/org/apache/ignite/ci/runners/RemoteClientTmpHelper.java | 9 ++++++++-
.../ci/teamcity/ignited/fatbuild/ProactiveFatBuildSync.java | 1 -
.../src/main/java/org/apache/ignite/ci/web/model/Version.java | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/RemoteClientTmpHelper.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/RemoteClientTmpHelper.java
index 772c62f..d987067 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/RemoteClientTmpHelper.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/RemoteClientTmpHelper.java
@@ -50,10 +50,17 @@ public class RemoteClientTmpHelper {
public static String DUMPS = "dumps";
private static boolean dumpDict = false;
+ /**
+ * @param args Args.
+ */
public static void main(String[] args) {
+ int inconsistent;
+
try (Ignite ignite = tcbotServer()) {
- validateBuildIdConsistency(ignite);
+ inconsistent = validateBuildIdConsistency(ignite);
}
+
+ System.err.println("Inconsistent builds in queue found [" +
inconsistent + "]");
}
public static int validateBuildIdConsistency(Ignite ignite) {
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 e4a4439..3f68542 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
@@ -295,7 +295,6 @@ public class ProactiveFatBuildSync {
@SuppressWarnings({"WeakerAccess"})
@AutoProfiling
public FatBuildCompacted reloadBuild(ITeamcityConn conn, int buildId,
@Nullable FatBuildCompacted existingBuild) {
- // System.err.println(Thread.currentThread().getName()+ ": Build " +
buildId);
//todo some sort of locking to avoid double requests
final String srvName = conn.serverId();
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 dd0b9ef..ea6df15 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
@@ -25,7 +25,7 @@ package org.apache.ignite.ci.web.model;
public static final String GITHUB_REF =
"https://github.com/apache/ignite-teamcity-bot";
/** TC Bot Version. */
- public static final String VERSION = "20181205";
+ public static final String VERSION = "20181206";
/** TC Bot Version. */
public String version = VERSION;