Merge pull request #15799 from cdapio/feature/CDAP-21096_parameterize…

…_AppFabricServiceRuntimeModule_2 [CDAP-21096] Parametrize the AppFabricServiceRuntimeModule
cdapio · Jan 22, 2025 · 7e3b514 · 7e3b514
2 parents d4ff926 + 101dc46
commit 7e3b514
Show file tree

Hide file tree

Showing 12 changed files with 208 additions and 150 deletions.
diff --git a/...a/io/cdap/cdap/internal/app/runtime/distributed/DistributedWorkflowProgramRunnerTest.java b/...a/io/cdap/cdap/internal/app/runtime/distributed/DistributedWorkflowProgramRunnerTest.java
@@ -25,6 +25,7 @@
 import io.cdap.cdap.app.DefaultAppConfigurer;
 import io.cdap.cdap.app.DefaultApplicationContext;
 import io.cdap.cdap.app.guice.AppFabricServiceRuntimeModule;
+import io.cdap.cdap.app.guice.AppFabricServiceRuntimeModule.ServiceType;
 import io.cdap.cdap.app.guice.AuthorizationModule;
 import io.cdap.cdap.app.guice.ProgramRunnerRuntimeModule;
 import io.cdap.cdap.app.guice.TwillModule;
@@ -69,6 +70,7 @@
 import io.cdap.cdap.security.guice.SecureStoreServerModule;
 import java.io.IOException;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.Map;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.twill.api.Configs;
@@ -289,7 +291,8 @@ private static ProgramRunnerFactory createProgramRunnerFactory(CConfiguration cC
         new AuthorizationModule(),
         new AuthorizationEnforcementModule().getMasterModule(),
         new TwillModule(),
-        new AppFabricServiceRuntimeModule(cConf).getDistributedModules(),
+        new AppFabricServiceRuntimeModule(cConf, AppFabricServiceRuntimeModule.ALL_SERVICE_TYPES)
+            .getDistributedModules(),
         new ProgramRunnerRuntimeModule().getDistributedModules(),
         new SecureStoreServerModule(),
         new OperationalStatsModule(),

diff --git a/cdap-app-fabric/src/main/java/io/cdap/cdap/app/guice/AppFabricServiceRuntimeModule.java b/cdap-app-fabric/src/main/java/io/cdap/cdap/app/guice/AppFabricServiceRuntimeModule.java
diff --git a/...bric/src/main/java/io/cdap/cdap/internal/app/worker/system/SystemWorkerTwillRunnable.java b/...bric/src/main/java/io/cdap/cdap/internal/app/worker/system/SystemWorkerTwillRunnable.java
@@ -33,6 +33,7 @@
 import io.cdap.cdap.api.artifact.ArtifactManager;
 import io.cdap.cdap.api.metrics.MetricsCollectionService;
 import io.cdap.cdap.app.guice.AppFabricServiceRuntimeModule;
+import io.cdap.cdap.app.guice.AppFabricServiceRuntimeModule.ServiceType;
 import io.cdap.cdap.app.guice.AuditLogWriterModule;
 import io.cdap.cdap.app.guice.AuthorizationModule;
 import io.cdap.cdap.app.guice.DistributedArtifactManagerModule;
@@ -91,6 +92,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -156,7 +158,8 @@ protected void bindKeyManager(Binder binder) {
         new AuthorizationModule(),
         new AuthorizationEnforcementModule().getMasterModule(),
         new AuditLogWriterModule(cConf).getDistributedModules(),
-        Modules.override(new AppFabricServiceRuntimeModule(cConf).getDistributedModules())
+        Modules.override(new AppFabricServiceRuntimeModule(cConf, AppFabricServiceRuntimeModule.ALL_SERVICE_TYPES)
+            .getDistributedModules())
             .with(new AbstractModule() {
               // To enable localisation of artifacts
               @Override

diff --git a/cdap-app-fabric/src/test/java/io/cdap/cdap/internal/guice/AppFabricTestModule.java b/cdap-app-fabric/src/test/java/io/cdap/cdap/internal/guice/AppFabricTestModule.java
@@ -91,7 +91,8 @@ protected void configure() {
     install(RemoteAuthenticatorModules.getNoOpModule());
     install(new IOModule());
     install(new InMemoryDiscoveryModule());
-    install(new AppFabricServiceRuntimeModule(cConf).getInMemoryModules());
+    install(new AppFabricServiceRuntimeModule(cConf, AppFabricServiceRuntimeModule.ALL_SERVICE_TYPES)
+        .getInMemoryModules());
     install(new MonitorHandlerModule(false, cConf));
     install(new ProgramRunnerRuntimeModule().getInMemoryModules());
     install(new NonCustomLocationUnitTestModule());

diff --git a/cdap-master/src/main/java/io/cdap/cdap/data/runtime/main/MasterServiceMain.java b/cdap-master/src/main/java/io/cdap/cdap/data/runtime/main/MasterServiceMain.java
@@ -546,7 +546,8 @@ protected void configure() {
         new AuthorizationModule(),
         new AuthorizationEnforcementModule().getMasterModule(),
         new TwillModule(),
-        new AppFabricServiceRuntimeModule(cConf).getDistributedModules(),
+        new AppFabricServiceRuntimeModule(cConf, AppFabricServiceRuntimeModule.ALL_SERVICE_TYPES)
+            .getDistributedModules(),
         new MonitorHandlerModule(true, cConf),
         new ProgramRunnerRuntimeModule().getDistributedModules(),
         new SecureStoreServerModule(),

diff --git a/cdap-master/src/main/java/io/cdap/cdap/data/tools/JobQueueDebugger.java b/cdap-master/src/main/java/io/cdap/cdap/data/tools/JobQueueDebugger.java
@@ -33,6 +33,7 @@
 import io.cdap.cdap.api.dataset.lib.CloseableIterator;
 import io.cdap.cdap.api.schedule.Trigger;
 import io.cdap.cdap.app.guice.AppFabricServiceRuntimeModule;
+import io.cdap.cdap.app.guice.AppFabricServiceRuntimeModule.ServiceType;
 import io.cdap.cdap.app.guice.AuthorizationModule;
 import io.cdap.cdap.app.guice.ProgramRunnerRuntimeModule;
 import io.cdap.cdap.app.guice.TwillModule;
@@ -73,6 +74,7 @@
 import io.cdap.cdap.spi.data.transaction.TransactionRunner;
 import io.cdap.cdap.spi.data.transaction.TransactionRunners;
 import java.io.IOException;
+import java.util.EnumSet;
 import java.util.List;
 import javax.annotation.Nullable;
 import org.apache.commons.cli.BasicParser;
@@ -346,7 +348,8 @@ private static Injector createInjector() throws Exception {
         new TwillModule(),
         new DataFabricModules().getDistributedModules(),
         new DataSetsModules().getDistributedModules(),
-        new AppFabricServiceRuntimeModule(cConf).getDistributedModules(),
+        new AppFabricServiceRuntimeModule(cConf, AppFabricServiceRuntimeModule.ALL_SERVICE_TYPES)
+            .getDistributedModules(),
         new ProgramRunnerRuntimeModule().getDistributedModules(),
         new SystemDatasetRuntimeModule().getDistributedModules(),
         new KafkaLogAppenderModule(),

diff --git a/...ster/src/main/java/io/cdap/cdap/master/environment/k8s/AppFabricProcessorServiceMain.java b/...ster/src/main/java/io/cdap/cdap/master/environment/k8s/AppFabricProcessorServiceMain.java
@@ -25,6 +25,7 @@
 import com.google.inject.Scopes;
 import com.google.inject.util.Modules;
 import io.cdap.cdap.app.guice.AppFabricServiceRuntimeModule;
+import io.cdap.cdap.app.guice.AppFabricServiceRuntimeModule.ServiceType;
 import io.cdap.cdap.app.guice.AuthorizationModule;
 import io.cdap.cdap.app.guice.MonitorHandlerModule;
 import io.cdap.cdap.app.guice.ProgramRunnerRuntimeModule;
@@ -65,6 +66,7 @@
 import io.cdap.cdap.security.guice.SecureStoreServerModule;
 import io.cdap.cdap.security.store.SecureStoreService;
 import java.util.Arrays;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
@@ -98,7 +100,8 @@ protected List<Module> getServiceModules(MasterEnvironment masterEnv,
         new AuditModule(),
         new AuthorizationModule(),
         new AuthorizationEnforcementModule().getMasterModule(),
-        Modules.override(new AppFabricServiceRuntimeModule(cConf).getDistributedModules())
+        Modules.override(new AppFabricServiceRuntimeModule(cConf, ServiceType.PROCESSOR)
+            .getDistributedModules())
             .with(new AbstractModule() {
               @Override
               protected void configure() {

diff --git a/cdap-master/src/main/java/io/cdap/cdap/master/environment/k8s/AppFabricServiceMain.java b/cdap-master/src/main/java/io/cdap/cdap/master/environment/k8s/AppFabricServiceMain.java
@@ -25,6 +25,7 @@
 import com.google.inject.Scopes;
 import com.google.inject.util.Modules;
 import io.cdap.cdap.app.guice.AppFabricServiceRuntimeModule;
+import io.cdap.cdap.app.guice.AppFabricServiceRuntimeModule.ServiceType;
 import io.cdap.cdap.app.guice.AuthorizationModule;
 import io.cdap.cdap.app.guice.MonitorHandlerModule;
 import io.cdap.cdap.app.guice.ProgramRunnerRuntimeModule;
@@ -65,6 +66,7 @@
 import io.cdap.cdap.security.guice.SecureStoreServerModule;
 import io.cdap.cdap.security.store.SecureStoreService;
 import java.util.Arrays;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
@@ -98,7 +100,7 @@ protected List<Module> getServiceModules(MasterEnvironment masterEnv,
         new AuditModule(),
         new AuthorizationModule(),
         new AuthorizationEnforcementModule().getMasterModule(),
-        Modules.override(new AppFabricServiceRuntimeModule(cConf).getDistributedModules())
+        Modules.override(new AppFabricServiceRuntimeModule(cConf, ServiceType.SERVER).getDistributedModules())
             .with(new AbstractModule() {
               @Override
               protected void configure() {

diff --git a/cdap-master/src/main/java/io/cdap/cdap/master/environment/k8s/PreviewServiceMain.java b/cdap-master/src/main/java/io/cdap/cdap/master/environment/k8s/PreviewServiceMain.java
@@ -25,6 +25,7 @@
 import com.google.inject.Module;
 import com.google.inject.Scopes;
 import io.cdap.cdap.app.guice.AppFabricServiceRuntimeModule;
+import io.cdap.cdap.app.guice.AppFabricServiceRuntimeModule.ServiceType;
 import io.cdap.cdap.app.guice.AuthorizationModule;
 import io.cdap.cdap.app.guice.ProgramRunnerRuntimeModule;
 import io.cdap.cdap.app.preview.PreviewHttpServer;
@@ -51,6 +52,7 @@
 import io.cdap.cdap.security.guice.SecureStoreClientModule;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
@@ -98,7 +100,7 @@ protected List<Module> getServiceModules(MasterEnvironment masterEnv,
     List<Module> modules = new ArrayList<>(Arrays.asList(
         new DataSetServiceModules().getStandaloneModules(),
         new DataSetsModules().getStandaloneModules(),
-        new AppFabricServiceRuntimeModule(cConf).getStandaloneModules(),
+        new AppFabricServiceRuntimeModule(cConf, ServiceType.SERVER).getStandaloneModules(),
         new ProgramRunnerRuntimeModule().getStandaloneModules(),
         new MetricsStoreModule(),
         new MessagingServiceModule(cConf),

diff --git a/cdap-standalone/src/main/java/io/cdap/cdap/StandaloneMain.java b/cdap-standalone/src/main/java/io/cdap/cdap/StandaloneMain.java
@@ -80,9 +80,9 @@
 import io.cdap.cdap.logging.guice.LogQueryRuntimeModule;
 import io.cdap.cdap.logging.guice.LogReaderRuntimeModules;
 import io.cdap.cdap.logging.service.LogQueryService;
-import io.cdap.cdap.messaging.spi.MessagingService;
 import io.cdap.cdap.messaging.guice.MessagingServerRuntimeModule;
 import io.cdap.cdap.messaging.server.MessagingHttpService;
+import io.cdap.cdap.messaging.spi.MessagingService;
 import io.cdap.cdap.metadata.MetadataReaderWriterModules;
 import io.cdap.cdap.metadata.MetadataService;
 import io.cdap.cdap.metadata.MetadataServiceModule;
@@ -564,7 +564,8 @@ private static List<Module> createPersistentModules(CConfiguration cConf, Config
         new PreviewManagerModule(false),
         new PreviewRunnerManagerModule().getStandaloneModules(),
         new MessagingServerRuntimeModule().getStandaloneModules(),
-        new AppFabricServiceRuntimeModule(cConf).getStandaloneModules(),
+        new AppFabricServiceRuntimeModule(cConf, AppFabricServiceRuntimeModule.ALL_SERVICE_TYPES)
+            .getStandaloneModules(),
         new MonitorHandlerModule(false, cConf),
         new RuntimeServerModule(),
         new OperationalStatsModule(),

diff --git a/cdap-support-bundle/src/test/java/io/cdap/cdap/SupportBundleTestModule.java b/cdap-support-bundle/src/test/java/io/cdap/cdap/SupportBundleTestModule.java
@@ -85,7 +85,8 @@ protected void configure() {
     install(RemoteAuthenticatorModules.getNoOpModule());
     install(new IOModule());
     install(new InMemoryDiscoveryModule());
-    install(new AppFabricServiceRuntimeModule(cConf).getInMemoryModules());
+    install(new AppFabricServiceRuntimeModule(cConf, AppFabricServiceRuntimeModule.ALL_SERVICE_TYPES)
+        .getInMemoryModules());
     install(new MonitorHandlerModule(false, cConf));
     install(new ProgramRunnerRuntimeModule().getInMemoryModules());
     install(new NonCustomLocationUnitTestModule());

diff --git a/cdap-unit-test/src/main/java/io/cdap/cdap/test/TestBase.java b/cdap-unit-test/src/main/java/io/cdap/cdap/test/TestBase.java
@@ -301,7 +301,8 @@ public static void initialize() throws Exception {
         new IOModule(),
         new LocalLocationModule(),
         new InMemoryDiscoveryModule(),
-        new AppFabricServiceRuntimeModule(cConf).getInMemoryModules(),
+        new AppFabricServiceRuntimeModule(cConf, AppFabricServiceRuntimeModule.ALL_SERVICE_TYPES)
+            .getInMemoryModules(),
         new MonitorHandlerModule(false, cConf),
         new AuthenticationContextModules().getMasterModule(),
         new AuthorizationModule(),