fix after review

Author: zstan

modules/calcite/src/test/java/org/apache/ignite/internal/processors/tx/TxWithExceptionalInterceptorTest.java

@@ -55,7 +55,6 @@
 import org.junit.runners.Parameterized;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 import static org.apache.ignite.cache.CacheMode.REPLICATED;
 
 /** Check per node data consistency after exceptionally interceptor method call. */
@@ -343,14 +342,12 @@ public void testTxWithExceptionInterceptor() throws Exception {
         assertTrue(grids.get(0).name().contains(CLIENT_NAME));
 
         for (Ignite node : grids) {
-            if (!writeThrough && txCoord == TxCoordNodeRole.PRIMARY) {
-                getSqlResultByKey(node, processedCacheName, primaryKey, true);
-                getKVResultByKey(node, processedCacheName, primaryKey, true);
-
-                continue;
-            }
-
             if (txCoord == TxCoordNodeRole.PRIMARY) {
+                if (!writeThrough) {
+                    getSqlResultByKey(node, processedCacheName, primaryKey, true);
+                    getKVResultByKey(node, processedCacheName, primaryKey, true);
+                }
+
                 getSqlResultByKey(node, commonCacheName, primaryKey, true);
                 getKVResultByKey(node, commonCacheName, primaryKey, true);
 
@@ -440,8 +437,8 @@ private Integer getSqlResultByKey(Ignite node, String cacheName, Integer key, bo
                 cacheName + " WHERE id = ?").setArgs(key)).getAll();
 
         if (checkResIsEmpty) {
-            assertTrue(resCalcite.isEmpty());
-            assertTrue(resIdx.isEmpty());
+            assertTrue("Expect empty result", resCalcite.isEmpty());
+            assertTrue("Expect empty result", resIdx.isEmpty());
 
             return null;
         }

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java

@@ -1387,9 +1387,7 @@ protected void sessionEnd(final Collection<CacheStoreManager> stores, boolean co
      * @param writeEntries Transaction write set.
      * @throws IgniteCheckedException If batch update failed.
      */
-    protected final void batchStoreCommit(Iterable<IgniteTxEntry> writeEntries)
-        throws IgniteCheckedException
-    {
+    protected final void batchStoreCommit(Iterable<IgniteTxEntry> writeEntries) throws IgniteCheckedException {
         if (!storeEnabled() || internal() ||
             (!local() && near())) // No need to work with local store at GridNearTxRemote.
             return;

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java

@@ -1351,8 +1351,6 @@ private void processDhtTxFinishRequest(final UUID nodeId, final GridDhtTxFinishR
             assert nodeId != null;
             assert req != null;
 
-            System.err.println("!!! processDhtTxFinishRequest " + req.checkCommitted());
-
             if (req.checkCommitted()) {
                 boolean committed = req.waitRemoteTransactions() || !ctx.tm().addRolledbackTx(null, req.version());
 

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java

@@ -607,8 +607,6 @@ private void salvageTx(IgniteInternalTx tx, IgniteInternalTx.FinalizationStatus
                 return;
             }
 
-            System.err.println("!!!salvage");
-
             tx.salvageTx();
 
             if (log.isInfoEnabled())

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java

@@ -74,7 +74,7 @@ public class IgniteTxStateImpl extends IgniteTxLocalStateAdapter {
     @GridToStringInclude
     private Boolean recovery;
 
-    /** */
+    /** Cached flag, {@code True} if {@link CacheStoreManager#isWriteThrough()} enabled for all caches involved. */
     @GridToStringInclude
     private Boolean storeWriteThrough;
 

modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreWithIgniteTxFailureTest.java

@@ -186,21 +186,37 @@ public void testSystemExceptionAfterCacheStoreCommit() throws Exception {
             if (faultyNodeRole != FaultyNodeRole.TX_COORDINATOR) {
                 waitForTopology(3);
 
-                assertTrue("Client node should survive test scenario",
-                    G.allGrids()
-                        .stream()
-                        .filter(ignite -> ((IgniteEx)ignite).context().clientNode())
-                        .count() == 1);
+                checkClientIsAvailable();
             }
-            else
+            else {
                 waitForTopology(2);
+
+                checkFultyNode(FAULTY_NODE_IDX);
+            }
         }
         else
             checkKeysOnFaultyNode(keysOnFaultyNode);
 
         checkKeysOnHealthyNodes(keysOnFaultyNode);
     }
 
+    /** Check client node availability. */
+    private void checkClientIsAvailable() {
+        assertTrue("Client node should survive test scenario",
+            G.allGrids()
+                .stream()
+                .filter(ignite -> ((IgniteEx)ignite).context().clientNode())
+                .count() == 1);
+    }
+
+    /** Check that faulty node is absent in current topology. */
+    private void checkFultyNode(int faultyNodeIdx) {
+        assertTrue("Faulty node should survive test scenario, idx=" + faultyNodeIdx,
+            G.allGrids()
+                .stream()
+                .noneMatch(ignite -> ignite.name().equals(getTestIgniteInstanceName(faultyNodeIdx))));
+    }
+
     /** */
     private void fillCache(IgniteCache<Integer, Integer> cache, int numOfKeys) {
         for (int i = 0; i < numOfKeys; i++)