Skip to content

Commit 5c6b27f

Browse files
RSam25RSam25
committed
Cleaned up redundant code
1 parent 473d158 commit 5c6b27f

6 files changed

Lines changed: 8 additions & 65 deletions

File tree

‎conf/default-config.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,5 @@
4141
"operator_type": "public",
4242
"enable_remote_config": true,
4343
"uid_instance_id_prefix": "local-operator",
44-
"enable_async_batch_request": true,
45-
"compute_heavy_request_pool_thread_count": 7
44+
"enable_async_batch_request": true
4645
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public class Config extends com.uid2.shared.Const.Config {
4040

4141
public static final String IdentityEnvironmentProp = "identity_environment";
4242

43-
public static final String ComputeHeavyRequestPoolThreadCountProp = "compute_heavy_request_pool_thread_count";
4443
public static final String EnableAsyncBatchRequestProp = "enable_async_batch_request";
4544

4645
public static final String DefaultWorkerPoolThreadCount = "default_worker_pool_thread_count";

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -341,13 +341,8 @@ private void run() throws Exception {
341341
this.createVertxInstancesMetric();
342342
this.createVertxEventLoopsMetric();
343343

344-
// Create worker pool for compute-heavy requests (identity/map, key/sharing, key/bidstream)
345-
final int computeHeavyRequestPoolSize = config.getInteger(Const.Config.ComputeHeavyRequestPoolThreadCountProp, Math.max(1, Runtime.getRuntime().availableProcessors() - 2));
346-
final WorkerExecutor computeHeavyRequestWorkerPool = vertx.createSharedWorkerExecutor("compute-heavy-request", computeHeavyRequestPoolSize);
347-
LOGGER.info("Created compute-heavy-request worker pool with size: {}", computeHeavyRequestPoolSize);
348-
349344
Supplier<Verticle> operatorVerticleSupplier = () -> {
350-
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);
345+
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);
351346
return verticle;
352347
};
353348

@@ -376,9 +371,6 @@ private void run() throws Exception {
376371
})
377372
.onFailure(t -> {
378373
LOGGER.error("Failed to bootstrap operator: " + t.getMessage(), new Exception(t));
379-
if (computeHeavyRequestWorkerPool != null) {
380-
computeHeavyRequestWorkerPool.close();
381-
}
382374
vertx.close();
383375
System.exit(1);
384376
});
@@ -505,10 +497,9 @@ private static Vertx createVertx() {
505497
? 60 * 1000
506498
: 3600 * 1000;
507499

508-
// Worker pool size: read from env var, default to (cpus-2)/2 + 1 clamped to min 2
509500
final int defaultWorkerPoolSize = Math.max(2, (Runtime.getRuntime().availableProcessors() - 2) / 2 + 1);
510501
final int workerPoolSize = getEnvInt(Const.Config.DefaultWorkerPoolThreadCount, defaultWorkerPoolSize);
511-
LOGGER.info("Creating Vertx with worker pool size: {}", workerPoolSize);
502+
LOGGER.info("Creating Vertx with default worker pool size: {}", workerPoolSize);
512503

513504
VertxOptions vertxOptions = new VertxOptions()
514505
.setMetricsOptions(metricOptions)

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

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import io.vertx.core.Future;
4343
import io.vertx.core.Handler;
4444
import io.vertx.core.Promise;
45-
import io.vertx.core.WorkerExecutor;
4645
import io.vertx.core.buffer.Buffer;
4746
import io.vertx.core.http.HttpServerOptions;
4847
import io.vertx.core.http.HttpServerResponse;
@@ -133,7 +132,6 @@ public class UIDOperatorVerticle extends AbstractVerticle {
133132
public static final long OPT_OUT_CHECK_CUTOFF_DATE = Instant.parse("2023-09-01T00:00:00.00Z").getEpochSecond();
134133
private final Handler<Boolean> saltRetrievalResponseHandler;
135134
private final int allowClockSkewSeconds;
136-
private final WorkerExecutor computeHeavyRequestWorkerPool;
137135
protected Map<Integer, Set<String>> siteIdToInvalidOriginsAndAppNames = new HashMap<>();
138136
protected boolean keySharingEndpointProvideAppNames;
139137
protected Instant lastInvalidOriginProcessTime = Instant.now();
@@ -167,8 +165,7 @@ public UIDOperatorVerticle(IConfigStore configStore,
167165
IStatsCollectorQueue statsCollectorQueue,
168166
SecureLinkValidatorService secureLinkValidatorService,
169167
Handler<Boolean> saltRetrievalResponseHandler,
170-
UidInstanceIdProvider uidInstanceIdProvider,
171-
WorkerExecutor computeHeavyRequestWorkerPool) {
168+
UidInstanceIdProvider uidInstanceIdProvider) {
172169
this.keyManager = keyManager;
173170
this.secureLinkValidatorService = secureLinkValidatorService;
174171
try {
@@ -202,7 +199,6 @@ public UIDOperatorVerticle(IConfigStore configStore,
202199
this.identityV3Enabled = config.getBoolean(IdentityV3Prop, false);
203200
this.disableOptoutToken = config.getBoolean(DisableOptoutTokenProp, false);
204201
this.uidInstanceIdProvider = uidInstanceIdProvider;
205-
this.computeHeavyRequestWorkerPool = computeHeavyRequestWorkerPool;
206202
this.isAsyncBatchRequestsEnabled = config.getBoolean(EnableAsyncBatchRequestProp, false);
207203
}
208204

@@ -314,6 +310,7 @@ private void setUpEncryptedRoutes(Router mainRouter, BodyHandler bodyHandler) {
314310
mainRouter.post(V3_IDENTITY_MAP.toString()).handler(bodyHandler).blockingHandler(auth.handleV1(
315311
rc -> encryptedPayloadHandler.handle(rc, this::handleIdentityMapV3), Role.MAPPER), false);
316312
} else {
313+
LOGGER.info("Async batch requests disabled");
317314
mainRouter.post(V2_KEY_SHARING.toString()).handler(bodyHandler).handler(auth.handleV1(
318315
rc -> encryptedPayloadHandler.handle(rc, this::handleKeysSharing), Role.SHARER, Role.ID_READER));
319316
mainRouter.post(V2_KEY_BIDSTREAM.toString()).handler(bodyHandler).handler(auth.handleV1(
@@ -697,20 +694,6 @@ public void handleKeysBidstream(RoutingContext rc) {
697694
ResponseUtil.SuccessV2(rc, resp);
698695
}
699696

700-
private Future<Void> handleKeysSharingAsync(RoutingContext rc) {
701-
return computeHeavyRequestWorkerPool.executeBlocking(() -> {
702-
handleKeysSharing(rc);
703-
return null;
704-
});
705-
}
706-
707-
private Future<Void> handleKeysBidstreamAsync(RoutingContext rc) {
708-
return computeHeavyRequestWorkerPool.executeBlocking(() -> {
709-
handleKeysBidstream(rc);
710-
return null;
711-
});
712-
}
713-
714697
private void addBidstreamHeaderFields(JsonObject resp, int maxBidstreamLifetimeSeconds) {
715698
resp.put("max_bidstream_lifetime_seconds", maxBidstreamLifetimeSeconds + TOKEN_LIFETIME_TOLERANCE.toSeconds());
716699
addIdentityScopeField(resp);
@@ -1071,13 +1054,6 @@ private Future handleLogoutAsyncV2(RoutingContext rc) {
10711054
}
10721055
}
10731056

1074-
private Future<Void> handleBucketsV2Async(RoutingContext rc) {
1075-
return computeHeavyRequestWorkerPool.executeBlocking(() -> {
1076-
handleBucketsV2(rc);
1077-
return null;
1078-
});
1079-
}
1080-
10811057
private void handleBucketsV2(RoutingContext rc) {
10821058
final JsonObject req = (JsonObject) rc.data().get("request");
10831059
final String qp = req.getString("since_timestamp");
@@ -1263,13 +1239,6 @@ private boolean validateServiceLink(RoutingContext rc) {
12631239
return false;
12641240
}
12651241

1266-
private Future<Void> handleIdentityMapV2Async(RoutingContext rc) {
1267-
return computeHeavyRequestWorkerPool.executeBlocking(() -> {
1268-
handleIdentityMapV2(rc);
1269-
return null;
1270-
});
1271-
}
1272-
12731242
private void handleIdentityMapV2(RoutingContext rc) {
12741243
try {
12751244
final Integer siteId = RoutingContextUtil.getSiteId(rc);
@@ -1333,13 +1302,6 @@ private InputUtil.InputVal[] getIdentityMapV2Input(RoutingContext rc) {
13331302
getInputList.get();
13341303
}
13351304

1336-
private Future<Void> handleIdentityMapV3Async(RoutingContext rc) {
1337-
return computeHeavyRequestWorkerPool.executeBlocking(() -> {
1338-
handleIdentityMapV3(rc);
1339-
return null;
1340-
});
1341-
}
1342-
13431305
private void handleIdentityMapV3(RoutingContext rc) {
13441306
try {
13451307
JsonObject jsonInput = (JsonObject) rc.data().get("request");

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.uid2.shared.store.*;
1212
import com.uid2.shared.store.salt.ISaltProvider;
1313
import io.vertx.core.Handler;
14-
import io.vertx.core.WorkerExecutor;
1514
import io.vertx.core.json.JsonObject;
1615

1716
import java.time.Clock;
@@ -34,9 +33,8 @@ public ExtendedUIDOperatorVerticle(IConfigStore configStore,
3433
IStatsCollectorQueue statsCollectorQueue,
3534
SecureLinkValidatorService secureLinkValidationService,
3635
Handler<Boolean> saltRetrievalResponseHandler,
37-
UidInstanceIdProvider uidInstanceIdProvider,
38-
WorkerExecutor computeHeavyRequestWorkerPool) {
39-
super(configStore, config, clientSideTokenGenerate, siteProvider, clientKeyProvider, clientSideKeypairProvider, keyManager, saltProvider, optOutStore, clock, statsCollectorQueue, secureLinkValidationService, saltRetrievalResponseHandler, uidInstanceIdProvider, computeHeavyRequestWorkerPool);
36+
UidInstanceIdProvider uidInstanceIdProvider) {
37+
super(configStore, config, clientSideTokenGenerate, siteProvider, clientKeyProvider, clientSideKeypairProvider, keyManager, saltProvider, optOutStore, clock, statsCollectorQueue, secureLinkValidationService, saltRetrievalResponseHandler, uidInstanceIdProvider);
4038
}
4139

4240
public IUIDOperatorService getIdService() {

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import io.vertx.core.Future;
3939
import io.vertx.core.Handler;
4040
import io.vertx.core.Vertx;
41-
import io.vertx.core.WorkerExecutor;
4241
import io.vertx.core.buffer.Buffer;
4342
import io.vertx.core.http.HttpHeaders;
4443
import io.vertx.core.json.JsonArray;
@@ -143,7 +142,6 @@ public class UIDOperatorVerticleTest {
143142
private ExtendedUIDOperatorVerticle uidOperatorVerticle;
144143
private RuntimeConfig runtimeConfig;
145144
private EncryptedTokenEncoder encoder;
146-
private WorkerExecutor computeHeavyRequestWorkerPool;
147145

148146
@BeforeEach
149147
void deployVerticle(Vertx vertx, VertxTestContext testContext, TestInfo testInfo) {
@@ -167,8 +165,7 @@ void deployVerticle(Vertx vertx, VertxTestContext testContext, TestInfo testInfo
167165

168166
this.uidInstanceIdProvider = new UidInstanceIdProvider("test-instance", "id");
169167

170-
this.computeHeavyRequestWorkerPool = vertx.createSharedWorkerExecutor("compute-heavy-request", 4);
171-
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);
168+
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);
172169
vertx.deployVerticle(uidOperatorVerticle, testContext.succeeding(id -> testContext.completeNow()));
173170

174171
this.registry = new SimpleMeterRegistry();
@@ -180,9 +177,6 @@ void deployVerticle(Vertx vertx, VertxTestContext testContext, TestInfo testInfo
180177
@AfterEach
181178
void teardown() {
182179
Metrics.globalRegistry.remove(registry);
183-
if (computeHeavyRequestWorkerPool != null) {
184-
computeHeavyRequestWorkerPool.close();
185-
}
186180
}
187181

188182
private RuntimeConfig setupRuntimeConfig(JsonObject config) {

0 commit comments

Comments
 (0)