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

Jump to bottom

Support revision for dataset version auto incr and fix bug for out of retention count support #2949

Merged
merged 1 commit into from
Nov 22, 2024
Merged

Support revision for dataset version auto incr and fix bug for out of retention count support #2949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 44 additions & 1 deletion ...frontend/src/integration-test/java/com/github/ambry/frontend/FrontendIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.github.ambry.account.AccountCollectionSerde;
import com.github.ambry.account.Container;
import com.github.ambry.account.ContainerBuilder;
import com.github.ambry.account.DatasetBuilder;
import com.github.ambry.account.InMemAccountService;
import com.github.ambry.account.InMemAccountServiceFactory;
import com.github.ambry.clustermap.ClusterMap;
Expand Down Expand Up @@ -89,7 +90,7 @@
import org.junit.runners.Parameterized;
import com.github.ambry.account.Dataset;


import static com.github.ambry.rest.RestUtils.Headers.*;
import static com.github.ambry.utils.TestUtils.*;
import static org.junit.Assert.*;
import static org.junit.Assume.*;
Expand Down Expand Up @@ -297,7 +298,49 @@ public void datasetTest() throws Exception {
doDeleteDatasetAndVerify(refAccount.getName(), namedBlobOptionalContainer.getName(), datasetList);
//After delete, it should have an empty list.
doListDatasetAndVerify(refAccount.getName(), namedBlobOptionalContainer.getName(), new ArrayList<>());
}

@Ignore
@Test
public void datasetOutOfRetentionTest() throws Exception {
Account refAccount = ACCOUNT_SERVICE.createAndAddRandomAccount();
Container namedBlobOptionalContainer =
new ContainerBuilder((short) 11, "optional", Container.ContainerStatus.ACTIVE, "",
refAccount.getId()).setNamedBlobMode(Container.NamedBlobMode.OPTIONAL).build();
ACCOUNT_SERVICE.updateContainers(refAccount.getName(), Arrays.asList(namedBlobOptionalContainer));
String contentType = "application/octet-stream";
String ownerId = "datasetTest";
String accountName = refAccount.getName();
String containerName = namedBlobOptionalContainer.getName();
String datasetName = "datasetNameRetention";
Dataset dataset = new DatasetBuilder(accountName, containerName, datasetName).setVersionSchema(
Dataset.VersionSchema.SEMANTIC_LONG).setRetentionCount(1).build();
HttpHeaders headers = new DefaultHttpHeaders();
//Test put dataset
putDatasetAndVerify(dataset, headers, false);
List<Dataset> datasetList = new ArrayList<>();
datasetList.add(dataset);
//put dataset version
headers = new DefaultHttpHeaders();
setAmbryHeadersForPut(headers, (long)-1, false, accountName, contentType, ownerId, null, null);
headers.add(RestUtils.Headers.DATASET_VERSION_QUERY_ENABLED, true);
int contentSize = 100;
ByteBuffer content = ByteBuffer.wrap(TestUtils.getRandomBytes(contentSize));
String version1 = "1.2.3.4";
putDatasetVersionAndVerify(dataset, version1, headers, content, contentSize, -1);
String version2 = "1.2.3.5";
putDatasetVersionAndVerify(dataset, version2, headers, content, contentSize, -1);

//Test List dataset version
InMemAccountService.PAGE_SIZE = -1;
HttpHeaders listHeaders = new DefaultHttpHeaders();
listHeaders.add(TARGET_ACCOUNT_NAME, dataset.getAccountName());
listHeaders.add(TARGET_CONTAINER_NAME, dataset.getContainerName());
listHeaders.add(TARGET_DATASET_NAME, dataset.getDatasetName());
listHeaders.add(ENABLE_DATASET_VERSION_LISTING, true);
listHeaders.add(RestUtils.Headers.DATASET_VERSION_QUERY_ENABLED, true);
List<Pair<String, String>> datasetVersions = listDatasetVersions(dataset, listHeaders);
assertEquals("Should only have 1 version", 1, datasetVersions.size());
}

@Ignore
Expand Down
7 changes: 4 additions & 3 deletions ambry-frontend/src/main/java/com/github/ambry/frontend/FrontendUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ static RestRequestMetricsGroup getMetricsGroupForGet(FrontendMetrics frontendMet
*/
static void replaceRequestPathWithNewOperationOrBlobIdIfNeeded(RestRequest restRequest,
DatasetVersionRecord datasetVersionRecord, String version) throws RestServiceException {
if (version.equals("LATEST") || version.equals("MAJOR") || version.equals("MINOR") || version.equals("PATCH")) {
if (version.equals("LATEST") || version.equals("MAJOR") || version.equals("MINOR") || version.equals("PATCH")
|| version.equals("REVISION")) {
RequestPath originalRequestPath = (RequestPath) restRequest.getArgs().get(REQUEST_PATH);
String originalOperationOrBlobId = originalRequestPath.getOperationOrBlobId(false);
int index = originalOperationOrBlobId.lastIndexOf(PATH_SEPARATOR_STRING);
Expand Down Expand Up @@ -223,10 +224,10 @@ public static void reconstructRestRequest(RestRequest restRequest, DatasetVersio
restRequest.setArg(InternalKeys.REQUEST_PATH, newRequestPath);
restRequest.setArg(Headers.DATASET_VERSION_QUERY_ENABLED, "true");
if (restRequest.getArgs().get(InternalKeys.TARGET_ACCOUNT_KEY) != null) {
restRequest.setArg(InternalKeys.TARGET_ACCOUNT_KEY, null);
restRequest.removeArg(InternalKeys.TARGET_ACCOUNT_KEY);
}
if (restRequest.getArgs().get(InternalKeys.TARGET_CONTAINER_KEY) != null) {
restRequest.setArg(InternalKeys.TARGET_CONTAINER_KEY, null);
restRequest.removeArg(InternalKeys.TARGET_CONTAINER_KEY);
}
restRequest.setArg(Headers.DATASET_VERSION_QUERY_ENABLED, "true");
}
Expand Down
Loading