>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21244?usp=email )
Change subject: Null merge branch 'gerrit/phoenix' into 'gerrit/lumina'
......................................................................
Null merge branch 'gerrit/phoenix' into 'gerrit/lumina'
* [NO ISSUE][*DB][STO] Clean up Azure cloud client configuration (MB-71312)
* [NO ISSUE][HYR][MISC][BP] Fix Span lifefycle / API issues (MB-71012)
Change-Id: I3061cc326f673fda9bdbcb0f680e7029aafd076a
---
M
asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageClientConfig.java
M
asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageCloudClient.java
3 files changed, 4 insertions(+), 33 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageClientConfig.java
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageClientConfig.java
index 6505865..5daf104 100644
---
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageClientConfig.java
+++
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageClientConfig.java
@@ -26,26 +26,13 @@
import org.apache.asterix.common.config.CloudProperties;
import org.apache.asterix.external.util.ExternalDataConstants;
import org.apache.asterix.external.util.azure.AzureConstants;
-<<<<<<< HEAD (68ee7f Merge branch 'gerrit/morpheus' into 'gerrit/lumina')
import org.apache.hyracks.cloud.io.ICloudProperties;
-=======
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
->>>>>>> BRANCH (0223dc [NO ISSUE][HYR][MISC][BP] Fix Span lifefycle / API
issues)
-import com.azure.core.util.Configuration;
import com.azure.identity.DefaultAzureCredential;
import com.azure.identity.DefaultAzureCredentialBuilder;
import com.azure.storage.blob.models.AccessTier;
public class AzBlobStorageClientConfig {
-<<<<<<< HEAD (68ee7f Merge branch 'gerrit/morpheus' into 'gerrit/lumina')
-=======
- private static final Logger LOGGER = LogManager.getLogger();
- // Ref:
https://learn.microsoft.com/en-us/rest/api/storageservices/blob-batch?tabs=microsoft-entra-id
- static final int MAX_CONCURRENT_REQUESTS = 20;
-
->>>>>>> BRANCH (0223dc [NO ISSUE][HYR][MISC][BP] Fix Span lifefycle / API
issues)
private static final AccessTier INTERNAL_STORAGE_ACCESS_TIER =
AccessTier.HOT;
private final String endpoint;
private final String container;
@@ -100,11 +87,6 @@
}
public static AzBlobStorageClientConfig of(ICloudProperties
cloudProperties) {
-<<<<<<< HEAD (68ee7f Merge branch 'gerrit/morpheus' into 'gerrit/lumina')
-=======
- // TODO(mblow): the client id should be coming in by way fo the cloud
properties
- String clientId =
System.getenv(Configuration.PROPERTY_AZURE_CLIENT_ID);
->>>>>>> BRANCH (0223dc [NO ISSUE][HYR][MISC][BP] Fix Span lifefycle / API
issues)
return new
AzBlobStorageClientConfig(cloudProperties.getStorageEndpoint(),
cloudProperties.getStorageBucket(),
cloudProperties.getStoragePrefix(),
cloudProperties.getProfilerLogInterval(),
cloudProperties.getTokenAcquireTimeout(),
cloudProperties.getWriteMaxRequestsPerSecond(),
@@ -113,11 +95,7 @@
cloudProperties.getRequestsMaxHttpConnections(),
cloudProperties.getRequestsMaxPendingHttpConnections(),
cloudProperties.getRequestsHttpConnectionAcquireTimeout(),
cloudProperties.getRequestsHttpConnectionMaxIdleSeconds(),
-<<<<<<< HEAD (68ee7f Merge branch 'gerrit/morpheus' into 'gerrit/lumina')
cloudProperties.getRequestsHttpConnectionMaxLifetimeSeconds(),
cloudProperties.getAzureClientId());
-=======
- cloudProperties.getRequestsHttpConnectionMaxLifetimeSeconds(),
clientId);
->>>>>>> BRANCH (0223dc [NO ISSUE][HYR][MISC][BP] Fix Span lifefycle / API
issues)
}
public static AzBlobStorageClientConfig of(Map<String, String>
configuration, int writeBufferSize) {
diff --git
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageCloudClient.java
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageCloudClient.java
index c7105a7..e9cc098 100644
---
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageCloudClient.java
+++
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageCloudClient.java
@@ -106,7 +106,6 @@
}
public AzBlobStorageCloudClient(AzBlobStorageClientConfig config,
BlobServiceClient blobServiceClient,
-<<<<<<< HEAD (68ee7f Merge branch 'gerrit/morpheus' into 'gerrit/lumina')
BlobServiceAsyncClient blobServiceAsyncClient,
ICloudGuardian.NoOpCloudGuardian instance) {
this(config, ConnectionClientPair.of(blobServiceClient, null),
ConnectionClientPair.of(blobServiceAsyncClient, null),
instance);
@@ -116,12 +115,6 @@
ConnectionClientPair<BlobServiceClient> syncClient,
ConnectionClientPair<BlobServiceAsyncClient> asyncClient,
ICloudGuardian guardian) {
applyConfig(config, syncClient, asyncClient);
-=======
- BlobServiceAsyncClient asyncBlobServiceClient, ICloudGuardian
guardian) {
- this.blobContainerClient =
blobServiceClient.getBlobContainerClient(config.getContainer());
- this.blobContainerAsyncClient =
asyncBlobServiceClient.getBlobContainerAsyncClient(config.getContainer());
- this.config = config;
->>>>>>> BRANCH (0223dc [NO ISSUE][HYR][MISC][BP] Fix Span lifefycle / API
issues)
this.guardian = guardian;
long profilerInterval = config.getProfilerLogInterval();
AzureRequestRateLimiter limiter = new AzureRequestRateLimiter(config);
@@ -131,11 +124,7 @@
profiler = new RequestLimiterNoOpProfiler(limiter);
}
guardian.setCloudClient(this);
-<<<<<<< HEAD (68ee7f Merge branch 'gerrit/morpheus' into 'gerrit/lumina')
LOGGER.debug("created Azure cloud client with config: {}", config);
-=======
- LOGGER.debug("Created Azure Cloud Client with config: {}", config);
->>>>>>> BRANCH (0223dc [NO ISSUE][HYR][MISC][BP] Fix Span lifefycle / API
issues)
}
@Override
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21244?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: asterixdb
Gerrit-Branch: lumina
Gerrit-Change-Id: I3061cc326f673fda9bdbcb0f680e7029aafd076a
Gerrit-Change-Number: 21244
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-CC: Jenkins <[email protected]>
