# IGNITE-54-55 Minor changes.

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

@@ -3400,14 +3400,10 @@ public String toString() {
                 // Send job to all nodes.
                 Collection<ClusterNode> nodes = ctx.grid().forCacheNodes(name()).nodes();
 
-                IgniteInternalFuture<Object> fut = null;
-
-                if (!nodes.isEmpty())
-                    fut = ctx.closures().callAsyncNoFailover(BROADCAST, new GlobalRemoveAllCallable<>(name(), topVer, REMOVE_ALL_BATCH_SIZE), nodes, true);
-
-                if (fut != null)
-                    fut.get();
-
+                if (!nodes.isEmpty()) {
+                    ctx.closures().callAsyncNoFailover(BROADCAST,
+                        new GlobalRemoveAllCallable<>(name(), topVer, REMOVE_ALL_BATCH_SIZE), nodes, true).get();
+                }
             } while (ctx.affinity().affinityTopologyVersion() > topVer);
         }
         catch (ClusterGroupEmptyException ignore) {
@@ -5236,7 +5232,6 @@ public GlobalRemoveAllCallable() {
          * @param cacheName Cache name.
          * @param topVer Topology version.
          * @param rmvBatchSz Remove batch size.
-         * @param filter Filter.
          */
         private GlobalRemoveAllCallable(String cacheName, long topVer, long rmvBatchSz) {
             this.cacheName = cacheName;
@@ -5248,25 +5243,30 @@ private GlobalRemoveAllCallable(String cacheName, long topVer, long rmvBatchSz)
          * {@inheritDoc}
          */
         @Override public Object call() throws Exception {
-            Set<K> keys = new HashSet<>();
+            Collection<K> keys = new ArrayList<>();
 
             final IgniteKernal grid = (IgniteKernal) ignite;
 
             final GridCache<K,V> cache = grid.cachex(cacheName);
 
             final GridCacheContext<K, V> ctx = grid.context().cache().<K, V>internalCache(cacheName).context();
 
+            if (ctx.affinity().affinityTopologyVersion() != topVer)
+                return null; // Ignore this remove request because remove request will be sent again.
+
             assert cache != null;
 
             for (K k : cache.keySet()) {
                 if (ctx.affinity().primary(ctx.localNode(), k, topVer))
                     keys.add(k);
+
                 if (keys.size() >= rmvBatchSz) {
                     cache.removeAll(keys);
 
                     keys.clear();
                 }
             }
+
             cache.removeAll(keys);
 
             return null;

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

@@ -124,9 +124,8 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
                                     // removeAll() removes mapping only when it presents at a primary node.
                                     // To remove all mappings used force remove by key.
                                     if (cache.size() > 0) {
-                                        for (Object k : cache.keySet()) {
+                                        for (Object k : cache.keySet())
                                             cache.remove(k);
-                                        }
                                     }
 
                                     if (offheapTiered(cache)) {

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

@@ -101,8 +101,11 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA
     @Override protected void afterTest() throws Exception {
         super.afterTest();
 
+        if (GRID_CNT > 0)
+            grid(0).cache(null).removeAll();
+
         for (int i = 0; i < GRID_CNT; i++) {
-            grid(i).cache(null).removeAll();
+            grid(0).cache(null).clearLocally();
 
             assert grid(i).cache(null).isEmpty();
         }