IGNITE-26788

Author: petrov-mg

modules/control-utility/src/test/java/org/apache/ignite/util/SystemViewCommandTest.java

@@ -71,7 +71,7 @@
 import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager;
 import org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage;
 import org.apache.ignite.internal.processors.service.DummyService;
-import org.apache.ignite.internal.util.StripedExecutor;
+import org.apache.ignite.internal.thread.IgniteStripedExecutor;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.internal.U;
@@ -833,7 +833,7 @@ public void testStreamerExecutor() throws Exception {
      * @param view System view name.
      * @param poolName Executor name.
      */
-    private void checkStripeExecutorView(StripedExecutor execSvc, String view, String poolName) throws Exception {
+    private void checkStripeExecutorView(IgniteStripedExecutor execSvc, String view, String poolName) throws Exception {
         CountDownLatch latch = new CountDownLatch(1);
 
         execSvc.execute(0, new TestRunnable(latch, 0));

modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java

@@ -130,10 +130,10 @@
 import static org.apache.ignite.internal.processors.rest.GridRestProcessor.DFLT_SES_TIMEOUT;
 import static org.apache.ignite.internal.processors.rest.GridRestProcessor.DFLT_SES_TOKEN_INVALIDATE_INTERVAL;
 import static org.apache.ignite.internal.processors.rest.handlers.task.GridTaskCommandHandler.DFLT_MAX_TASK_RESULTS;
+import static org.apache.ignite.internal.thread.IgniteStripedExecutor.DFLT_DATA_STREAMING_EXECUTOR_SERVICE_TASKS_STEALING_THRESHOLD;
 import static org.apache.ignite.internal.util.GridReflectionCache.DFLT_REFLECTION_CACHE_SIZE;
 import static org.apache.ignite.internal.util.IgniteExceptionRegistry.DEFAULT_QUEUE_SIZE;
 import static org.apache.ignite.internal.util.IgniteUtils.DFLT_MBEAN_APPEND_CLASS_LOADER_ID;
-import static org.apache.ignite.internal.util.StripedExecutor.DFLT_DATA_STREAMING_EXECUTOR_SERVICE_TASKS_STEALING_THRESHOLD;
 import static org.apache.ignite.internal.util.nio.GridNioRecoveryDescriptor.DFLT_NIO_RECOVERY_DESCRIPTOR_RESERVATION_TIMEOUT;
 import static org.apache.ignite.internal.util.nio.GridNioServer.DFLT_IO_BALANCE_PERIOD;
 import static org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi.DFLT_DISCOVERY_CLIENT_RECONNECT_HISTORY_SIZE;

modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java

@@ -173,7 +173,7 @@
 import org.apache.ignite.internal.suggestions.GridPerformanceSuggestions;
 import org.apache.ignite.internal.suggestions.JvmConfigurationSuggestions;
 import org.apache.ignite.internal.suggestions.OsConfigurationSuggestions;
-import org.apache.ignite.internal.util.StripedExecutor;
+import org.apache.ignite.internal.thread.IgniteStripedExecutor;
 import org.apache.ignite.internal.util.TimeBag;
 import org.apache.ignite.internal.util.future.GridCompoundFuture;
 import org.apache.ignite.internal.util.future.GridFinishedFuture;
@@ -1335,8 +1335,8 @@ private String createExecutorDescription(String execSvcName, ExecutorService exe
             poolActiveThreads = Math.min(poolSize, exec.getActiveCount());
             poolQSize = exec.getQueue().size();
         }
-        else if (execSvc instanceof StripedExecutor) {
-            StripedExecutor exec = (StripedExecutor)execSvc;
+        else if (execSvc instanceof IgniteStripedExecutor) {
+            IgniteStripedExecutor exec = (IgniteStripedExecutor)execSvc;
 
             poolSize = exec.stripesCount();
             poolActiveThreads = exec.activeStripesCount();

modules/core/src/main/java/org/apache/ignite/internal/plugin/IgniteLogInfoProviderImpl.java

@@ -56,7 +56,7 @@
 import org.apache.ignite.internal.processors.cache.persistence.DataRegion;
 import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager;
 import org.apache.ignite.internal.processors.port.GridPortRecord;
-import org.apache.ignite.internal.util.StripedExecutor;
+import org.apache.ignite.internal.thread.IgniteStripedExecutor;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.S;
@@ -785,8 +785,8 @@ String createExecutorDescription(String execSvcName, ExecutorService execSvc) {
             poolActiveThreads = Math.min(poolSize, exec.getActiveCount());
             poolQSize = exec.getQueue().size();
         }
-        else if (execSvc instanceof StripedExecutor) {
-            StripedExecutor exec = (StripedExecutor)execSvc;
+        else if (execSvc instanceof IgniteStripedExecutor) {
+            IgniteStripedExecutor exec = (IgniteStripedExecutor)execSvc;
 
             poolSize = exec.stripesCount();
             poolActiveThreads = exec.activeStripesCount();

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

@@ -21,26 +21,26 @@
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteInterruptedException;
-import org.apache.ignite.internal.util.StripedExecutor;
+import org.apache.ignite.internal.thread.IgniteStripedExecutor;
 import org.apache.ignite.internal.util.typedef.internal.U;
 
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_RECOVERY_SEMAPHORE_PERMITS;
 import static org.apache.ignite.IgniteSystemProperties.getInteger;
 import static org.apache.ignite.internal.processors.cache.persistence.checkpoint.CheckpointReadWriteLock.CHECKPOINT_LOCK_HOLD_COUNT;
 
-/** Wrapper over {@link StripedExecutor}, that groups submitted tasks by cache group and partition. */
+/** Wrapper over {@link IgniteStripedExecutor}, that groups submitted tasks by cache group and partition. */
 public class CacheStripedExecutor {
     /** Error appeared during submitted task execution. */
     private final AtomicReference<IgniteCheckedException> error = new AtomicReference<>();
 
     /** Delegate striped executor. */
-    private final StripedExecutor exec;
+    private final IgniteStripedExecutor exec;
 
     /** Limit number of concurrent tasks submitted to the executor. Helps to avoid OOM error. */
     private final Semaphore semaphore;
 
     /** */
-    public CacheStripedExecutor(StripedExecutor exec) {
+    public CacheStripedExecutor(IgniteStripedExecutor exec) {
         this.exec = exec;
 
         semaphore = new Semaphore(semaphorePermits(exec));
@@ -117,7 +117,7 @@ public void onError(IgniteCheckedException e) {
     }
 
     /** @return Underlying striped executor. */
-    public StripedExecutor executor() {
+    public IgniteStripedExecutor executor() {
         return exec;
     }
 
@@ -127,7 +127,7 @@ public StripedExecutor executor() {
      * @param exec Striped executor.
      * @return Number of permits.
      */
-    private int semaphorePermits(StripedExecutor exec) {
+    private int semaphorePermits(IgniteStripedExecutor exec) {
         // 4 task per-stripe by default.
         int permits = exec.stripesCount() * 4;
 

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

@@ -137,10 +137,10 @@
 import org.apache.ignite.internal.processors.configuration.distributed.SimpleDistributedProperty;
 import org.apache.ignite.internal.processors.port.GridPortRecord;
 import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.thread.IgniteStripedExecutor;
 import org.apache.ignite.internal.util.GridConcurrentHashSet;
 import org.apache.ignite.internal.util.GridCountDownCallback;
 import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.StripedExecutor;
 import org.apache.ignite.internal.util.TimeBag;
 import org.apache.ignite.internal.util.future.CountDownFuture;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -2911,7 +2911,7 @@ private void finalizeCheckpointOnRecovery(
         long cpTs,
         UUID cpId,
         WALPointer walPtr,
-        StripedExecutor exec
+        IgniteStripedExecutor exec
     ) throws IgniteCheckedException {
         assert checkpointManager != null : "Checkpoint is null";
 

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/CheckpointManager.java

@@ -44,7 +44,7 @@
 import org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemoryImpl;
 import org.apache.ignite.internal.processors.cache.persistence.wal.WALPointer;
 import org.apache.ignite.internal.processors.failure.FailureProcessor;
-import org.apache.ignite.internal.util.StripedExecutor;
+import org.apache.ignite.internal.thread.IgniteStripedExecutor;
 import org.apache.ignite.internal.util.lang.IgniteThrowableBiPredicate;
 import org.apache.ignite.internal.util.lang.IgniteThrowableFunction;
 import org.apache.ignite.internal.worker.WorkersRegistry;
@@ -381,7 +381,7 @@ public void finalizeCheckpointOnRecovery(
         long ts,
         UUID id,
         WALPointer ptr,
-        StripedExecutor exec
+        IgniteStripedExecutor exec
     ) throws IgniteCheckedException {
         assert checkpointer != null : "Checkpointer hasn't initialized yet";
 

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/CheckpointWorkflow.java

@@ -62,11 +62,11 @@
 import org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemoryEx;
 import org.apache.ignite.internal.processors.cache.persistence.partstate.PartitionAllocationMap;
 import org.apache.ignite.internal.processors.cache.persistence.wal.WALPointer;
+import org.apache.ignite.internal.thread.IgniteStripedExecutor;
 import org.apache.ignite.internal.thread.IgniteThreadPoolExecutor;
 import org.apache.ignite.internal.util.GridConcurrentHashSet;
 import org.apache.ignite.internal.util.GridConcurrentMultiPairQueue;
 import org.apache.ignite.internal.util.GridMultiCollectionWrapper;
-import org.apache.ignite.internal.util.StripedExecutor;
 import org.apache.ignite.internal.util.function.ThrowableSupplier;
 import org.apache.ignite.internal.util.future.GridCompoundFuture;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -619,7 +619,7 @@ public void finalizeCheckpointOnRecovery(
         long cpTs,
         UUID cpId,
         WALPointer walPtr,
-        StripedExecutor exec,
+        IgniteStripedExecutor exec,
         CheckpointPagesWriterFactory checkpointPagesWriterFactory
     ) throws IgniteCheckedException {
         assert cpTs != 0;
@@ -682,7 +682,7 @@ public void finalizeCheckpointOnRecovery(
      * @param applyError Check error reference.
      */
     private void awaitApplyComplete(
-        StripedExecutor exec,
+        IgniteStripedExecutor exec,
         AtomicReference<Throwable> applyError
     ) throws IgniteCheckedException {
         try {

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/Checkpointer.java

@@ -56,9 +56,9 @@
 import org.apache.ignite.internal.processors.cache.persistence.wal.WALPointer;
 import org.apache.ignite.internal.processors.failure.FailureProcessor;
 import org.apache.ignite.internal.processors.performancestatistics.PerformanceStatisticsProcessor;
+import org.apache.ignite.internal.thread.IgniteStripedExecutor;
 import org.apache.ignite.internal.thread.IgniteThreadPoolExecutor;
 import org.apache.ignite.internal.util.GridConcurrentMultiPairQueue;
-import org.apache.ignite.internal.util.StripedExecutor;
 import org.apache.ignite.internal.util.future.CountDownFuture;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
 import org.apache.ignite.internal.util.typedef.internal.LT;
@@ -1085,7 +1085,7 @@ public void finalizeCheckpointOnRecovery(
         long cpTs,
         UUID cpId,
         WALPointer walPtr,
-        StripedExecutor exec
+        IgniteStripedExecutor exec
     ) throws IgniteCheckedException {
         checkpointWorkflow.finalizeCheckpointOnRecovery(cpTs, cpId, walPtr, exec, checkpointPagesWriterFactory);
     }

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/LightweightCheckpointManager.java

@@ -38,7 +38,7 @@
 import org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemoryImpl;
 import org.apache.ignite.internal.processors.cache.persistence.wal.WALPointer;
 import org.apache.ignite.internal.processors.failure.FailureProcessor;
-import org.apache.ignite.internal.util.StripedExecutor;
+import org.apache.ignite.internal.thread.IgniteStripedExecutor;
 import org.apache.ignite.internal.util.lang.IgniteThrowableFunction;
 import org.apache.ignite.internal.worker.WorkersRegistry;
 import org.apache.ignite.lang.IgniteInClosure;
@@ -267,7 +267,7 @@ public void finalizeCheckpointOnRecovery(
         long ts,
         UUID id,
         WALPointer ptr,
-        StripedExecutor exec
+        IgniteStripedExecutor exec
     ) throws IgniteCheckedException {
         assert checkpointer != null : "Checkpointer hasn't initialized yet";