You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/06/21 17:08:09 UTC
[ignite-teamcity-bot] 02/02: Trusted tests & suite history
performance fixes: tests fix, disable of call to old hist services
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch test-hist-performance
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit c802af79427d4472ad1708b820ca9d42bad38e63
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Fri Jun 21 20:05:55 2019 +0300
Trusted tests & suite history performance fixes: tests fix, disable of call to old hist services
---
.../apache/ignite/ci/teamcity/ignited/TeamcityIgnitedMock.java | 10 ++++------
.../apache/ignite/tcbot/engine/chain/BuildChainProcessor.java | 5 +++--
.../org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java | 5 ++++-
.../java/org/apache/ignite/tcignited/TeamcityIgnitedImpl.java | 3 ++-
.../apache/ignite/tcignited/build/ProactiveFatBuildSync.java | 3 ++-
5 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedMock.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedMock.java
index 4f9eacd..c744616 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedMock.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedMock.java
@@ -90,10 +90,10 @@ public class TeamcityIgnitedMock {
.collect(Collectors.toList());
});
- when(tcIgnited.getTestRunHist(anyString(), anyString()))
+ when(tcIgnited.getTestRunHist(anyInt(), anyInt(), anyInt()))
.thenAnswer((inv) -> {
- final String name = inv.getArgument(0);
- final String branch = inv.getArgument(1);
+ final Integer tstName = inv.getArgument(0);
+ final Integer branchId = inv.getArgument(2);
// System.out.println("Search history " + name + " in " + branch + ": " );
if (histCache.isEmpty()) {
@@ -103,11 +103,9 @@ public class TeamcityIgnitedMock {
}
}
- final Integer tstName = c.getStringIdIfPresent(name);
if (tstName == null)
return null;
- final Integer branchId = c.getStringIdIfPresent(branch);
if (branchId == null)
return null;
@@ -115,7 +113,7 @@ public class TeamcityIgnitedMock {
final RunHistCompacted runHistCompacted = histCache.get(key);
- System.out.println("Test history " + name + " in " + branch + " => " + runHistCompacted);
+ System.out.println("Test history " + c.getStringFromId(tstName) + " in " + c.getStringFromId(branchId) + " => " + runHistCompacted);
return runHistCompacted;
});
diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/BuildChainProcessor.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/BuildChainProcessor.java
index f8ee591..144c6ef 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/BuildChainProcessor.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/BuildChainProcessor.java
@@ -144,6 +144,8 @@ public class BuildChainProcessor {
if (entryPoints.isEmpty())
return new FullChainRunCtx(Build.createFakeStub());
+ Integer failRateBranchId = compactor.getStringIdIfPresent(RunHistSync.normalizeBranch(failRateBranch));
+
Map<Integer, Future<FatBuildCompacted>> builds = loadAllBuildsInChains(entryPoints, mode, tcIgn);
Map<String, List<Future<FatBuildCompacted>>> freshRebuilds = new ConcurrentHashMap<>();
@@ -185,8 +187,7 @@ public class BuildChainProcessor {
});
Function<MultBuildRunCtx, Float> function = ctx -> {
- IRunHistory runStat = ctx.history(tcIgn,
- compactor.getStringIdIfPresent(RunHistSync.normalizeBranch(failRateBranch)));
+ IRunHistory runStat = ctx.history(tcIgn, failRateBranchId);
if (runStat == null)
return 0f;
diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java
index 6d45206..232b88d 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java
@@ -644,7 +644,10 @@ public class MultBuildRunCtx implements ISuiteResults {
* @param baseBranchId Base branch id.
*/
public IRunHistory history(ITeamcityIgnited tcIgn, Integer baseBranchId) {
+ if (baseBranchId == null)
+ return null;
+
return historyCacheMap.computeIfAbsent(baseBranchId,
- (k)-> tcIgn.getSuiteRunHist(buildTypeIdId(), k));
+ (k) -> tcIgn.getSuiteRunHist(buildTypeIdId(), k));
}
}
diff --git a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/TeamcityIgnitedImpl.java b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/TeamcityIgnitedImpl.java
index 81a74c8..f15ecab 100644
--- a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/TeamcityIgnitedImpl.java
+++ b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/TeamcityIgnitedImpl.java
@@ -511,7 +511,8 @@ public class TeamcityIgnitedImpl implements ITeamcityIgnited {
// schedule find missing later
fatBuildSync.ensureActualizationRequested(srvCode, conn);
- runHistSync.invokeLaterFindMissingHistory(srvCode);
+ //todo remove unused code
+ // runHistSync.invokeLaterFindMissingHistory(srvCode);
}
/** {@inheritDoc} */
diff --git a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/build/ProactiveFatBuildSync.java b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/build/ProactiveFatBuildSync.java
index 3e01c05..8ad06a7 100644
--- a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/build/ProactiveFatBuildSync.java
+++ b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/build/ProactiveFatBuildSync.java
@@ -315,7 +315,8 @@ public class ProactiveFatBuildSync {
buildRefDao.save(srvIdMask, refCompacted);
- runHistSync.saveToHistoryLater(srvCode, savedVer);
+ //todo remove unused code
+ // runHistSync.saveToHistoryLater(srvCode, savedVer);
return savedVer;
}