Merge branch 'develop' into 11458-D-reconnect-state-saved-twice

hashgraph · Feb 13, 2024 · b01a5fe · b01a5fe
2 parents aa33b4c + 1871c0c
commit b01a5fe
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/platform-sdk/swirlds-merkle/src/test/java/com/swirlds/virtual/merkle/map/MapTest.java b/platform-sdk/swirlds-merkle/src/test/java/com/swirlds/virtual/merkle/map/MapTest.java
@@ -31,6 +31,7 @@
 import com.swirlds.virtual.merkle.TestValueSerializer;
 import com.swirlds.virtualmap.VirtualMap;
 import com.swirlds.virtualmap.datasource.VirtualDataSourceBuilder;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Tags;
@@ -55,6 +56,8 @@ VirtualMap<TestKey, TestValue> createMap(String label) {
     @Tag(TIME_CONSUMING)
     @Tags({@Tag("VirtualMerkle"), @Tag("VMAP-019")})
     @DisplayName("Insert one million elements with same key but different value")
+    // FUTURE WORK: https://github.com/hashgraph/hedera-services/issues/11498
+    @Disabled
     void insertRemoveAndModifyOneMillion() throws InterruptedException {
         final int changesPerBatch = 15_432; // Some unexpected size just to be crazy
         final int max = 1_000_000;

diff --git a/platform-sdk/swirlds-virtualmap/src/test/java/com/swirlds/virtualmap/VirtualMapTests.java b/platform-sdk/swirlds-virtualmap/src/test/java/com/swirlds/virtualmap/VirtualMapTests.java
@@ -84,6 +84,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Tags;
@@ -1047,6 +1048,8 @@ void testExternalSerializationAndDeserialization() throws IOException {
     @Tags({@Tag("VirtualMerkle"), @Tag("VMAP-019")})
     @DisplayName("Insert one million elements with same key but different value")
     @Tag(TestQualifierTags.TIME_CONSUMING)
+    // FUTURE WORK: https://github.com/hashgraph/hedera-services/issues/11498
+    @Disabled
     void insertRemoveAndModifyOneMillion() throws InterruptedException {
         final int changesPerBatch = 15_432; // Some unexpected size just to be crazy
         final int max = 1_000_000;

diff --git a/...rtualmap/src/test/java/com/swirlds/virtualmap/internal/pipeline/VirtualPipelineTests.java b/...rtualmap/src/test/java/com/swirlds/virtualmap/internal/pipeline/VirtualPipelineTests.java
@@ -62,6 +62,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -835,6 +836,8 @@ private static void copyAndMeasureTime(final Deque<DummyVirtualRoot> copies, fin
     @Test
     @Tag(TestQualifierTags.TIME_CONSUMING)
     @DisplayName("Flush Throttle")
+    // FUTURE WORK: https://github.com/hashgraph/hedera-services/pull/11497
+    @Disabled
     void flushThrottle() throws InterruptedException {
 
         final int preferredQueueSize = 2;