This is an automated email from the ASF dual-hosted git repository. alexpl 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 c615651 IGNITE-13880 Fix PageMemoryTracker related flaky tests - Fixes #8597. c615651 is described below commit c615651df55defe4b02e3737e8ab3f427a46f8d7 Author: Aleksey Plekhanov <plehanov.a...@gmail.com> AuthorDate: Tue Dec 22 09:30:20 2020 +0300 IGNITE-13880 Fix PageMemoryTracker related flaky tests - Fixes #8597. Signed-off-by: Aleksey Plekhanov <plehanov.a...@gmail.com> --- .../cache/persistence/wal/memtracker/PageMemoryTracker.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/memtracker/PageMemoryTracker.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/memtracker/PageMemoryTracker.java index 64af67d..c83873e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/memtracker/PageMemoryTracker.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/memtracker/PageMemoryTracker.java @@ -266,6 +266,8 @@ public class PageMemoryTracker implements IgnitePlugin { memoryRegion = memoryProvider.nextRegion(); + GridUnsafe.setMemory(memoryRegion.address(), memoryRegion.size(), (byte)0); + maxPages = (int)(maxMemorySize / pageSize); pageSlots = new DirectMemoryPageSlot[maxPages]; @@ -471,8 +473,8 @@ public class PageMemoryTracker implements IgnitePlugin { page.lock(); - try { - GridUnsafe.copyHeapOffheap(snapshot.pageData(), GridUnsafe.BYTE_ARR_OFF, page.address(), pageSize); + try { + GridUnsafe.copyHeapOffheap(snapshot.pageData(), GridUnsafe.BYTE_ARR_OFF, page.address(), pageSize); page.changeHistory().clear(); @@ -694,7 +696,7 @@ public class PageMemoryTracker implements IgnitePlugin { } if (!locBuf.equals(rmtBuf)) { - log.error("Page buffers are not equals: " + fullPageId); + log.error("Page buffers are not equals [fullPageId=" + fullPageId + ", pageIo=" + pageIo + ']'); dumpDiff(locBuf, rmtBuf);