This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits 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 d72ccb5022d IGNITE-28762 Fix flaky
PageMemoryNoStoreLeakTest.testPageDoubleInitMemoryLeak - Fixes #13228.
d72ccb5022d is described below
commit d72ccb5022d2cfcba940a7c4b65cea75889e64a1
Author: Aleksey Plekhanov <[email protected]>
AuthorDate: Tue Jun 16 19:43:24 2026 +0500
IGNITE-28762 Fix flaky
PageMemoryNoStoreLeakTest.testPageDoubleInitMemoryLeak - Fixes #13228.
Signed-off-by: Aleksey Plekhanov <[email protected]>
---
.../org/apache/ignite/internal/util/GridDebug.java | 433 ---------------------
.../ignite/internal/util/typedef/internal/D.java | 28 --
.../internal/MemoryLeaksOnRestartNodeTest.java | 8 +-
.../pagemem/PageMemoryNoStoreLeakTest.java | 39 +-
.../apache/ignite/testframework/GridTestUtils.java | 67 ++++
5 files changed, 99 insertions(+), 476 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java
deleted file mode 100644
index cc1c2e0c6c6..00000000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * 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.internal.util;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.management.ManagementFactory;
-import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicReference;
-import javax.management.MBeanServer;
-import com.sun.management.HotSpotDiagnosticMXBean;
-import com.sun.management.OperatingSystemMXBean;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.internal.util.typedef.X;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgnitePredicate;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Utility class for debugging.
- */
-public class GridDebug {
- /** */
- private static final AtomicReference<ConcurrentLinkedQueue<Item>> que =
- new AtomicReference<>(new ConcurrentLinkedQueue<>());
-
- /** */
- private static final FileOutputStream out;
-
- /** */
- private static volatile long start;
-
- /**
- * On Ubuntu:
- * sudo mkdir /ramdisk
- * sudo mount -t tmpfs -o size=2048M tmpfs /ramdisk
- */
- private static final String LOGS_PATH = null; // "/ramdisk/";
-
- /** */
- private static boolean allowLog;
-
- /** This is the name of the HotSpot Diagnostic MBean */
- private static final String HOTSPOT_BEAN_NAME =
"com.sun.management:type=HotSpotDiagnostic";
-
- /** field to store the hotspot diagnostic MBean */
- private static volatile HotSpotDiagnosticMXBean hotspotMBean;
-
- /** Platform-specific management interface for the operating system. */
- private static final String OS_BEAN_NAME =
"java.lang:type=OperatingSystem";
-
- /** Call to {@link #initOSMBean()} before accessing. */
- private static volatile OperatingSystemMXBean osMBean;
-
- /* */
- static {
- if (LOGS_PATH != null) {
- DateTimeFormatter formatter =
-
DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm-ss-").withZone(ZoneId.systemDefault());
-
- File log = new File(new File(LOGS_PATH),
formatter.format(Instant.now()) +
- ManagementFactory.getRuntimeMXBean().getName() + ".log");
-
- assert !log.exists();
-
- try {
- out = new FileOutputStream(log, false);
- }
- catch (FileNotFoundException e) {
- throw new IllegalStateException(e);
- }
- }
- else
- out = null;
- }
-
- /**
- * Gets collected debug items queue.
- *
- * @return Items queue.
- */
- public static ConcurrentLinkedQueue<Item> queue() {
- return que.get();
- }
-
- /**
- * @param allow Write log.
- */
- public static synchronized void allowWriteLog(boolean allow) {
- allowLog = allow;
- }
-
- /**
- * Writes to log file which should reside on ram disk.
- *
- * @param x Data to log.
- */
- public static synchronized void write(Object... x) {
- if (!allowLog)
- return;
-
- Thread th = Thread.currentThread();
-
- try {
- out.write((formatEntry(System.currentTimeMillis(), th.getName(),
th.getId(), x) + "\n").getBytes(StandardCharsets.UTF_8));
- out.flush();
- }
- catch (IOException e) {
- throw new IllegalStateException(e);
- }
- }
-
- /**
- * Add the data to debug queue.
- *
- * @param x Debugging data.
- */
- public static void debug(Object... x) {
- ConcurrentLinkedQueue<Item> q = que.get();
-
- if (q != null)
- q.add(new Item(x));
- }
-
- /**
- * Hangs for 5 minutes if stopped.
- */
- public static void hangIfStopped() {
- if (que.get() == null)
- try {
- Thread.sleep(300000);
- }
- catch (InterruptedException ignored) {
- // No-op.
- }
- }
-
- /**
- * Sets starting time after which {@link #timing(String)} measurements can
be done.
- */
- public static void start() {
- start = U.currentTimeMillis();
- }
-
- /**
- * Print timing after the {@link #start()} call.
- *
- * @param label Label.
- */
- public static void timing(String label) {
- X.println(label + ' ' + (U.currentTimeMillis() - start) + " ms");
- }
-
- /**
- * @return Object which will dump thread stack on toString call.
- */
- public static Object dumpStack() {
- final Throwable t = new Throwable();
-
- return new Object() {
- @Override public String toString() {
- StringWriter errors = new StringWriter();
-
- t.printStackTrace(new PrintWriter(errors));
-
- return errors.toString();
- }
- };
- }
-
- /**
- * Dumps given number of last events.
- *
- * @param n Number of last elements to dump.
- */
- public static void dumpLastAndStop(int n) {
- ConcurrentLinkedQueue<Item> q = que.getAndSet(null);
-
- if (q == null)
- return;
-
- int size = q.size();
-
- while (size-- > n)
- q.poll();
-
- dump(q);
- }
-
- /**
- * Dump given queue to stdout.
- *
- * @param que Queue.
- */
- @SuppressWarnings("TypeMayBeWeakened")
- public static void dump(Collection<Item> que) {
- if (que == null)
- return;
-
- int start = -1; // que.size() - 5000;
-
- int x = 0;
-
- for (Item i : que) {
- if (x++ > start)
- System.out.println(i);
- }
- }
-
- /**
- * Dump existing queue to stdout and atomically replace it with null so
that no subsequent logging is possible.
- *
- * @param x Parameters.
- * @return Empty string (useful for assertions like {@code assert x == 0 :
D.dumpWithStop();} ).
- */
- public static String dumpWithStop(Object... x) {
- debug(x);
- return dumpWithReset(null, null);
- }
-
- /**
- * Dump existing queue to stdout and atomically replace it with new queue.
- *
- * @return Empty string (useful for assertions like {@code assert x == 0 :
D.dumpWithReset();} ).
- */
- public static String dumpWithReset() {
- return dumpWithReset(new ConcurrentLinkedQueue<>(), null);
- }
-
- /**
- * Dump existing queue to stdout and atomically replace it with given.
- *
- * @param q2 Queue.
- * @param filter Filter for logged debug items.
- * @return Empty string.
- */
- public static String dumpWithReset(
- @Nullable ConcurrentLinkedQueue<Item> q2,
- @Nullable IgnitePredicate<Item> filter
- ) {
- ConcurrentLinkedQueue<Item> q;
-
- do {
- q = que.get();
-
- if (q == null)
- break; // Stopped.
- }
- while (!que.compareAndSet(q, q2));
-
- Collection<Item> col = null;
-
- if (filter == null)
- col = q;
- else if (q != null) {
- col = new ArrayList<>();
-
- for (Item item : q) {
- if (filter.apply(item))
- col.add(item);
- }
- }
-
- dump(col);
-
- return "";
- }
-
- /**
- * Reset queue to empty one.
- */
- public static void reset() {
- ConcurrentLinkedQueue<Item> old = que.get();
-
- if (old != null) // Was not stopped.
- que.compareAndSet(old, new ConcurrentLinkedQueue<>());
- }
-
- /**
- * Formats log entry string.
- *
- * @param ts Timestamp.
- * @param threadName Thread name.
- * @param threadId Thread ID.
- * @param data Data.
- * @return String.
- */
- private static String formatEntry(long ts, String threadName, long
threadId, Object... data) {
- return "<" +
IgniteUtils.DEBUG_DATE_FMT.format(Instant.ofEpochMilli(ts)) + "><~DBG~><" +
threadName + " id:" +
- threadId + "> " + Arrays.deepToString(data);
- }
-
- /**
- * Call this method from your application whenever you
- * want to dump the heap snapshot into a file.
- *
- * @param fileName name of the heap dump file
- * @param live flag that tells whether to dump
- * only the live objects
- */
- public static void dumpHeap(String fileName, boolean live) {
- // initialize hotspot diagnostic MBean
- initHotspotMBean();
-
- File f = new File(fileName);
-
- if (f.exists())
- f.delete();
-
- try {
- hotspotMBean.dumpHeap(fileName, live);
- }
- catch (RuntimeException re) {
- throw re;
- }
- catch (Exception exp) {
- throw new RuntimeException(exp);
- }
- }
-
- /**
- * @return Committed VM size in bits.
- */
- public static long getCommittedVirtualMemorySize() {
- initOSMBean();
-
- return osMBean.getCommittedVirtualMemorySize();
- }
-
- /**
- * Initialize the hotspot diagnostic MBean field.
- */
- private static void initHotspotMBean() {
- if (hotspotMBean == null) {
- synchronized (GridDebug.class) {
- if (hotspotMBean == null)
- hotspotMBean = getMBean(HOTSPOT_BEAN_NAME,
HotSpotDiagnosticMXBean.class);
- }
- }
- }
-
- /**
- * Initialize field to store OperatingSystem MXBean.
- */
- private static void initOSMBean() {
- if (osMBean == null) {
- synchronized (GridDebug.class) {
- if (osMBean == null)
- osMBean = getMBean(OS_BEAN_NAME,
OperatingSystemMXBean.class);
- }
- }
- }
-
- /**
- * Get MXBean from the platform MBeanServer.
- *
- * @param mxbeanName The name for uniquely identifying the MXBean within
an MBeanServer.
- * @param mxbeanItf The MXBean interface.
- * @return A proxy for a platform MXBean interface.
- */
- private static <T> T getMBean(String mxbeanName, Class<T> mxbeanItf) {
- try {
- MBeanServer srv = ManagementFactory.getPlatformMBeanServer();
-
- return ManagementFactory.newPlatformMXBeanProxy(srv, mxbeanName,
mxbeanItf);
- }
- catch (IOException e) {
- throw new IgniteException(e);
- }
- }
-
- /**
- * Debug info queue item.
- */
- @SuppressWarnings({"PublicInnerClass", "PublicField"})
- public static class Item {
- /** */
- public final long ts = System.currentTimeMillis();
-
- /** */
- public final String threadName;
-
- /** */
- public final long threadId;
-
- /** */
- public final Object[] data;
-
- /**
- * Constructor.
- *
- * @param data Debugging data.
- */
- public Item(Object[] data) {
- this.data = data;
- Thread th = Thread.currentThread();
-
- threadName = th.getName();
- threadId = th.getId();
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return formatEntry(ts, threadName, threadId, data);
- }
- }
-}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/D.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/D.java
deleted file mode 100644
index c284f944322..00000000000
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/D.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.internal.util.typedef.internal;
-
-import org.apache.ignite.internal.util.GridDebug;
-
-/**
- * Convenience alias for {@link GridDebug} class.
- */
-@SuppressWarnings("ExtendsUtilityClass")
-public class D extends GridDebug {
- // No-op.
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
index 4b073391ede..d59b29d7408 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
@@ -21,8 +21,8 @@ import java.io.File;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.GridDebug;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
@@ -82,7 +82,7 @@ public class MemoryLeaksOnRestartNodeTest extends
GridCommonAbstractTest {
stopAllGrids();
}
- GridDebug.dumpHeap(HEAP_DUMP_FILE_NAME, true);
+ GridTestUtils.dumpHeap(HEAP_DUMP_FILE_NAME, true);
File dumpFile = new File(HEAP_DUMP_FILE_NAME);
@@ -96,10 +96,10 @@ public class MemoryLeaksOnRestartNodeTest extends
GridCommonAbstractTest {
stopAllGrids();
- GridDebug.dumpHeap(HEAP_DUMP_FILE_NAME, true);
+ GridTestUtils.dumpHeap(HEAP_DUMP_FILE_NAME, true);
}
- GridDebug.dumpHeap(HEAP_DUMP_FILE_NAME, true);
+ GridTestUtils.dumpHeap(HEAP_DUMP_FILE_NAME, true);
final float leakSize = (float)(dumpFile.length() - size0) / 1024 /
1024 / NODES / RESTARTS;
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryNoStoreLeakTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryNoStoreLeakTest.java
index 5cd217e28cc..17f338047a6 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryNoStoreLeakTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryNoStoreLeakTest.java
@@ -17,13 +17,16 @@
package org.apache.ignite.internal.processors.cache.persistence.pagemem;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.internal.mem.DirectMemoryProvider;
+import org.apache.ignite.internal.mem.unsafe.UnsafeMemoryAllocator;
import org.apache.ignite.internal.mem.unsafe.UnsafeMemoryProvider;
import org.apache.ignite.internal.pagemem.PageMemory;
import org.apache.ignite.internal.pagemem.impl.PageMemoryNoStoreImpl;
import
org.apache.ignite.internal.processors.cache.persistence.DataRegionMetricsImpl;
-import org.apache.ignite.internal.util.typedef.internal.D;
+import org.apache.ignite.mem.MemoryAllocator;
import org.apache.ignite.testframework.junits.GridTestKernalContext;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
@@ -42,18 +45,34 @@ public class PageMemoryNoStoreLeakTest extends
GridCommonAbstractTest {
/** */
private static final int MAX_MEMORY_SIZE = 10 * 1024 * 1024;
- /** Allow delta between GC executions. */
- private static final int ALLOWED_DELTA = 10 * 1024 * 1024;
-
/**
* @throws Exception If failed.
*/
@Test
public void testPageDoubleInitMemoryLeak() throws Exception {
- long initVMsize = D.getCommittedVirtualMemorySize();
+ Map<Long, Long> chunks = new HashMap<>();
+
+ MemoryAllocator memAllocator = new UnsafeMemoryAllocator() {
+ @Override public long allocateMemory(long size) {
+ long addr = super.allocateMemory(size);
+
+ Long old = chunks.put(addr, size);
+
+ assertNull(old);
+
+ return addr;
+ }
+
+ @Override public void freeMemory(long addr) {
+ super.freeMemory(addr);
+
+ Long val = chunks.remove(addr);
+ assertNotNull(val);
+ }
+ };
for (int i = 0; i < 1_000; i++) {
- final DirectMemoryProvider provider = new
UnsafeMemoryProvider(log());
+ final DirectMemoryProvider provider = new
UnsafeMemoryProvider(log(), memAllocator);
final DataRegionConfiguration plcCfg = new
DataRegionConfiguration()
.setMaxSize(MAX_MEMORY_SIZE).setInitialSize(MAX_MEMORY_SIZE);
@@ -71,16 +90,14 @@ public class PageMemoryNoStoreLeakTest extends
GridCommonAbstractTest {
try {
mem.start();
- //Second initialization, introduces leak
+ // Second initialization attempt.
mem.start();
}
finally {
mem.stop(true);
}
-
- long committedVMSize = D.getCommittedVirtualMemorySize();
-
- assertTrue(committedVMSize - initVMsize <= ALLOWED_DELTA);
}
+
+ assertTrue(chunks.isEmpty());
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
index cd6b30d84de..01380265c96 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
@@ -26,6 +26,7 @@ import java.io.InputStream;
import java.lang.annotation.Annotation;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.VarHandle;
+import java.lang.management.ManagementFactory;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference;
import java.lang.reflect.Field;
@@ -80,10 +81,12 @@ import java.util.stream.Stream;
import javax.cache.CacheException;
import javax.cache.configuration.Factory;
import javax.management.Attribute;
+import javax.management.MBeanServer;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import com.google.common.collect.Lists;
+import com.sun.management.HotSpotDiagnosticMXBean;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
@@ -169,6 +172,12 @@ public final class GridTestUtils {
/** */
private static final GridAbsClosure NOOP = new NoOpClosure();
+ /** This is the name of the HotSpot Diagnostic MBean. */
+ private static final String HOTSPOT_BEAN_NAME =
"com.sun.management:type=HotSpotDiagnostic";
+
+ /** Field to store the hotspot diagnostic MBean. */
+ private static volatile HotSpotDiagnosticMXBean hotspotMBean;
+
/**
* Creates an absolute (no-arg) closure that does nothing.
*
@@ -178,6 +187,64 @@ public final class GridTestUtils {
return NOOP;
}
+ /**
+ * Call this method from your application whenever you
+ * want to dump the heap snapshot into a file.
+ *
+ * @param fileName Name of the heap dump file.
+ * @param live Flag that tells whether to dump
+ * only the live objects.
+ */
+ public static void dumpHeap(String fileName, boolean live) {
+ // Initialize hotspot diagnostic MBean.
+ initHotspotMBean();
+
+ File f = new File(fileName);
+
+ if (f.exists())
+ f.delete();
+
+ try {
+ hotspotMBean.dumpHeap(fileName, live);
+ }
+ catch (RuntimeException re) {
+ throw re;
+ }
+ catch (Exception exp) {
+ throw new RuntimeException(exp);
+ }
+ }
+
+ /**
+ * Initialize the hotspot diagnostic MBean field.
+ */
+ private static void initHotspotMBean() {
+ if (hotspotMBean == null) {
+ synchronized (GridTestUtils.class) {
+ if (hotspotMBean == null)
+ hotspotMBean = getMBean(HOTSPOT_BEAN_NAME,
HotSpotDiagnosticMXBean.class);
+ }
+ }
+ }
+
+ /**
+ * Get MXBean from the platform MBeanServer.
+ *
+ * @param mxbeanName The name for uniquely identifying the MXBean within
an MBeanServer.
+ * @param mxbeanItf The MXBean interface.
+ * @return A proxy for a platform MXBean interface.
+ */
+ private static <T> T getMBean(String mxbeanName, Class<T> mxbeanItf) {
+ try {
+ MBeanServer srv = ManagementFactory.getPlatformMBeanServer();
+
+ return ManagementFactory.newPlatformMXBeanProxy(srv, mxbeanName,
mxbeanItf);
+ }
+ catch (IOException e) {
+ throw new IgniteException(e);
+ }
+ }
+
/**
* Hook object intervenes to discovery message handling
* and thus allows to make assertions or other actions like skipping
certain discovery messages.
