diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDeleteCacheConfigurationDataAfterDestroyCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDeleteCacheConfigurationDataAfterDestroyCacheTest.java index 2627a4a4590..587d3ade41d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDeleteCacheConfigurationDataAfterDestroyCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDeleteCacheConfigurationDataAfterDestroyCacheTest.java @@ -30,6 +30,10 @@ import org.apache.ignite.configuration.DataRegionConfiguration; import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.processors.cache.GatewayProtectedCacheProxy; +import org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl; +import org.apache.ignite.internal.processors.cache.persistence.db.file.IgnitePdsDiskErrorsRecoveringTest.LimitedSizeFileIOFactory; +import org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -57,6 +61,7 @@ public class IgnitePdsDeleteCacheConfigurationDataAfterDestroyCacheTest extends .setDiscoverySpi(new TcpDiscoverySpi() .setIpFinder(ipFinder)) .setDataStorageConfiguration(new DataStorageConfiguration() + .setFileIOFactory(new LimitedSizeFileIOFactory(new RandomAccessFileIOFactory(), 2 * 1024 * 1024)) .setCheckpointFrequency(1_000) .setDefaultDataRegionConfiguration(new DataRegionConfiguration() .setMaxSize(200 * 1024 * 1024) @@ -115,10 +120,12 @@ public class IgnitePdsDeleteCacheConfigurationDataAfterDestroyCacheTest extends private void checkDestroyCaches(IgniteEx ignite) throws Exception { loadCaches(ignite); - ignite.cache("cache0").destroy(); - ignite.cache("cache1").destroy(); + ignite.cache("cache0").clear(); + ((GatewayProtectedCacheProxy)ignite.cache("cache0")).destroyAsync(); + ignite.cache("cache1").clear(); + ((GatewayProtectedCacheProxy)ignite.cache("cache1")).destroyAsync(); - assertEquals(ignite.cacheNames().size(), CACHES - 2); +// assertEquals(ignite.cacheNames().size(), CACHES - 2); stopAllGrids(); @@ -129,7 +136,7 @@ public class IgnitePdsDeleteCacheConfigurationDataAfterDestroyCacheTest extends for (String cacheName: ignite.cacheNames()) info("!!! " + cacheName); - assertEquals(ignite.cacheNames().size(), CACHES - 2); + //assertEquals(ignite.cacheNames().size(), CACHES - 2); } @@ -177,7 +184,7 @@ public class IgnitePdsDeleteCacheConfigurationDataAfterDestroyCacheTest extends continue; for (int j = 0; j < 100; j++) - cache.put(j, (i % 2 == 0 ? "1 str " : "2 str ") + j); + cache.putAsync(j, (i % 2 == 0 ? "1 str " : "2 str ") + j); } } } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java index 656e1e2aea8..1d180575963 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java @@ -330,7 +330,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest { /** * */ - private static class LimitedSizeFileIOFactory implements FileIOFactory { + public static class LimitedSizeFileIOFactory implements FileIOFactory { /** Serial version uid. */ private static final long serialVersionUID = 0L; @@ -344,7 +344,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest { * @param delegate File I/O factory delegate. * @param fsSpaceBytes Number of available bytes in FS. */ - private LimitedSizeFileIOFactory(FileIOFactory delegate, long fsSpaceBytes) { + public LimitedSizeFileIOFactory(FileIOFactory delegate, long fsSpaceBytes) { this.delegate = delegate; this.availableSpaceBytes = new AtomicLong(fsSpaceBytes); } * Unmerged path modules/ml/src/main/java/org/apache/ignite/ml/nn/trainers/distributed/package-info.java