Renamed compute pool to compute-heavy-request pool

Author: RSam25

conf/default-config.json

@@ -42,5 +42,5 @@
   "enable_remote_config": true,
   "uid_instance_id_prefix": "local-operator",
   "enable_async_batch_request": true,
-  "compute_pool_thread_count": 7
+  "compute_heavy_request_pool_thread_count": 7
 }

src/main/java/com/uid2/operator/Const.java

@@ -40,7 +40,7 @@ public class Config extends com.uid2.shared.Const.Config {
 
         public static final String IdentityEnvironmentProp = "identity_environment";
 
-        public static final String ComputePoolThreadCountProp = "compute_pool_thread_count";
+        public static final String ComputeHeavyRequestPoolThreadCountProp = "compute_heavy_request_pool_thread_count";
         public static final String EnableAsyncBatchRequestProp = "enable_async_batch_request";
     }
 }

src/main/java/com/uid2/operator/Main.java

@@ -341,13 +341,13 @@ private void run() throws Exception {
         this.createVertxInstancesMetric();
         this.createVertxEventLoopsMetric();
 
-        // Create shared compute pool for CPU-intensive operations
-        final int computePoolSize = config.getInteger(Const.Config.ComputePoolThreadCountProp, Math.max(1, Runtime.getRuntime().availableProcessors() - 2));
-        final WorkerExecutor computeWorkerPool = vertx.createSharedWorkerExecutor("compute", computePoolSize);
-        LOGGER.info("Created compute worker pool with size: {}", computePoolSize);
+        // Create worker pool for compute-heavy requests (identity/map, key/sharing, key/bidstream)
+        final int computeHeavyRequestPoolSize = config.getInteger(Const.Config.ComputeHeavyRequestPoolThreadCountProp, Math.max(1, Runtime.getRuntime().availableProcessors() - 2));
+        final WorkerExecutor computeHeavyRequestWorkerPool = vertx.createSharedWorkerExecutor("compute-heavy-request", computeHeavyRequestPoolSize);
+        LOGGER.info("Created compute-heavy-request worker pool with size: {}", computeHeavyRequestPoolSize);
 
         Supplier<Verticle> operatorVerticleSupplier = () -> {
-            UIDOperatorVerticle verticle = new UIDOperatorVerticle(configStore, config, this.clientSideTokenGenerate, siteProvider, clientKeyProvider, clientSideKeypairProvider, getKeyManager(), saltProvider, optOutStore, Clock.systemUTC(), _statsCollectorQueue, new SecureLinkValidatorService(this.serviceLinkProvider, this.serviceProvider), this.shutdownHandler::handleSaltRetrievalResponse, this.uidInstanceIdProvider, computeWorkerPool);
+            UIDOperatorVerticle verticle = new UIDOperatorVerticle(configStore, config, this.clientSideTokenGenerate, siteProvider, clientKeyProvider, clientSideKeypairProvider, getKeyManager(), saltProvider, optOutStore, Clock.systemUTC(), _statsCollectorQueue, new SecureLinkValidatorService(this.serviceLinkProvider, this.serviceProvider), this.shutdownHandler::handleSaltRetrievalResponse, this.uidInstanceIdProvider, computeHeavyRequestWorkerPool);
             return verticle;
         };
 
@@ -376,8 +376,8 @@ private void run() throws Exception {
                 })
                 .onFailure(t -> {
                     LOGGER.error("Failed to bootstrap operator: " + t.getMessage(), new Exception(t));
-                    if (computeWorkerPool != null) {
-                        computeWorkerPool.close();
+                    if (computeHeavyRequestWorkerPool != null) {
+                        computeHeavyRequestWorkerPool.close();
                     }
                     vertx.close();
                     System.exit(1);

src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java

@@ -133,7 +133,7 @@ public class UIDOperatorVerticle extends AbstractVerticle {
     public static final long OPT_OUT_CHECK_CUTOFF_DATE = Instant.parse("2023-09-01T00:00:00.00Z").getEpochSecond();
     private final Handler<Boolean> saltRetrievalResponseHandler;
     private final int allowClockSkewSeconds;
-    private final WorkerExecutor computeWorkerPool;
+    private final WorkerExecutor computeHeavyRequestWorkerPool;
     protected Map<Integer, Set<String>> siteIdToInvalidOriginsAndAppNames = new HashMap<>();
     protected boolean keySharingEndpointProvideAppNames;
     protected Instant lastInvalidOriginProcessTime = Instant.now();
@@ -168,7 +168,7 @@ public UIDOperatorVerticle(IConfigStore configStore,
                                SecureLinkValidatorService secureLinkValidatorService,
                                Handler<Boolean> saltRetrievalResponseHandler,
                                UidInstanceIdProvider uidInstanceIdProvider,
-                               WorkerExecutor computeWorkerPool) {
+                               WorkerExecutor computeHeavyRequestWorkerPool) {
         this.keyManager = keyManager;
         this.secureLinkValidatorService = secureLinkValidatorService;
         try {
@@ -202,7 +202,7 @@ public UIDOperatorVerticle(IConfigStore configStore,
         this.identityV3Enabled = config.getBoolean(IdentityV3Prop, false);
         this.disableOptoutToken = config.getBoolean(DisableOptoutTokenProp, false);
         this.uidInstanceIdProvider = uidInstanceIdProvider;
-        this.computeWorkerPool = computeWorkerPool;
+        this.computeHeavyRequestWorkerPool = computeHeavyRequestWorkerPool;
         this.isAsyncBatchRequestsEnabled = config.getBoolean(EnableAsyncBatchRequestProp, false);
     }
 
@@ -698,14 +698,14 @@ public void handleKeysBidstream(RoutingContext rc) {
     }
 
     private Future<Void> handleKeysSharingAsync(RoutingContext rc) {
-        return computeWorkerPool.executeBlocking(() -> {
+        return computeHeavyRequestWorkerPool.executeBlocking(() -> {
             handleKeysSharing(rc);
             return null;
         });
     }
 
     private Future<Void> handleKeysBidstreamAsync(RoutingContext rc) {
-        return computeWorkerPool.executeBlocking(() -> {
+        return computeHeavyRequestWorkerPool.executeBlocking(() -> {
             handleKeysBidstream(rc);
             return null;
         });
@@ -1072,7 +1072,7 @@ private Future handleLogoutAsyncV2(RoutingContext rc) {
     }
 
     private Future<Void> handleBucketsV2Async(RoutingContext rc) {
-        return computeWorkerPool.executeBlocking(() -> {
+        return computeHeavyRequestWorkerPool.executeBlocking(() -> {
             handleBucketsV2(rc);
             return null;
         });
@@ -1264,7 +1264,7 @@ private boolean validateServiceLink(RoutingContext rc) {
     }
 
     private Future<Void> handleIdentityMapV2Async(RoutingContext rc) {
-        return computeWorkerPool.executeBlocking(() -> {
+        return computeHeavyRequestWorkerPool.executeBlocking(() -> {
             handleIdentityMapV2(rc);
             return null;
         });
@@ -1334,7 +1334,7 @@ private InputUtil.InputVal[] getIdentityMapV2Input(RoutingContext rc) {
     }
 
     private Future<Void> handleIdentityMapV3Async(RoutingContext rc) {
-        return computeWorkerPool.executeBlocking(() -> {
+        return computeHeavyRequestWorkerPool.executeBlocking(() -> {
             handleIdentityMapV3(rc);
             return null;
         });

src/test/java/com/uid2/operator/ExtendedUIDOperatorVerticle.java

@@ -35,8 +35,8 @@ public ExtendedUIDOperatorVerticle(IConfigStore configStore,
                                        SecureLinkValidatorService secureLinkValidationService,
                                        Handler<Boolean> saltRetrievalResponseHandler,
                                        UidInstanceIdProvider uidInstanceIdProvider,
-                                       WorkerExecutor computeWorkerPool) {
-        super(configStore, config, clientSideTokenGenerate, siteProvider, clientKeyProvider, clientSideKeypairProvider, keyManager, saltProvider, optOutStore, clock, statsCollectorQueue, secureLinkValidationService, saltRetrievalResponseHandler, uidInstanceIdProvider, computeWorkerPool);
+                                       WorkerExecutor computeHeavyRequestWorkerPool) {
+        super(configStore, config, clientSideTokenGenerate, siteProvider, clientKeyProvider, clientSideKeypairProvider, keyManager, saltProvider, optOutStore, clock, statsCollectorQueue, secureLinkValidationService, saltRetrievalResponseHandler, uidInstanceIdProvider, computeHeavyRequestWorkerPool);
     }
 
     public IUIDOperatorService getIdService() {

src/test/java/com/uid2/operator/UIDOperatorVerticleTest.java

@@ -143,7 +143,7 @@ public class UIDOperatorVerticleTest {
     private ExtendedUIDOperatorVerticle uidOperatorVerticle;
     private RuntimeConfig runtimeConfig;
     private EncryptedTokenEncoder encoder;
-    private WorkerExecutor computeWorkerPool;
+    private WorkerExecutor computeHeavyRequestWorkerPool;
 
     @BeforeEach
     void deployVerticle(Vertx vertx, VertxTestContext testContext, TestInfo testInfo) {
@@ -167,8 +167,8 @@ void deployVerticle(Vertx vertx, VertxTestContext testContext, TestInfo testInfo
 
         this.uidInstanceIdProvider = new UidInstanceIdProvider("test-instance", "id");
 
-        this.computeWorkerPool = vertx.createSharedWorkerExecutor("compute", 4);
-        this.uidOperatorVerticle = new ExtendedUIDOperatorVerticle(configStore, config, config.getBoolean("client_side_token_generate"), siteProvider, clientKeyProvider, clientSideKeypairProvider, new KeyManager(keysetKeyStore, keysetProvider), saltProvider, optOutStore, clock, statsCollectorQueue, secureLinkValidatorService, shutdownHandler::handleSaltRetrievalResponse, uidInstanceIdProvider, this.computeWorkerPool);
+        this.computeHeavyRequestWorkerPool = vertx.createSharedWorkerExecutor("compute-heavy-request", 4);
+        this.uidOperatorVerticle = new ExtendedUIDOperatorVerticle(configStore, config, config.getBoolean("client_side_token_generate"), siteProvider, clientKeyProvider, clientSideKeypairProvider, new KeyManager(keysetKeyStore, keysetProvider), saltProvider, optOutStore, clock, statsCollectorQueue, secureLinkValidatorService, shutdownHandler::handleSaltRetrievalResponse, uidInstanceIdProvider, this.computeHeavyRequestWorkerPool);
         vertx.deployVerticle(uidOperatorVerticle, testContext.succeeding(id -> testContext.completeNow()));
 
         this.registry = new SimpleMeterRegistry();
@@ -180,8 +180,8 @@ void deployVerticle(Vertx vertx, VertxTestContext testContext, TestInfo testInfo
     @AfterEach
     void teardown() {
         Metrics.globalRegistry.remove(registry);
-        if (computeWorkerPool != null) {
-            computeWorkerPool.close();
+        if (computeHeavyRequestWorkerPool != null) {
+            computeHeavyRequestWorkerPool.close();
         }
     }