Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@ Response handleGetRequest(ObjectRequestContext context, String keyPath)

addLastModifiedDate(responseBuilder, keyDetails);
addTagCountIfAny(responseBuilder, keyDetails);
addCustomMetadataHeaders(responseBuilder, keyDetails);

long metadataLatencyNs = getMetrics().updateGetKeyMetadataStats(startNanos);
perf.appendMetaLatencyNanos(metadataLatencyNs);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import static org.apache.hadoop.ozone.s3.endpoint.EndpointTestUtils.put;
import static org.apache.hadoop.ozone.s3.exception.S3ErrorTable.NO_SUCH_KEY;
import static org.apache.hadoop.ozone.s3.exception.S3ErrorTable.PRECOND_FAILED;
import static org.apache.hadoop.ozone.s3.util.S3Consts.CUSTOM_METADATA_HEADER_PREFIX;
import static org.apache.hadoop.ozone.s3.util.S3Consts.IF_MATCH_HEADER;
import static org.apache.hadoop.ozone.s3.util.S3Consts.IF_MODIFIED_SINCE_HEADER;
import static org.apache.hadoop.ozone.s3.util.S3Consts.IF_NONE_MATCH_HEADER;
Expand All @@ -44,6 +45,7 @@
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
Expand Down Expand Up @@ -196,6 +198,21 @@ public void testGetIgnoresIfModifiedSinceWhenIfNoneMatchPresent()
assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
}

@Test
public void getKeyWithCustomMetadata() throws IOException, OS3Exception {
final String keyName = "key-with-meta";
final String metaValue = "mymeta";
MultivaluedMap<String, String> requestHeaders = new MultivaluedHashMap<>();
requestHeaders.putSingle(CUSTOM_METADATA_HEADER_PREFIX + "meta1", metaValue);
when(headers.getRequestHeaders()).thenReturn(requestHeaders);

assertSucceeds(() -> put(rest, BUCKET_NAME, keyName, CONTENT));

Response response = get(rest, BUCKET_NAME, keyName);
assertEquals(metaValue,
response.getHeaderString(CUSTOM_METADATA_HEADER_PREFIX + "meta1"));
}

@Test
public void getKeyWithTag() throws IOException, OS3Exception {
//WHEN
Expand Down