This is an automated email from the ASF dual-hosted git repository.
Aias00 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new c8a5a28aa4 Fixes #6593: Expose cache eviction assertion failures
(#7174)
c8a5a28aa4 is described below
commit c8a5a28aa4f1704b3d091583acf25ac87f044fd0
Author: BobSong <[email protected]>
AuthorDate: Thu Oct 1 11:02:31 2026 +0800
Fixes #6593: Expose cache eviction assertion failures (#7174)
---
.../shenyu/common/cache/MemorySafeLRUMapTest.java | 44 ++++++++--------
.../cache/MemorySafeWindowTinyLFUMapTest.java | 58 ++++++++++------------
.../org/apache/shenyu/k8s/DubboReconcilerTest.java | 2 +
3 files changed, 49 insertions(+), 55 deletions(-)
diff --git
a/shenyu-common/src/test/java/org/apache/shenyu/common/cache/MemorySafeLRUMapTest.java
b/shenyu-common/src/test/java/org/apache/shenyu/common/cache/MemorySafeLRUMapTest.java
index 92b14fc520..59d9cb59ec 100644
---
a/shenyu-common/src/test/java/org/apache/shenyu/common/cache/MemorySafeLRUMapTest.java
+++
b/shenyu-common/src/test/java/org/apache/shenyu/common/cache/MemorySafeLRUMapTest.java
@@ -38,29 +38,25 @@ public class MemorySafeLRUMapTest {
@Test
public void testLru() {
- try {
- MemorySafeLRUMap<Integer, Integer> lru = new MemorySafeLRUMap<>(1,
1024) {
-
- private static final long serialVersionUID =
8897028073615563875L;
-
- @Override
- public boolean isFull() {
- //just for test
- return size() > 0;
- }
- };
- lru.put(1, 1);
- Assert.assertEquals(1, lru.size());
- lru.put(2, 2);
- lru.put(3, 3);
- Assert.assertEquals(1, lru.size());
- final Map.Entry<Integer, Integer> entry =
lru.entrySet().iterator().next();
- final Integer key = entry.getKey();
- final Integer value = entry.getValue();
- Assert.assertEquals(3, (int) key);
- Assert.assertEquals(3, (int) value);
- } catch (Throwable t) {
- // due to rapid changes in JVM memory, the results of this test
are not stable, just ignore
- }
+ MemorySafeLRUMap<Integer, Integer> lru = new MemorySafeLRUMap<>(1,
1024) {
+
+ private static final long serialVersionUID = 8897028073615563875L;
+
+ @Override
+ public boolean isFull() {
+ //just for test
+ return size() > 0;
+ }
+ };
+ lru.put(1, 1);
+ Assert.assertEquals(1, lru.size());
+ lru.put(2, 2);
+ lru.put(3, 3);
+ Assert.assertEquals(1, lru.size());
+ final Map.Entry<Integer, Integer> entry =
lru.entrySet().iterator().next();
+ final Integer key = entry.getKey();
+ final Integer value = entry.getValue();
+ Assert.assertEquals(3, (int) key);
+ Assert.assertEquals(3, (int) value);
}
}
diff --git
a/shenyu-common/src/test/java/org/apache/shenyu/common/cache/MemorySafeWindowTinyLFUMapTest.java
b/shenyu-common/src/test/java/org/apache/shenyu/common/cache/MemorySafeWindowTinyLFUMapTest.java
index acaec9eb33..caa9da4274 100644
---
a/shenyu-common/src/test/java/org/apache/shenyu/common/cache/MemorySafeWindowTinyLFUMapTest.java
+++
b/shenyu-common/src/test/java/org/apache/shenyu/common/cache/MemorySafeWindowTinyLFUMapTest.java
@@ -42,37 +42,33 @@ public class MemorySafeWindowTinyLFUMapTest {
@Test
public void testWindowTinyLFU() {
- try {
- MemorySafeWindowTinyLFUMap<Integer, Integer> cache = new
MemorySafeWindowTinyLFUMap<>(1, 1024) {
-
- private static final long serialVersionUID =
8897028073615563875L;
-
- @Override
- public synchronized boolean isFull() {
- //just for test
- return size() > 1;
- }
-
- @Override
- public synchronized void cleanUp() {
- super.cleanUp();
- }
- };
- cache.put(1, 1);
- Assert.assertEquals(1, cache.size());
- cache.put(2, 2);
- cache.put(3, 3);
- cache.invalidate();
- cache.cleanUp();
- Assert.assertEquals(1, cache.size());
- final Map.Entry<Integer, Integer> entry =
cache.entrySet().iterator().next();
- final Integer key = entry.getKey();
- final Integer value = entry.getValue();
- Assert.assertEquals(3, (int) key);
- Assert.assertEquals(3, (int) value);
- } catch (Throwable t) {
- // due to rapid changes in JVM memory, the results of this test
are not stable, just ignore
- }
+ MemorySafeWindowTinyLFUMap<Integer, Integer> cache = new
MemorySafeWindowTinyLFUMap<>(1, 1024) {
+
+ private static final long serialVersionUID = 8897028073615563875L;
+
+ @Override
+ public synchronized boolean isFull() {
+ //just for test
+ return size() > 1;
+ }
+
+ @Override
+ public synchronized void cleanUp() {
+ super.cleanUp();
+ }
+ };
+ cache.put(1, 1);
+ Assert.assertEquals(1, cache.size());
+ cache.put(2, 2);
+ cache.put(3, 3);
+ cache.invalidate();
+ cache.cleanUp();
+ Assert.assertEquals(1, cache.size());
+ final Map.Entry<Integer, Integer> entry =
cache.entrySet().iterator().next();
+ final Integer key = entry.getKey();
+ final Integer value = entry.getValue();
+ Assert.assertEquals(3, (int) key);
+ Assert.assertEquals(3, (int) value);
}
@Test
diff --git
a/shenyu-kubernetes-controller/src/test/java/org/apache/shenyu/k8s/DubboReconcilerTest.java
b/shenyu-kubernetes-controller/src/test/java/org/apache/shenyu/k8s/DubboReconcilerTest.java
index 74639e6166..0507d71b6e 100644
---
a/shenyu-kubernetes-controller/src/test/java/org/apache/shenyu/k8s/DubboReconcilerTest.java
+++
b/shenyu-kubernetes-controller/src/test/java/org/apache/shenyu/k8s/DubboReconcilerTest.java
@@ -35,6 +35,7 @@ import io.kubernetes.client.openapi.models.V1Secret;
import io.kubernetes.client.openapi.models.V1Service;
import io.kubernetes.client.openapi.models.V1ServiceBuilder;
import org.apache.shenyu.common.config.ssl.ShenyuSniAsyncMapping;
+import org.apache.shenyu.k8s.cache.IngressCache;
import org.apache.shenyu.k8s.parser.IngressParser;
import org.apache.shenyu.k8s.reconciler.IngressReconciler;
import org.apache.shenyu.k8s.repository.ShenyuCacheRepository;
@@ -81,6 +82,7 @@ public final class DubboReconcilerTest {
@BeforeEach
public void init() {
+ IngressCache.getInstance().remove("mockedNamespace", "mockedIngress");
ingressInformer = mock(SharedIndexInformer.class);
secretInformer = mock(SharedIndexInformer.class);
shenyuCacheRepository = mock(ShenyuCacheRepository.class);
