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 2018/12/05 19:16:55 UTC
[ignite-teamcity-bot] branch master updated: IGNITE-10562 Locate
and demonstrate the problem
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 4f85384 IGNITE-10562 Locate and demonstrate the problem
4f85384 is described below
commit 4f85384beb89626999d38b817e4bfd569cec0249
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Wed Dec 5 22:16:51 2018 +0300
IGNITE-10562 Locate and demonstrate the problem
---
.../ignite/ci/runners/RemoteClientTmpHelper.java | 113 ++++++++++++++++++---
.../ignite/ci/teamcity/ignited/BuildRefDao.java | 4 +-
.../ci/teamcity/ignited/IgniteStringCompactor.java | 4 +
.../ci/teamcity/ignited/fatbuild/FatBuildDao.java | 12 +--
.../ci/teamcity/ignited/BuildKeyUnitTest.java | 51 ++++++++++
5 files changed, 161 insertions(+), 23 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 3fd622a..2c782ef 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
@@ -19,26 +19,83 @@ package org.apache.ignite.ci.runners;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
+import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.UncheckedIOException;
import javax.cache.Cache;
+import javax.xml.bind.JAXBException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
+import org.apache.ignite.ci.ITeamcity;
+import org.apache.ignite.ci.IgnitePersistentTeamcity;
+import org.apache.ignite.ci.tcmodel.hist.BuildRef;
+import org.apache.ignite.ci.tcmodel.result.Build;
import org.apache.ignite.ci.teamcity.ignited.BuildRefCompacted;
import org.apache.ignite.ci.teamcity.ignited.BuildRefDao;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnited;
import org.apache.ignite.ci.teamcity.ignited.IgniteStringCompactor;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildCompacted;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildDao;
+import org.apache.ignite.ci.util.XmlUtil;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.logger.slf4j.Slf4jLogger;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.jetbrains.annotations.NotNull;
public class RemoteClientTmpHelper {
private static boolean dumpDict = false;
+ public static void main(String[] args) {
+ try (Ignite ignite = tcbotServer()) {
+ String apacheSrvName = "apache";
+ int apache = ITeamcityIgnited.serverIdToInt(apacheSrvName);
+
+ IgniteCache<String, IgniteStringCompactor.CompactorEntity> strings = ignite.cache(IgniteStringCompactor.STRINGS_CACHE);
+ IgniteStringCompactor.CompactorEntity queuedEnt = strings.get(BuildRef.STATE_QUEUED);
+ int stateQ = queuedEnt.id();
+ IgniteCache<Long, BuildRefCompacted> cacheRef = ignite.cache(BuildRefDao.TEAMCITY_BUILD_CACHE_NAME);
+ IgniteCache<Long, FatBuildCompacted> cacheFat = ignite.cache(FatBuildDao.TEAMCITY_FAT_BUILD_CACHE_NAME);
+
+ String oldBuild = IgnitePersistentTeamcity.ignCacheNme(IgnitePersistentTeamcity.BUILDS, apacheSrvName);
+ IgniteCache<String, Build> buildCache = ignite.cache(oldBuild);
+ cacheRef.forEach(
+ entry -> {
+ BuildRefCompacted buildRef = entry.getValue();
+
+ int buildId = BuildRefDao.cacheKeyToBuildId(entry.getKey());
+
+ if (buildRef.state() == stateQ && BuildRefDao.isKeyForServer(entry.getKey(), apache)) {
+
+ FatBuildCompacted fat = cacheFat.get(FatBuildDao.buildIdToCacheKey(apache, buildId));
+ if (fat != null && fat.getId() != buildId) {
+ dumpBuildRef(buildId, buildRef);
+ dumpFatBuild(cacheFat, apache, buildId);
+ String href = ITeamcity.buildHref(buildId);
+ Build fatBuild = buildCache.get(href);
+ dumpOldBuild(buildId, href, fatBuild);
+ }
+ }
+ }
+ );
+ }
+ }
+
+ public static void dumpOldBuild(int buildId, String href, Build fatBuild) {
+ try (FileWriter writer = new FileWriter(new File(dumpsDir(), "BuildOld" + buildId + ".txt"))) {
+ writer.write("<!--" + href + "-->\n");
+ writer.write(XmlUtil.save(fatBuild));
+ }
+ catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ catch (JAXBException e) {
+ e.printStackTrace();
+ }
+ }
+
private static void setupDisco(IgniteConfiguration cfg) {
final TcpDiscoverySpi spi = new TcpDiscoverySpi();
final int locPort = 54433;
@@ -52,18 +109,10 @@ public class RemoteClientTmpHelper {
cfg.setDiscoverySpi(spi);
}
- public static void main(String[] args) throws IOException {
- final IgniteConfiguration cfg = new IgniteConfiguration();
-
- setupDisco(cfg);
-
- cfg.setGridLogger(new Slf4jLogger());
+ public static void mainExport(String[] args) throws IOException {
+ final Ignite ignite = tcbotServer();
- cfg.setClientMode(true);
-
- final Ignite ignite = Ignition.start(cfg);
-
- if(dumpDict) {
+ if (dumpDict) {
IgniteCache<String, Object> strings = ignite.cache(IgniteStringCompactor.STRINGS_CACHE);
try (FileWriter writer = new FileWriter("Dictionary.txt")) {
for (Cache.Entry<String, Object> next1 : strings) {
@@ -72,7 +121,7 @@ public class RemoteClientTmpHelper {
}
}
}
- if(false) {
+ if (false) {
IgniteCache<Long, FatBuildCompacted> cache1 = ignite.cache(FatBuildDao.TEAMCITY_FAT_BUILD_CACHE_NAME);
int apache = ITeamcityIgnited.serverIdToInt("apache");
@@ -88,21 +137,55 @@ public class RemoteClientTmpHelper {
}
}
+ public static Ignite tcbotServer() {
+ final IgniteConfiguration cfg = new IgniteConfiguration();
+
+ setupDisco(cfg);
+
+ cfg.setGridLogger(new Slf4jLogger());
+
+ cfg.setClientMode(true);
+
+ return Ignition.start(cfg);
+ }
+
public static void dumpBuildRef(IgniteCache<Long, BuildRefCompacted> cache, int apache, int id) throws IOException {
long l = BuildRefDao.buildIdToCacheKey(apache, id);
BuildRefCompacted compacted = cache.get(l);
+ dumpBuildRef(id, compacted);
+ }
+
+ public static void dumpBuildRef(int id, BuildRefCompacted compacted) {
Preconditions.checkNotNull(compacted, "Can't find build by ID " + id);
- try (FileWriter writer = new FileWriter("BuildRef " + id + ".txt")) {
+
+ File dumps = dumpsDir();
+
+ try (FileWriter writer = new FileWriter(new File(dumps, "BuildRef " + id + ".txt"))) {
writer.write(compacted.toString());
}
+ catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
}
- public static void dumpFatBuild(IgniteCache<Long, FatBuildCompacted> cache, int apache, int id) throws IOException {
+ @NotNull public static File dumpsDir() {
+ File dumps = new File("dumps");
+ if (!dumps.exists())
+ Preconditions.checkState(dumps.mkdirs());
+ return dumps;
+ }
+
+ public static FatBuildCompacted dumpFatBuild(IgniteCache<Long, FatBuildCompacted> cache, int apache, int id) {
long l = FatBuildDao.buildIdToCacheKey(apache, id);
FatBuildCompacted compacted = cache.get(l);
Preconditions.checkNotNull(compacted, "Can't find build by ID " + id);
- try (FileWriter writer = new FileWriter("Build " + id + ".txt")) {
+
+ try (FileWriter writer = new FileWriter(new File(dumpsDir(), "Build " + id + ".txt"))) {
writer.write(compacted.toString());
}
+ catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ return compacted;
}
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/BuildRefDao.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/BuildRefDao.java
index de96fdc..19015ce 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/BuildRefDao.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/BuildRefDao.java
@@ -79,7 +79,7 @@ public class BuildRefDao {
* @param key Key.
* @param srvId Server id.
*/
- private boolean isKeyForServer(Long key, int srvId) {
+ public static boolean isKeyForServer(Long key, int srvId) {
return key!=null && key >> 32 == srvId;
}
@@ -129,7 +129,7 @@ public class BuildRefDao {
*/
public static int cacheKeyToBuildId(Long cacheKey) {
long l = cacheKey << 32;
- return (int) (l>>32);
+ return (int)(l >> 32);
}
/**
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/IgniteStringCompactor.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/IgniteStringCompactor.java
index f6c8545..bb4e101 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/IgniteStringCompactor.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/IgniteStringCompactor.java
@@ -80,6 +80,10 @@ public class IgniteStringCompactor implements IStringCompactor {
.add("id", id)
.toString();
}
+
+ public int id() {
+ return id;
+ }
}
private void initIfNeeded() {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildDao.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildDao.java
index 0e2e4bd..9979bed 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildDao.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildDao.java
@@ -80,7 +80,7 @@ public class FatBuildDao {
* @param existingBuild existing version of build in the DB.
* @return Fat Build saved (if modifications detected), otherwise null.
*/
- public FatBuildCompacted saveBuild(long srvIdMaskHigh,
+ public FatBuildCompacted saveBuild(int srvIdMaskHigh,
int buildId,
@NotNull Build build,
@NotNull List<TestOccurrencesFull> tests,
@@ -115,7 +115,7 @@ public class FatBuildDao {
}
@AutoProfiling
- public void putFatBuild(long srvIdMaskHigh, int buildId, FatBuildCompacted newBuild) {
+ public void putFatBuild(int srvIdMaskHigh, int buildId, FatBuildCompacted newBuild) {
buildsCache.put(buildIdToCacheKey(srvIdMaskHigh, buildId), newBuild);
}
@@ -136,8 +136,8 @@ public class FatBuildDao {
* @param srvIdMaskHigh Server id mask high.
* @param buildId Build id.
*/
- public static long buildIdToCacheKey(long srvIdMaskHigh, int buildId) {
- return (long)buildId | srvIdMaskHigh << 32;
+ public static long buildIdToCacheKey(int srvIdMaskHigh, int buildId) {
+ return (long)buildId | (long)srvIdMaskHigh << 32;
}
/**
@@ -170,8 +170,8 @@ public class FatBuildDao {
* @param key Key.
* @param srvId Server id.
*/
- private boolean isKeyForServer(Long key, int srvId) {
- return key!=null && key >> 32 == srvId;
+ public static boolean isKeyForServer(Long key, int srvId) {
+ return key != null && key >> 32 == srvId;
}
public boolean containsKey(int srvIdMaskHigh, int buildId) {
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/BuildKeyUnitTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/BuildKeyUnitTest.java
new file mode 100644
index 0000000..97df738
--- /dev/null
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/BuildKeyUnitTest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ci.teamcity.ignited;
+
+import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildDao;
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertTrue;
+
+/**
+ *
+ */
+public class BuildKeyUnitTest {
+ @Test
+ public void testKeyTransformations() {
+ int apache = ITeamcityIgnited.serverIdToInt("apache");
+
+ for (int i = 0; i < 10000000; i+=132) {
+ int buildId = 2264667 + i;
+ long cacheKey = FatBuildDao.buildIdToCacheKey(apache, buildId);
+
+ assertTrue(FatBuildDao.isKeyForServer(cacheKey, apache));
+
+ assertEquals(buildId, BuildRefDao.cacheKeyToBuildId(cacheKey));
+
+ long cacheKey2 = BuildRefDao.buildIdToCacheKey(apache, buildId);
+
+ assertTrue(BuildRefDao.isKeyForServer(cacheKey2, apache));
+
+ assertEquals(cacheKey, cacheKey2);
+
+ assertEquals(buildId, BuildRefDao.cacheKeyToBuildId(cacheKey2));
+ }
+ }
+}