You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dg...@apache.org on 2019/01/26 11:35:28 UTC
[ignite] branch master updated: IGNITE-11095 FIx flaky fail
WalCompactionTest - Fixes #5937.
This is an automated email from the ASF dual-hosted git repository.
dgovorukhin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new fc83c12 IGNITE-11095 FIx flaky fail WalCompactionTest - Fixes #5937.
fc83c12 is described below
commit fc83c1260d7561aa852ee393157ed93d15304b5a
Author: Dmitriy Govorukhin <dm...@gmail.com>
AuthorDate: Sat Jan 26 14:35:11 2019 +0300
IGNITE-11095 FIx flaky fail WalCompactionTest - Fixes #5937.
Signed-off-by: Dmitriy Govorukhin <dm...@gmail.com>
---
.../persistence/db/IgnitePdsReserveWalSegmentsTest.java | 6 ++++--
.../cache/persistence/db/wal/WalCompactionTest.java | 14 +++++++++++++-
.../ignite/util/GridInternalTaskUnusedWalSegmentsTest.java | 6 ++++--
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsReserveWalSegmentsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsReserveWalSegmentsTest.java
index 0225961..ae11b48 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsReserveWalSegmentsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsReserveWalSegmentsTest.java
@@ -43,8 +43,6 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_PDS_MAX_CHECKPOINT
public class IgnitePdsReserveWalSegmentsTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- System.setProperty(IGNITE_PDS_MAX_CHECKPOINT_MEMORY_HISTORY_SIZE, "2");
-
IgniteConfiguration cfg = super.getConfiguration(gridName);
cfg.setConsistentId(gridName);
@@ -75,6 +73,8 @@ public class IgnitePdsReserveWalSegmentsTest extends GridCommonAbstractTest {
stopAllGrids();
cleanPersistenceDir();
+
+ System.setProperty(IGNITE_PDS_MAX_CHECKPOINT_MEMORY_HISTORY_SIZE, "2");
}
/** {@inheritDoc} */
@@ -82,6 +82,8 @@ public class IgnitePdsReserveWalSegmentsTest extends GridCommonAbstractTest {
stopAllGrids();
cleanPersistenceDir();
+
+ System.clearProperty(IGNITE_PDS_MAX_CHECKPOINT_MEMORY_HISTORY_SIZE);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java
index f1d14af..a9e24ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java
@@ -315,7 +315,19 @@ public class WalCompactionTest extends GridCommonAbstractTest {
System.out.println("Max compressed index: " + maxIdx);
assertTrue(maxIdx > emptyIdx);
- assertTrue(walSegment.exists()); // Failed to compress WAL segment shoudn't be deleted.
+ if (!walSegment.exists()) {
+ File[] list = nodeArchiveDir.listFiles();
+
+ Arrays.sort(list);
+
+ log.info("Files in archive:" + list.length);
+
+ for (File f : list)
+ log.info(f.getAbsolutePath());
+
+ // Failed to compress WAL segment shoudn't be deleted.
+ fail("File " + walSegment.getAbsolutePath() + " does not exist.");
+ }
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridInternalTaskUnusedWalSegmentsTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridInternalTaskUnusedWalSegmentsTest.java
index f410572..e8c0ecc 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/GridInternalTaskUnusedWalSegmentsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/GridInternalTaskUnusedWalSegmentsTest.java
@@ -50,8 +50,6 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_PDS_MAX_CHECKPOINT
public class GridInternalTaskUnusedWalSegmentsTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- System.setProperty(IGNITE_PDS_MAX_CHECKPOINT_MEMORY_HISTORY_SIZE, "2");
-
IgniteConfiguration cfg = super.getConfiguration(gridName);
CacheConfiguration<Integer, Object> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
@@ -80,11 +78,15 @@ public class GridInternalTaskUnusedWalSegmentsTest extends GridCommonAbstractTes
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
cleanPersistenceDir();
+
+ System.setProperty(IGNITE_PDS_MAX_CHECKPOINT_MEMORY_HISTORY_SIZE, "2");
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
cleanPersistenceDir();
+
+ System.clearProperty(IGNITE_PDS_MAX_CHECKPOINT_MEMORY_HISTORY_SIZE);
}
/**