fixup! IGNITE-13051 fix: check mvcc configuration after register caches future completion

Author: timoninmaxim

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

@@ -853,6 +853,12 @@ public IgniteInternalFuture<?> onCacheChangeRequest(
 
         IgniteInternalFuture<?> res = cachesRegistry.update(exchActions);
 
+        for (ExchangeActions.CacheActionData d: exchActions.cacheStartRequests())
+            cctx.coordinators().validateCacheConfiguration(d.descriptor().cacheConfiguration());
+
+        for (DynamicCacheDescriptor d: cachesRegistry.allCaches().values())
+            cctx.coordinators().validateCacheConfiguration(d.cacheConfiguration());
+
         // Affinity did not change for existing caches.
         onCustomMessageNoAffinityChange(fut, exchActions);
 
@@ -1351,6 +1357,9 @@ public IgniteInternalFuture<?> initStartedCaches(
     ) throws IgniteCheckedException {
         IgniteInternalFuture<?> res = cachesRegistry.addUnregistered(descs);
 
+        for (DynamicCacheDescriptor d: descs)
+            cctx.coordinators().validateCacheConfiguration(d.cacheConfiguration());
+
         if (fut.context().mergeExchanges())
             return res;
 

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

@@ -1659,6 +1659,9 @@ public IgniteInternalFuture<?> startCachesOnLocalJoin(
         IgniteInternalFuture<?> res = sharedCtx.affinity().initCachesOnLocalJoin(
             locJoinCtx.cacheGroupDescriptors(), locJoinCtx.cacheDescriptors());
 
+        for (DynamicCacheDescriptor d: locJoinCtx.cacheDescriptors().values())
+            ctx.coordinators().validateCacheConfiguration(d.cacheConfiguration());
+
         List<StartCacheInfo> startCacheInfos = locJoinCtx.caches().stream()
             .map(cacheInfo -> new StartCacheInfo(cacheInfo.get1(), cacheInfo.get2(), exchTopVer, false))
             .collect(Collectors.toList());

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java

@@ -2624,15 +2624,17 @@ private Map<String, DynamicCacheChangeRequest> resolveCacheRequests(ExchangeActi
      */
     private void waitUntilNewCachesAreRegistered() {
         try {
-            if (registerCachesFuture != null && !registerCachesFuture.isDone()) {
+            IgniteInternalFuture<?> registerCachesFut = registerCachesFuture;
+
+            if (registerCachesFut != null && !registerCachesFut.isDone()) {
                 final int timeout = Math.max(1000,
                     (int)(cctx.kernalContext().config().getFailureDetectionTimeout() / 2));
 
                 for (; ; ) {
                     cctx.exchange().exchangerBlockingSectionBegin();
 
                     try {
-                        registerCachesFuture.get(timeout, TimeUnit.SECONDS);
+                        registerCachesFut.get(timeout, TimeUnit.SECONDS);
 
                         break;
                     }
@@ -2654,15 +2656,6 @@ private void waitUntilNewCachesAreRegistered() {
         catch (IgniteCheckedException e) {
             U.error(log, "Failed to wait for caches registration and saving", e);
         }
-        finally {
-            try {
-                for (DynamicCacheDescriptor d: cctx.cache().cacheDescriptors().values())
-                    cctx.coordinators().validateCacheConfiguration(d.cacheConfiguration());
-            }
-            catch (IgniteCheckedException e) {
-                U.error(log, "Failed to validate caches by coordinators", e);
-            }
-        }
     }
 
     /**

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLossWithRestartsTest.java

@@ -22,6 +22,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -70,27 +71,33 @@ public class CachePartitionLossWithRestartsTest extends GridCommonAbstractTest {
     @Parameterized.Parameter(value = 3)
     public int clientIdx;
 
+    /** Possible values: true, false */
+    @Parameterized.Parameter(value = 4)
+    public boolean mvccEnabled;
+
     /** */
     @Parameterized.Parameters(name = "{0} {1} {2} {3}")
     public static List<Object[]> parameters() {
         ArrayList<Object[]> params = new ArrayList<>();
 
-        for (boolean persistent : new boolean[]{false, true}) {
-            params.add(new Object[]{-1, false, persistent, 3});
-            params.add(new Object[]{0, false, persistent, 3});
-            params.add(new Object[]{2, false, persistent, 3});
+        for (boolean mvcc : new boolean[]{false, true}) {
+            for (boolean persistent : new boolean[] {false, true}) {
+                params.add(new Object[] {-1, false, persistent, 3, mvcc});
+                params.add(new Object[] {0, false, persistent, 3, mvcc});
+                params.add(new Object[] {2, false, persistent, 3, mvcc});
 
-            params.add(new Object[]{-1, false, persistent, -1});
-            params.add(new Object[]{0, false, persistent, -1});
-            params.add(new Object[]{2, false, persistent, -1});
+                params.add(new Object[] {-1, false, persistent, -1, mvcc});
+                params.add(new Object[] {0, false, persistent, -1, mvcc});
+                params.add(new Object[] {2, false, persistent, -1, mvcc});
 
-            params.add(new Object[]{-1, true, persistent, 3});
-            params.add(new Object[]{0, true, persistent, 3});
-            params.add(new Object[]{2, true, persistent, 3});
+                params.add(new Object[] {-1, true, persistent, 3, mvcc});
+                params.add(new Object[] {0, true, persistent, 3, mvcc});
+                params.add(new Object[] {2, true, persistent, 3, mvcc});
 
-            params.add(new Object[]{-1, true, persistent, -1});
-            params.add(new Object[]{0, true, persistent, -1});
-            params.add(new Object[]{2, true, persistent, -1});
+                params.add(new Object[] {-1, true, persistent, -1, mvcc});
+                params.add(new Object[] {0, true, persistent, -1, mvcc});
+                params.add(new Object[] {2, true, persistent, -1, mvcc});
+            }
         }
 
         return params;
@@ -128,6 +135,9 @@ public static List<Object[]> parameters() {
                 setBackups(0).
                 setAffinity(new RendezvousAffinityFunction(false, PARTS_CNT));
 
+        if (mvccEnabled)
+            ccfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT);
+
         if (startClientCache)
             cfg.setCacheConfiguration(ccfg);