Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add post blob size #1188

Merged
merged 6 commits into from
Jun 18, 2019
Merged

Add post blob size #1188

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
135ff2a
Return uploaded blob size as part of post response header.
Jun 7, 2019
5c880eb
Return uploaded blob size as part of post response header.
Jun 7, 2019
3988a0d
Merge branch 'AddPostBlobSize' of https://github.com/ankagrawal/ambry…
ankagrawal Jun 11, 2019
0f81d5f
Fix rebase
ankagrawal Jun 11, 2019
1f68ff2
Add unit tests
ankagrawal Jun 12, 2019
e7b651c
Add getBlobBytesReceived in RestRequest and all its subclasses
ankagrawal Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ambry-frontend/src/main/java/com.github.ambry.frontend/PostBlobHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ private Callback<String> routerStitchBlobCallback(BlobInfo blobInfo) {
*/
private Callback<String> routerPutBlobCallback(BlobInfo blobInfo) {
return buildCallback(frontendMetrics.postRouterPutBlobMetrics, blobId -> {
setSignedIdMetadataIfRequired(blobInfo.getBlobProperties());
setSignedIdMetadataAndBlobSize(blobInfo.getBlobProperties());
idConverter.convert(restRequest, blobId, idConverterCallback(blobInfo));
}, uri, LOGGER, finalCallback);
}
Expand Down Expand Up @@ -301,7 +301,7 @@ private PutBlobOptions getPutBlobOptionsFromRequest() throws RestServiceExceptio
* @param blobProperties the {@link BlobProperties} from the request.
* @throws RestServiceException
*/
private void setSignedIdMetadataIfRequired(BlobProperties blobProperties) throws RestServiceException {
private void setSignedIdMetadataAndBlobSize(BlobProperties blobProperties) throws RestServiceException {
if (RestUtils.isChunkUpload(restRequest.getArgs())) {
Map<String, String> metadata = new HashMap<>(2);
metadata.put(RestUtils.Headers.BLOB_SIZE, Long.toString(restRequest.getBytesReceived()));
Expand All @@ -311,6 +311,8 @@ private void setSignedIdMetadataIfRequired(BlobProperties blobProperties) throws
Long.toString(Utils.addSecondsToEpochTime(time.milliseconds(), blobProperties.getTimeToLiveInSeconds())));
restRequest.setArg(RestUtils.InternalKeys.SIGNED_ID_METADATA_KEY, metadata);
}
//the actual blob size is the number of bytes read
restResponseChannel.setHeader(RestUtils.Headers.BLOB_SIZE, restRequest.getBytesReceived());
}

/**
Expand Down Expand Up @@ -348,6 +350,7 @@ List<ChunkInfo> getChunksToStitch(BlobProperties stitchedBlobProperties, JSONObj
}
List<ChunkInfo> chunksToStitch = new ArrayList<>(signedChunkIds.size());
String expectedSession = null;
long totalStitchedBlobSize = 0;
for (String signedChunkId : signedChunkIds) {
if (!idSigningService.isIdSigned(signedChunkId)) {
throw new RestServiceException("All chunks IDs must be signed: " + signedChunkId,
Expand All @@ -360,6 +363,8 @@ List<ChunkInfo> getChunksToStitch(BlobProperties stitchedBlobProperties, JSONObj
expectedSession = verifyChunkUploadSession(metadata, expectedSession);
@SuppressWarnings("ConstantConditions")
long chunkSizeBytes = RestUtils.getLongHeader(metadata, RestUtils.Headers.BLOB_SIZE, true);

totalStitchedBlobSize = totalStitchedBlobSize + chunkSizeBytes;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor: use +=

// Expiration time is sent to the router, but not verified in this handler. The router is responsible for making
// checks related to internal ambry requirements, like making sure that the chunks do not expire before the
// metadata blob.
Expand All @@ -369,6 +374,8 @@ List<ChunkInfo> getChunksToStitch(BlobProperties stitchedBlobProperties, JSONObj

chunksToStitch.add(new ChunkInfo(blobId, chunkSizeBytes, expirationTimeMs));
}
//the actual blob size for stitched blob is the sum of all the chunk sizes
restResponseChannel.setHeader(RestUtils.Headers.BLOB_SIZE, totalStitchedBlobSize);
return chunksToStitch;
}

Expand Down