From 67e8a9b16ec2ce9809d45a9db080c42467c9be41 Mon Sep 17 00:00:00 2001
From: Chris Dennis <chris.w.dennis@gmail.com>
Date: Thu, 2 Feb 2023 08:07:41 -0500
Subject: [PATCH] [DO NOT MERGE] - target the specific flaky test

---
 azure-pipelines.yml                                  | 12 ++++++------
 .../internal/store/CommonServerStoreProxy.java       |  2 +-
 ...lusteredCacheOpsReplicationMultiThreadedTest.java |  4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e3fb0018ea..5793d4c30c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -28,28 +28,28 @@ jobs:
   parameters:
     jdkVersion: '1.8'
     jobName: 'LinuxJava8'
-    gradleTasks: 'check -x dependencyCheckAggregate'
+    gradleTasks: ':clustered:integration-test:test --tests=org.ehcache.clustered.replication.BasicClusteredCacheOpsReplicationMultiThreadedTest'
 
 - template: build-templates/gradle-common.yml@templates
   parameters:
     jdkVersion: '1.8'
     options: '-PtestVM=java11Home'
     jobName: 'LinuxJava11'
-    gradleTasks: 'check -x dependencyCheckAggregate'
+    gradleTasks: ':clustered:integration-test:test --tests=org.ehcache.clustered.replication.BasicClusteredCacheOpsReplicationMultiThreadedTest'
 
 - template: build-templates/gradle-common.yml@templates
   parameters:
     jdkVersion: '1.8'
     options: '-PtestVM=java17Home'
     jobName: 'LinuxJava17'
-    gradleTasks: 'check -x dependencyCheckAggregate'
+    gradleTasks: ':clustered:integration-test:test --tests=org.ehcache.clustered.replication.BasicClusteredCacheOpsReplicationMultiThreadedTest'
 
 - template: build-templates/gradle-common.yml@templates
   parameters:
     vmImage: 'windows-latest'
     jdkVersion: '1.8'
     jobName: 'WindowsJava8'
-    gradleTasks: 'check -x dependencyCheckAggregate'
+    gradleTasks: ':clustered:integration-test:test --tests=org.ehcache.clustered.replication.BasicClusteredCacheOpsReplicationMultiThreadedTest'
 
 - template: build-templates/gradle-common.yml@templates
   parameters:
@@ -57,7 +57,7 @@ jobs:
     jdkVersion: '1.8'
     options: '-PtestVM=java11Home'
     jobName: 'WindowsJava11'
-    gradleTasks: 'check -x dependencyCheckAggregate'
+    gradleTasks: ':clustered:integration-test:test --tests=org.ehcache.clustered.replication.BasicClusteredCacheOpsReplicationMultiThreadedTest'
 
 - template: build-templates/gradle-common.yml@templates
   parameters:
@@ -65,4 +65,4 @@ jobs:
     jdkVersion: '1.8'
     options: '-PtestVM=java17Home'
     jobName: 'WindowsJava17'
-    gradleTasks: 'check -x dependencyCheckAggregate'
+    gradleTasks: ':clustered:integration-test:test --tests=org.ehcache.clustered.replication.BasicClusteredCacheOpsReplicationMultiThreadedTest'
diff --git a/clustered/ehcache-client/src/main/java/org/ehcache/clustered/client/internal/store/CommonServerStoreProxy.java b/clustered/ehcache-client/src/main/java/org/ehcache/clustered/client/internal/store/CommonServerStoreProxy.java
index 8f44034bc6..1d8d2949a6 100644
--- a/clustered/ehcache-client/src/main/java/org/ehcache/clustered/client/internal/store/CommonServerStoreProxy.java
+++ b/clustered/ehcache-client/src/main/java/org/ehcache/clustered/client/internal/store/CommonServerStoreProxy.java
@@ -143,7 +143,7 @@ public ChainEntry get(long key) throws TimeoutException {
   @Override
   public void append(long key, ByteBuffer payLoad) {
     try {
-      entity.invokeAndWaitForComplete(new AppendMessage(key, payLoad), true);
+      entity.invokeAndWaitForReceive(new AppendMessage(key, payLoad), true);
     } catch (Exception e) {
       throw new ServerStoreProxyException(e);
     }
diff --git a/clustered/integration-test/src/test/java/org/ehcache/clustered/replication/BasicClusteredCacheOpsReplicationMultiThreadedTest.java b/clustered/integration-test/src/test/java/org/ehcache/clustered/replication/BasicClusteredCacheOpsReplicationMultiThreadedTest.java
index ec10420c75..1896f48782 100644
--- a/clustered/integration-test/src/test/java/org/ehcache/clustered/replication/BasicClusteredCacheOpsReplicationMultiThreadedTest.java
+++ b/clustered/integration-test/src/test/java/org/ehcache/clustered/replication/BasicClusteredCacheOpsReplicationMultiThreadedTest.java
@@ -43,7 +43,6 @@
 import org.junit.runners.Parameterized.Parameters;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terracotta.utilities.test.WaitForAssert;
 
 import java.io.Serializable;
 import java.time.Duration;
@@ -81,7 +80,7 @@
 @RunWith(ParallelParameterized.class)
 public class BasicClusteredCacheOpsReplicationMultiThreadedTest {
 
-  private static final int NUM_OF_THREADS = 10;
+  private static final int NUM_OF_THREADS = 4;
   private static final int JOB_SIZE = 100;
 
   private PersistentCacheManager cacheManager1;
@@ -99,7 +98,6 @@ public static Consistency[] data() {
 
   @ClassRule @Rule
   public static final ParallelTestCluster CLUSTER = new ParallelTestCluster(newCluster(2).in(clusterPath())
-    .withServerHeap(512)
     .withServiceFragment(offheapResource("primary-server-resource", 24)).build());
 
   @Rule