Always invoke on passive then track result

ehcache · Sep 13, 2021 · a0c65c8 · a0c65c8
1 parent a280de9
commit a0c65c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 31 deletions.
diff --git a/...ver/entity/src/main/java/org/ehcache/clustered/server/store/ClusterTierPassiveEntity.java b/...ver/entity/src/main/java/org/ehcache/clustered/server/store/ClusterTierPassiveEntity.java
@@ -162,7 +162,8 @@ public int getConcurrencyKey() {
         }
       };
     }
-    messageHandler.invoke(realContext, message, this::invokePassiveInternal);
+    EhcacheEntityResponse resp = invokePassiveInternal(realContext, message);
+    messageHandler.invoke(realContext, message, (c, m) -> resp);
   }
 
   @SuppressWarnings("try")

diff --git a/...entity/src/test/java/org/ehcache/clustered/server/store/ClusterTierPassiveEntityTest.java b/...entity/src/test/java/org/ehcache/clustered/server/store/ClusterTierPassiveEntityTest.java
@@ -142,36 +142,6 @@ public void testInvalidMessageThrowsError() throws Exception {
     }
   }
 
-  @Test
-  public void testPassiveTracksMessageDuplication() throws Exception {
-    ClusterTierPassiveEntity passiveEntity = new ClusterTierPassiveEntity(defaultRegistry, defaultConfiguration, DEFAULT_MAPPER);
-    passiveEntity.createNew();
-
-    Chain chain = sequencedChainOf(createPayload(1L));
-    TestClientDescriptor client = TestClientDescriptor.newClient();
-
-    long clientId = 3;
-
-    PassiveReplicationMessage message1 = new PassiveReplicationMessage.ChainReplicationMessage(2, chain, 2L, 1L, clientId);
-    passiveEntity.invokePassive(client.invokeContext(), message1);
-
-    // Should be added
-    assertThat(passiveEntity.getStateService().getStore(passiveEntity.getStoreIdentifier()).get(2).isEmpty(), is(false));
-
-    Chain emptyChain = sequencedChainOf();
-    PassiveReplicationMessage message2 = new PassiveReplicationMessage.ChainReplicationMessage(2, emptyChain, 2L, 1L, clientId);
-    passiveEntity.invokePassive(client.invokeContext(), message2);
-
-    // Should not be cleared, message is a duplicate
-    assertThat(passiveEntity.getStateService().getStore(passiveEntity.getStoreIdentifier()).get(2).isEmpty(), is(false));
-
-    PassiveReplicationMessage message3 = new PassiveReplicationMessage.ChainReplicationMessage(2, chain, 3L, 1L, clientId);
-    passiveEntity.invokePassive(client.invokeContext(), message3);
-
-    // Should be added as well, different message id
-    assertThat(passiveEntity.getStateService().getStore(passiveEntity.getStoreIdentifier()).get(2).isEmpty(), is(false));
-  }
-
   @Test
   public void testOversizeReplaceAtHeadMessage() throws Exception {
     ClusterTierPassiveEntity passiveEntity = new ClusterTierPassiveEntity(defaultRegistry, defaultConfiguration, DEFAULT_MAPPER);