pass in md5 in request internal header for secondary router

Sophie Guo · Sophie Guo · commit 8c5e37c1ff34 · 2025-11-21T09:07:07.000-08:00
diff --git a/ambry-api/src/main/java/com/github/ambry/rest/RestUtils.java b/ambry-api/src/main/java/com/github/ambry/rest/RestUtils.java
@@ -554,7 +554,7 @@ public static final class InternalKeys {
     /**
      * The key is to help identify get content or get md5. If the value is true, it means get md5 only for a getContent call.
      */
-    public static final String REQUEST_MD5_ONLY = KEY_PREFIX + "request-md5-only";
+    public static final String BLOB_MD5 = KEY_PREFIX + "blob-md5";
   }
 
   /**
diff --git a/ambry-frontend/src/main/java/com/github/ambry/frontend/DeleteBlobHandler.java b/ambry-frontend/src/main/java/com/github/ambry/frontend/DeleteBlobHandler.java
@@ -35,7 +35,6 @@
 import com.github.ambry.rest.RestUtils;
 import com.github.ambry.router.Router;
 import com.github.ambry.utils.Pair;
-import java.io.IOException;
 import java.util.GregorianCalendar;
 import java.util.Map;
 import org.slf4j.Logger;
diff --git a/ambry-frontend/src/main/java/com/github/ambry/frontend/FrontendRestRequestService.java b/ambry-frontend/src/main/java/com/github/ambry/frontend/FrontendRestRequestService.java
@@ -199,7 +199,7 @@ public void start() throws InstantiationException {
 
     getBlobHandler =
         new GetBlobHandler(frontendConfig, router, securityService, idConverter, accountAndContainerInjector,
-            frontendMetrics, clusterMap, quotaManager, accountService);
+            frontendMetrics, clusterMap, quotaManager, accountService, namedBlobDb);
     postBlobHandler =
         new PostBlobHandler(securityService, idConverter, idSigningService, router, accountAndContainerInjector,
             SystemTime.getInstance(), frontendConfig, frontendMetrics, clusterName, quotaManager);
diff --git a/ambry-frontend/src/main/java/com/github/ambry/frontend/GetBlobHandler.java b/ambry-frontend/src/main/java/com/github/ambry/frontend/GetBlobHandler.java
@@ -23,6 +23,8 @@
 import com.github.ambry.commons.Callback;
 import com.github.ambry.config.FrontendConfig;
 import com.github.ambry.messageformat.BlobInfo;
+import com.github.ambry.named.NamedBlobDb;
+import com.github.ambry.protocol.GetOption;
 import com.github.ambry.quota.QuotaManager;
 import com.github.ambry.quota.QuotaUtils;
 import com.github.ambry.rest.RequestPath;
@@ -73,10 +75,11 @@ public class GetBlobHandler {
   private final QuotaManager quotaManager;
   private final GetReplicasHandler getReplicasHandler;
   private final AccountService accountService;
+  private final NamedBlobDb namedBlobDb;
 
   GetBlobHandler(FrontendConfig frontendConfig, Router router, SecurityService securityService, IdConverter idConverter,
       AccountAndContainerInjector accountAndContainerInjector, FrontendMetrics metrics, ClusterMap clusterMap,
-      QuotaManager quotaManager, AccountService accountService) {
+      QuotaManager quotaManager, AccountService accountService, NamedBlobDb namedBlobDb) {
     this.frontendConfig = frontendConfig;
     this.router = router;
     this.securityService = securityService;
@@ -87,6 +90,7 @@ public class GetBlobHandler {
     this.quotaManager = quotaManager;
     getReplicasHandler = new GetReplicasHandler(metrics, clusterMap);
     this.accountService = accountService;
+    this.namedBlobDb = namedBlobDb;
   }
 
   public void handle(RequestPath requestPath, RestRequest restRequest, RestResponseChannel restResponseChannel,
@@ -100,6 +104,18 @@ public void handle(RequestPath requestPath, RestRequest restRequest, RestRespons
     if (requestPath.matchesOperation(Operations.NAMED_BLOB)) {
       accountAndContainerInjector.injectAccountContainerForNamedBlob(restRequest, metricsGroup);
     }
+    if (RestUtils.isS3Request(restRequest)) {
+      NamedBlobPath namedBlobPath = NamedBlobPath.parse(getRequestPath(restRequest), restRequest.getArgs());
+      GetOption getOption = RestUtils.getGetOption(restRequest, GetOption.None);
+      if (namedBlobDb != null) {
+        namedBlobDb.get(namedBlobPath.getAccountName(), namedBlobPath.getContainerName(), namedBlobPath.getBlobName(),
+            getOption, false).thenAccept(record -> {
+          if (record != null) {
+            restRequest.setArg(BLOB_MD5, record.getDigest());
+          }
+        });
+      }
+    }
     restRequest.getMetricsTracker().injectMetrics(restRequestMetrics);
     new CallbackChain(restRequest, restResponseChannel, metricsGroup, requestPath, subResource, options,
         callback).start();
diff --git a/ambry-frontend/src/main/java/com/github/ambry/frontend/ListDatasetVersionHandler.java b/ambry-frontend/src/main/java/com/github/ambry/frontend/ListDatasetVersionHandler.java
@@ -26,7 +26,6 @@
 import com.github.ambry.router.ReadableStreamChannel;
 import java.util.GregorianCalendar;
 import java.util.function.Function;
-import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ambry-frontend/src/main/java/com/github/ambry/frontend/TtlUpdateHandler.java b/ambry-frontend/src/main/java/com/github/ambry/frontend/TtlUpdateHandler.java
@@ -36,7 +36,6 @@
 import org.slf4j.LoggerFactory;
 
 import static com.github.ambry.frontend.FrontendUtils.*;
-import static com.github.ambry.rest.RestUtils.InternalKeys.*;
 
 
 /**
diff --git a/ambry-frontend/src/main/java/com/github/ambry/frontend/s3/S3MultipartListPartsHandler.java b/ambry-frontend/src/main/java/com/github/ambry/frontend/s3/S3MultipartListPartsHandler.java
@@ -26,7 +26,6 @@
 import com.github.ambry.rest.RestRequest;
 import com.github.ambry.rest.RestResponseChannel;
 import com.github.ambry.rest.RestServiceException;
-import com.github.ambry.rest.RestUtils;
 import com.github.ambry.router.ReadableStreamChannel;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/ambry-frontend/src/test/java/com/github/ambry/frontend/FrontendUtilsTest.java b/ambry-frontend/src/test/java/com/github/ambry/frontend/FrontendUtilsTest.java
@@ -23,6 +23,7 @@
 import com.github.ambry.rest.RestServiceException;
 import com.github.ambry.utils.TestUtils;
 import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -106,4 +107,17 @@ private void assertBlobIdFieldValues(BlobId blobId, BlobId.BlobIdType type, byte
     assertEquals("Wrong container id in blobId: " + blobId, containerId, blobId.getContainerId());
     assertEquals("Wrong isEncrypted value in blobId: " + blobId, isEncrypted, BlobId.isEncrypted(blobId.getID()));
   }
+
+  /**
+   *
+   * @param content
+   * @return String of md5
+   * @throws NoSuchAlgorithmException
+   */
+  public static String calculateMD5(byte[] content) throws NoSuchAlgorithmException {
+    java.security.MessageDigest md = java.security.MessageDigest.getInstance("MD5");
+    byte[] digest = md.digest(content);
+    return org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString(digest);
+  }
+
 }
diff --git a/ambry-frontend/src/test/java/com/github/ambry/frontend/NamedBlobPutHandlerTest.java b/ambry-frontend/src/test/java/com/github/ambry/frontend/NamedBlobPutHandlerTest.java
@@ -77,6 +77,7 @@
 import org.json.JSONObject;
 import org.junit.Test;
 
+import static com.github.ambry.frontend.FrontendUtilsTest.*;
 import static org.junit.Assert.*;
 
 
@@ -677,18 +678,6 @@ private void putBlobAndVerifyDigest(ThrowingConsumer<ExecutionException> errorCh
     }
   }
 
-  /**
-   *
-   * @param content
-   * @return String of md5
-   * @throws NoSuchAlgorithmException
-   */
-  private  String calculateMD5(byte[] content) throws NoSuchAlgorithmException {
-    java.security.MessageDigest md = java.security.MessageDigest.getInstance("MD5");
-    byte[] digest = md.digest(content);
-    return org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString(digest);
-  }
-
   /**
    * Make a stitch blob call using {@link PostBlobHandler} and verify the result of the operation.
    * @param errorChecker if non-null, expect an exception to be thrown by the post flow and verify it using this
diff --git a/ambry-frontend/src/test/java/com/github/ambry/frontend/PostBlobHandlerTest.java b/ambry-frontend/src/test/java/com/github/ambry/frontend/PostBlobHandlerTest.java
@@ -50,7 +50,6 @@
 import com.github.ambry.rest.RestUtils;
 import com.github.ambry.router.ChunkInfo;
 import com.github.ambry.router.FutureResult;
-import com.github.ambry.router.GetBlobResult;
 import com.github.ambry.router.InMemoryRouter;
 import com.github.ambry.router.PutBlobOptionsBuilder;
 import com.github.ambry.router.ReadableStreamChannel;
@@ -67,7 +66,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Base64;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -79,17 +77,14 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.apache.commons.lang3.tuple.Pair;
 import org.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.mockito.Mockito;
 
 import static com.github.ambry.frontend.FrontendRestRequestServiceTest.*;
-import static com.github.ambry.rest.RestUtils.InternalKeys.*;
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
 
 
 /**
@@ -401,7 +396,7 @@ private void initGetBlobHandler(Properties properties) {
     VerifiableProperties verifiableProperties = new VerifiableProperties(properties);
     frontendConfig = new FrontendConfig(verifiableProperties);
     getBlobHandler = new GetBlobHandler(frontendConfig, router, securityServiceFactory.getSecurityService(),
-        idConverterFactory.getIdConverter(), injector, metrics, CLUSTER_MAP, QUOTA_MANAGER, ACCOUNT_SERVICE);
+        idConverterFactory.getIdConverter(), injector, metrics, CLUSTER_MAP, QUOTA_MANAGER, ACCOUNT_SERVICE, null);
   }
 
   private void initDeleteBlobHandler(Properties props) {
diff --git a/ambry-frontend/src/test/java/com/github/ambry/frontend/S3MultipartUploadTest.java b/ambry-frontend/src/test/java/com/github/ambry/frontend/S3MultipartUploadTest.java
@@ -359,7 +359,7 @@ private void setup() throws Exception {
     QuotaManager quotaManager = QuotaTestUtils.createDummyQuotaManager();
     getBlobHandler =
         new GetBlobHandler(frontendConfig, router, securityService, idConverter, injector, metrics, clusterMap,
-            quotaManager, ACCOUNT_SERVICE);
+            quotaManager, ACCOUNT_SERVICE, null);
     deleteBlobHandler =
         new DeleteBlobHandler(router, securityService, idConverter, injector, metrics, clusterMap, quotaManager, ACCOUNT_SERVICE,
             null);
diff --git a/ambry-frontend/src/test/java/com/github/ambry/frontend/S3PutHandlerTest.java b/ambry-frontend/src/test/java/com/github/ambry/frontend/S3PutHandlerTest.java
@@ -31,6 +31,7 @@
 import com.github.ambry.named.NamedBlobDb;
 import com.github.ambry.named.NamedBlobDbFactory;
 import com.github.ambry.named.NamedBlobRecord;
+import com.github.ambry.protocol.GetOption;
 import com.github.ambry.quota.QuotaTestUtils;
 import com.github.ambry.rest.MockRestResponseChannel;
 import com.github.ambry.rest.RequestPath;
@@ -51,12 +52,16 @@
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.Properties;
+import java.util.concurrent.CompletableFuture;
 import org.json.JSONObject;
 import org.junit.Test;
+import org.mockito.Mockito;
 
+import static com.github.ambry.frontend.FrontendUtilsTest.*;
 import static com.github.ambry.rest.RestUtils.Headers.*;
 import static com.github.ambry.rest.RestUtils.InternalKeys.*;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 
 public class S3PutHandlerTest {
@@ -136,6 +141,7 @@ public void putBlobsTestHelper(boolean provideContentType) throws Exception {
     s3GetHandler.handle(request, restResponseChannel, getResult::done);
     ReadableStreamChannel readableStreamChannel = getResult.get();
     assertEquals("Mismatch on response status", ResponseStatus.Ok, restResponseChannel.getStatus());
+    assertEquals("", calculateMD5(content), request.getArgs().get(BLOB_MD5));
     assertArrayEquals("Mismatch in blob content", content, ((ByteBufferRSC) readableStreamChannel).getBuffer().array());
     assertEquals("Mismatch in content length size", size / 2,
         Integer.parseInt((String) restResponseChannel.getHeader(RestUtils.Headers.CONTENT_LENGTH)));
@@ -173,7 +179,7 @@ private void setup() throws Exception {
             frontendConfig, metrics, CLUSTER_NAME, QuotaTestUtils.createDummyQuotaManager(), ACCOUNT_SERVICE, null);
     GetBlobHandler getBlobHandler =
         new GetBlobHandler(frontendConfig, router, securityService, idConverter, injector, metrics, clusterMap,
-            QuotaTestUtils.createDummyQuotaManager(), ACCOUNT_SERVICE);
+            QuotaTestUtils.createDummyQuotaManager(), ACCOUNT_SERVICE, namedBlobDb);
     s3PutHandler = new S3PutHandler(namedBlobPutHandler, null, metrics);
     s3GetHandler = new S3GetHandler(null, null, getBlobHandler, securityService, metrics, injector);
   }
diff --git a/ambry-named-mysql/build.gradle b/ambry-named-mysql/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,7 @@ public static final class InternalKeys {`
`554`	`554`	`/**`
`555`	`555`	`* The key is to help identify get content or get md5. If the value is true, it means get md5 only for a getContent call.`
`556`	`556`	`*/`
`557`		`- public static final String REQUEST_MD5_ONLY = KEY_PREFIX + "request-md5-only";`
	`557`	`+ public static final String BLOB_MD5 = KEY_PREFIX + "blob-md5";`
`558`	`558`	`}`
`559`	`559`
`560`	`560`	`/**`