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

Azure container name must be lower case #1192

Merged
merged 1 commit into from
Jun 14, 2019
Merged

Azure container name must be lower case #1192

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
20 changes: 15 additions & 5 deletions ambry-cloud/src/main/java/com.github.ambry.cloud/azure/AzureCloudDestination.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,18 @@ private CloudBlobContainer getContainer(BlobId blobId, boolean autoCreate)
* @throws StorageException if the operation fails.
*/
private void ensureCreated(CloudBlobContainer azureContainer) throws StorageException {
if (!knownContainers.contains(azureContainer.getName())) {
azureContainer.createIfNotExists(BlobContainerPublicAccessType.CONTAINER, new BlobRequestOptions(),
blobOpContext);
knownContainers.add(azureContainer.getName());
String containerName = azureContainer.getName();
if (!knownContainers.contains(containerName)) {
try {
if (azureContainer.createIfNotExists(BlobContainerPublicAccessType.CONTAINER, new BlobRequestOptions(),
blobOpContext)) {
logger.info("Created container {}", containerName);
}
} catch (StorageException ex) {
logger.error("Failed to create container {}", containerName);
throw ex;
}
knownContainers.add(containerName);
}
}

Expand Down Expand Up @@ -447,7 +455,9 @@ public boolean retrieveTokens(String partitionPath, String tokenFileName, Output
*/
String getAzureContainerName(String partitionPath) {
// Include Ambry cluster name in case the same storage account is used to backup multiple clusters.
return clusterName + SEPARATOR + partitionPath;
// Azure requires container names to be all lower case
String rawContainerName = clusterName + SEPARATOR + partitionPath;
return rawContainerName.toLowerCase();
}

/**
Expand Down
11 changes: 7 additions & 4 deletions ambry-cloud/src/test/java/com.github.ambry.cloud/azure/AzureIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public class AzureIntegrationTest {
private byte dataCenterId = 66;
private short accountId = 101;
private short containerId = 5;
private long testPartition = 666;
private String cosmosCollectionLink;
private String propFileName = "azure-test.properties";
private String tokenFileName = "replicaTokens";
Expand All @@ -82,6 +83,9 @@ public void setup() throws Exception {
} catch (IOException ex) {
throw new IllegalStateException("Could not load properties from resource: " + propFileName);
}
props.setProperty("clustermap.cluster.name", "Integration-Test");
props.setProperty("clustermap.datacenter.name", "uswest");
props.setProperty("clustermap.host.name", "localhost");
VerifiableProperties verProps = new VerifiableProperties(props);
azureDest =
(AzureCloudDestination) new AzureCloudDestinationFactory(verProps, new MetricRegistry()).getCloudDestination();
Expand All @@ -94,7 +98,7 @@ public void setup() throws Exception {
*/
@Test
public void testNormalFlow() throws Exception {
PartitionId partitionId = new MockPartitionId();
PartitionId partitionId = new MockPartitionId(testPartition, MockClusterMap.DEFAULT_PARTITION_CLASS);
BlobId blobId = new BlobId(BLOB_ID_V6, BlobIdType.NATIVE, dataCenterId, accountId, containerId, partitionId, false,
BlobDataType.DATACHUNK);
InputStream inputStream = getBlobInputStream(blobSize);
Expand Down Expand Up @@ -125,8 +129,7 @@ public void testNormalFlow() throws Exception {
@Test
public void testBatchQuery() throws Exception {
int numBlobs = 100;
long partition = 666;
PartitionId partitionId = new MockPartitionId(partition, MockClusterMap.DEFAULT_PARTITION_CLASS);
PartitionId partitionId = new MockPartitionId(testPartition, MockClusterMap.DEFAULT_PARTITION_CLASS);
List<BlobId> blobIdList = new ArrayList<>();
long creationTime = System.currentTimeMillis();
for (int j = 0; j < numBlobs; j++) {
Expand Down Expand Up @@ -178,7 +181,7 @@ public void testBatchQuery() throws Exception {
/** Persist tokens to Azure, then read them back and verify they match. */
@Test
public void testTokens() throws Exception {
String partitionPath = "666";
String partitionPath = String.valueOf(testPartition);
InputStream input = this.getClass().getClassLoader().getResourceAsStream(tokenFileName);
if (input == null) {
throw new IllegalStateException("Could not find resource: " + tokenFileName);
Expand Down