ISPN-6907: Repl/Dist cache with Transactions doesn't respect shared s…

…tore semantics

core/src/main/java/org/infinispan/interceptors/impl/CacheWriterInterceptor.java

@@ -422,7 +422,7 @@ public Object visitApplyDeltaCommand(InvocationContext ctx, ApplyDeltaCommand co
                ice = entryFactory.create(entry);
             }
             MarshalledEntryImpl marshalledEntry = new MarshalledEntryImpl(ice.getKey(), ice.getValue(), internalMetadata(ice), marshaller);
-            persistenceManager.writeToAllNonTxStores(marshalledEntry, command.hasFlag(Flag.SKIP_SHARED_CACHE_STORE) ? PRIVATE : BOTH);
+            persistenceManager.writeToAllNonTxStores(marshalledEntry, skipSharedStores(ctx, command.getKey(), command) ? PRIVATE : BOTH);
          }
          return null;
       }
@@ -444,7 +444,7 @@ public Object visitPutMapCommand(InvocationContext ctx, PutMapCommand command) t
       public Object visitRemoveCommand(InvocationContext ctx, RemoveCommand command) throws Throwable {
          Object key = command.getKey();
          if (isProperWriter(ctx, command, key)) {
-            persistenceManager.deleteFromAllStores(key, BOTH);
+            persistenceManager.deleteFromAllStores(key, skipSharedStores(ctx, key, command) ? PRIVATE : BOTH);
          }
          return null;
       }
@@ -460,7 +460,7 @@ protected Object visitSingleStore(InvocationContext ctx, FlagAffectedCommand com
             if (generateStatistics) putCount++;
             InternalCacheValue sv = entryFactory.getValueFromCtxOrCreateNew(key, ctx);
             MarshalledEntryImpl me = new MarshalledEntryImpl(key, sv.getValue(), internalMetadata(sv), marshaller);
-            persistenceManager.writeToAllNonTxStores(me, command.hasFlag(Flag.SKIP_SHARED_CACHE_STORE) ? PRIVATE : BOTH);
+            persistenceManager.writeToAllNonTxStores(me, skipSharedStores(ctx, key, command) ? PRIVATE : BOTH);
          }
          return null;
       }

core/src/test/java/org/infinispan/distribution/BaseDistStoreTest.java

@@ -3,6 +3,7 @@
 import org.infinispan.configuration.cache.ConfigurationBuilder;
 import org.infinispan.persistence.dummy.DummyInMemoryStore;
 import org.infinispan.persistence.dummy.DummyInMemoryStoreConfigurationBuilder;
+import org.infinispan.persistence.spi.CacheLoader;
 
 /**
  * DistSyncCacheStoreTest.
@@ -26,4 +27,11 @@ protected ConfigurationBuilder buildConfiguration() {
       }
       return cfg;
    }
+
+   protected void assertNumberOfInvocations(CacheLoader cs, String method, int expected) {
+      int actual = ((DummyInMemoryStore) cs).stats().get(method);
+      assert expected == actual : "Expected " + expected + " but was " + actual;
+   }
+
+
 }

core/src/test/java/org/infinispan/distribution/DistSyncStoreSharedTest.java

@@ -104,12 +104,6 @@ public void testPutFromOwner() throws Exception {
       assertOnAllCachesAndOwnership(key, value);
    }
 
-   private void assertNumberOfInvocations(CacheLoader cs, String method, int expected) {
-      int actual = ((DummyInMemoryStore) cs).stats().get(method);
-      assert expected == actual : "Expected " + expected + " but was " + actual;
-   }
-
-
    public void testPutAll() throws Exception {
       log.trace("Here it begins");
       String k1 = "1", v1 = "one", k2 = "2", v2 = "two", k3 = "3", v3 = "three", k4 = "4", v4 = "four";

core/src/test/java/org/infinispan/distribution/DistSyncTxStoreSharedTest.java

@@ -18,12 +18,8 @@
 public class DistSyncTxStoreSharedTest extends BaseDistStoreTest {
 
    public DistSyncTxStoreSharedTest() {
-      sync = true;
       tx = true;
-      testRetVals = true;
       shared = true;
-      INIT_CLUSTER_SIZE = 2;
-      numOwners = 1;
    }
 
    public void testPutFromNonOwner() throws Exception {
@@ -33,6 +29,7 @@ public void testPutFromNonOwner() throws Exception {
       assertEquals("v1", cacheX.get("key1"));
       assertNotNull(storeX.load("key1"));
       assertEquals("v1", storeX.load("key1").getValue());
+      assertNumberOfInvocations(storeX, "write", 1); // Shared store, so only one node should have written the change
    }
 
 }