feat(schema-registry): exclude schema reg onboot check from schema re… (datahub-project#10349)

david-leifker · sleeperdeep · commit fa4c9813332d · 2024-06-25T11:09:21.000+03:00
diff --git a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/OnBootApplicationListener.java b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/OnBootApplicationListener.java
@@ -26,6 +26,9 @@
 @Slf4j
 @Component
 public class OnBootApplicationListener {
+
+  public static final String SCHEMA_REGISTRY_SERVLET_NAME = "dispatcher-schema-registry";
+
   private static final Set<Integer> ACCEPTED_HTTP_CODES =
       Set.of(
           HttpStatus.SC_OK,
@@ -58,6 +61,12 @@ public class OnBootApplicationListener {
 
   @EventListener(ContextRefreshedEvent.class)
   public void onApplicationEvent(@Nonnull ContextRefreshedEvent event) {
+
+    if (SCHEMA_REGISTRY_SERVLET_NAME.equals(event.getApplicationContext().getId())) {
+      log.info("Loading servlet {} without interruption.", SCHEMA_REGISTRY_SERVLET_NAME);
+      return;
+    }
+
     log.warn(
         "OnBootApplicationListener context refreshed! {} event: {}",
         ROOT_WEB_APPLICATION_CONTEXT_ID.equals(event.getApplicationContext().getId()),
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/WebApplicationInitializer.java b/metadata-service/war/src/main/java/com/linkedin/gms/WebApplicationInitializer.java
@@ -1,5 +1,7 @@
 package com.linkedin.gms;
 
+import static com.linkedin.metadata.boot.OnBootApplicationListener.SCHEMA_REGISTRY_SERVLET_NAME;
+
 import com.datahub.auth.authentication.filter.AuthenticationFilter;
 import com.datahub.gms.servlet.Config;
 import com.datahub.gms.servlet.ConfigSearchExport;
@@ -35,6 +37,7 @@ public void onStartup(ServletContext container) {
         "contextInitializerClasses", "com.linkedin.gms.SpringApplicationInitializer");
 
     // Auth filter
+    List<String> servletNames = new ArrayList<>();
 
     // Independent dispatcher
     schemaRegistryServlet(container);
@@ -43,8 +46,6 @@ public void onStartup(ServletContext container) {
     healthCheckServlet(container);
     configServlet(container);
 
-    List<String> servletNames = new ArrayList<>();
-
     // Restli non-Dispatcher
     servletNames.add(restliServlet(rootContext, container));
 
@@ -69,11 +70,12 @@ public void onStartup(ServletContext container) {
    */
   private void schemaRegistryServlet(ServletContext container) {
     AnnotationConfigWebApplicationContext webContext = new AnnotationConfigWebApplicationContext();
+    webContext.setId(SCHEMA_REGISTRY_SERVLET_NAME);
     webContext.register(SchemaRegistryServletConfig.class);
 
     DispatcherServlet dispatcherServlet = new DispatcherServlet(webContext);
     ServletRegistration.Dynamic registration =
-        container.addServlet("dispatcher-schema-registry", dispatcherServlet);
+        container.addServlet(SCHEMA_REGISTRY_SERVLET_NAME, dispatcherServlet);
     registration.addMapping("/schema-registry/*");
     registration.setLoadOnStartup(1);
     registration.setAsyncSupported(true);
