Moved PipedAsyncWritableChannel to closed source and re-use restServe…

…rRouterFactory
linkedin · Oct 24, 2024 · 2ec6bde · 2ec6bde
1 parent 62c6485
commit 2ec6bde
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 950 deletions.
diff --git a/ambry-api/src/main/java/com/github/ambry/config/RestServerConfig.java b/ambry-api/src/main/java/com/github/ambry/config/RestServerConfig.java
@@ -20,9 +20,6 @@ public class RestServerConfig {
   public static final String CONFIG_PREFIX = "rest.server.";
   public static final String ENABLE_ADDED_CHANNEL_HANDLERS = CONFIG_PREFIX + "enable.added.channel.handlers";
   public static final String ENABLE_STRUCTURED_LOGGING = CONFIG_PREFIX + "enable.structured.logging";
-  public static final String ENABLE_COMPOSITE_ROUTER = CONFIG_PREFIX + "enable.composite.router";
-  private static final String PIPED_ASYNC_CHANNEL_SECONDARY_TIMEOUT_MS =
-      CONFIG_PREFIX + "piped.async.channel.secondary.timeout.ms";
 
   /**
    * The RestRequestServiceFactory that needs to be used by the RestServer
@@ -76,14 +73,6 @@ public class RestServerConfig {
   @Default("com.github.ambry.router.NonBlockingRouterFactory")
   public final String restServerRouterFactory;
 
-  /**
-   * The CompositeRouterFactory that needs to be used by the RestServer
-   * for bootstrapping the CompositeRouter.
-   */
-  @Config("rest.server.composite.router.factory")
-  @Default("")
-  public final String restServerCompositeRouterFactory;
-
   /**
    * Request Headers that needs to be logged as part of public access log entries
    */
@@ -119,20 +108,6 @@ public class RestServerConfig {
   @Default("false")
   public final boolean restServerEnableAddedChannelHandlers;
 
-  /**
-   * Timeout when writing to secondary reader via PipedAsyncWritableChannel.
-   */
-  @Config(PIPED_ASYNC_CHANNEL_SECONDARY_TIMEOUT_MS)
-  @Default("100")
-  public final int restServerPipedAsyncChannelSecondaryTimeoutMs;
-
-  /**
-   * Set true to enable composite router in RestServer.
-   */
-  @Config(ENABLE_COMPOSITE_ROUTER)
-  @Default("false")
-  public final boolean restServerEnableCompositeRouter;
-
   public RestServerConfig(VerifiableProperties verifiableProperties) {
     restServerRestRequestServiceFactory = verifiableProperties.getString("rest.server.rest.request.service.factory");
     restServerNioServerFactory =
@@ -146,7 +121,6 @@ public RestServerConfig(VerifiableProperties verifiableProperties) {
         verifiableProperties.getIntInRange("rest.server.response.handler.scaling.unit.count", 5, 0, Integer.MAX_VALUE);
     restServerAccountServiceFactory = verifiableProperties.getString("rest.server.account.service.factory",
         "com.github.ambry.account.InMemoryUnknownAccountServiceFactory");
-    restServerCompositeRouterFactory = verifiableProperties.getString("rest.server.composite.router.factory", "");
     restServerRouterFactory = verifiableProperties.getString("rest.server.router.factory",
         "com.github.ambry.router.NonBlockingRouterFactory");
     restServerPublicAccessLogRequestHeaders =
@@ -157,8 +131,5 @@ public RestServerConfig(VerifiableProperties verifiableProperties) {
     restServerEnableStructuredLogging = verifiableProperties.getBoolean(ENABLE_STRUCTURED_LOGGING, false);
     restServerHealthCheckUri = verifiableProperties.getString("rest.server.health.check.uri", "/healthCheck");
     restServerEnableAddedChannelHandlers = verifiableProperties.getBoolean(ENABLE_ADDED_CHANNEL_HANDLERS, false);
-    restServerEnableCompositeRouter = verifiableProperties.getBoolean(ENABLE_COMPOSITE_ROUTER, false);
-    restServerPipedAsyncChannelSecondaryTimeoutMs =
-        verifiableProperties.getInt(PIPED_ASYNC_CHANNEL_SECONDARY_TIMEOUT_MS, 100);
   }
 }