Skip to content

logging improvements #7076

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

Merged
moderakh merged 1 commit into from
Jan 3, 2020
Merged

logging improvements #7076

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
4 changes: 3 additions & 1 deletion sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/SessionContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,9 @@ private void setSessionToken(ResourceId resourceId, String collectionName, Strin
partitionKeyRangeId = tokenParts[0];
parsedSessionToken = SessionTokenHelper.parse(tokenParts[1]);

logger.trace("UPDATE SESSION token {} {} {}", resourceId.getUniqueDocumentCollectionId(), collectionName, parsedSessionToken);
if (logger.isTraceEnabled()) {
logger.trace("UPDATE SESSION token {} {} {}", resourceId.getUniqueDocumentCollectionId(), collectionName, parsedSessionToken);
}

boolean isKnownCollection;

Expand Down
2 changes: 1 addition & 1 deletion ...cosmos/src/main/java/com/azure/cosmos/implementation/caches/RxPartitionKeyRangeCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public Mono<Utils.ValueHolder<List<PartitionKeyRange>>> tryGetOverlappingRangesA
// maybe we should consider changing to ArrayList to avoid conversion
return new Utils.ValueHolder<>(new ArrayList<>(routingMapValueHolder.v.getOverlappingRanges(range)));
} else {
logger.debug("Routing Map Null for collection: {} for range: {}, forceRefresh:{}", collectionRid, range.toString(), forceRefresh);
logger.debug("Routing Map Null for collection: {} for range: {}, forceRefresh:{}", collectionRid, range, forceRefresh);
return new Utils.ValueHolder<>(null);
}
});
Expand Down
35 changes: 22 additions & 13 deletions ...mos/src/main/java/com/azure/cosmos/implementation/directconnectivity/AddressResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,19 +161,23 @@ private static void ensureRoutingMapPresent(
// which doesn't exist, we return InvalidPartitionException. Backend does the same.
// Caller (client SDK or whoever attached the header) supposedly has outdated collection cache and will refresh it.
// We cannot retry here, as the logic for retry in this case is use-case specific.
logger.debug(
"Routing map for request with partitionkeyrageid {} was not found",
request.getPartitionKeyRangeIdentity().toHeader());

if (logger.isDebugEnabled()) {
logger.debug(
"Routing map for request with partitionkeyrageid {} was not found",
request.getPartitionKeyRangeIdentity().toHeader());
}
InvalidPartitionException invalidPartitionException = new InvalidPartitionException();
BridgeInternal.setResourceAddress(invalidPartitionException, request.getResourceAddress());
throw invalidPartitionException;
}

if (routingMap == null) {
logger.debug(
"Routing map was not found although collection cache is upto date for collection {}",
collection.getResourceId());
if (logger.isDebugEnabled()) {
logger.debug(
"Routing map was not found although collection cache is upto date for collection {}",
collection.getResourceId());
}
// Routing map not found although collection was resolved correctly.
NotFoundException e = new NotFoundException();
BridgeInternal.setResourceAddress(e, request.getResourceAddress());
Expand Down Expand Up @@ -577,7 +581,9 @@ private Mono<Utils.ValueHolder<ResolutionResult>> tryResolveServerPartitionByPar

PartitionKeyRange partitionKeyRange = routingMap.getRangeByPartitionKeyRangeId(request.getPartitionKeyRangeIdentity().getPartitionKeyRangeId());
if (partitionKeyRange == null) {
logger.debug("Cannot resolve range '{}'", request.getPartitionKeyRangeIdentity().toHeader());
if (logger.isDebugEnabled()) {
logger.debug("Cannot resolve range '{}'", request.getPartitionKeyRangeIdentity().toHeader());
}
return returnOrError(() -> new Utils.ValueHolder<>(this.handleRangeAddressResolutionFailure(request, collectionCacheIsUpToDate, routingMapCacheIsUpToDate, routingMap)));
}

Expand All @@ -588,8 +594,9 @@ private Mono<Utils.ValueHolder<ResolutionResult>> tryResolveServerPartitionByPar

return addressesObs.flatMap(addressesValueHolder -> {
if (addressesValueHolder.v == null) {
logger.debug("Cannot resolve addresses for range '{}'", request.getPartitionKeyRangeIdentity().toHeader());

if (logger.isDebugEnabled()) {
logger.debug("Cannot resolve addresses for range '{}'", request.getPartitionKeyRangeIdentity().toHeader());
}
try {
return Mono.just(new Utils.ValueHolder<>(this.handleRangeAddressResolutionFailure(request, collectionCacheIsUpToDate, routingMapCacheIsUpToDate, routingMap)));
} catch (CosmosClientException e) {
Expand Down Expand Up @@ -666,10 +673,12 @@ private PartitionKeyRange tryResolveServerPartitionByPartitionKey(
// * If collection rid doesn't match, server will send back InvalidPartiitonException and GATEWAY will
// refresh name routing cache - this will refresh partition key definition as well, and retry.

logger.debug(
"Cannot compute effective partition getKey. Definition has '{}' getPaths, values supplied has '{}' getPaths. Will refresh cache and retry.",
collection.getPartitionKey().getPaths().size(),
partitionKey.getComponents().size());
if (logger.isDebugEnabled()) {
logger.debug(
"Cannot compute effective partition getKey. Definition has '{}' getPaths, values supplied has '{}' getPaths. Will refresh cache and retry.",
collection.getPartitionKey().getPaths().size(),
partitionKey.getComponents().size());
}

return null;
}
Expand Down
9 changes: 6 additions & 3 deletions ...s/src/main/java/com/azure/cosmos/implementation/directconnectivity/ConsistencyWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,12 @@ private Mono<Boolean> waitForWriteBarrierAsync(RxDocumentServiceRequest barrierR

//get max global committed lsn from current batch of responses, then update if greater than max of all batches.
if (writeBarrierRetryCount.getAndDecrement() == 0) {
logger.debug("ConsistencyWriter: WaitForWriteBarrierAsync - Last barrier multi-region strong. Responses: {}",
responses.stream().map(StoreResult::toString).collect(Collectors.joining("; ")));
logger.debug("ConsistencyWriter: Highest global committed lsn received for write barrier call is {}", maxGlobalCommittedLsnReceived);
if (logger.isDebugEnabled()) {

logger.debug("ConsistencyWriter: WaitForWriteBarrierAsync - Last barrier multi-region strong. Responses: {}",
responses.stream().map(StoreResult::toString).collect(Collectors.joining("; ")));
logger.debug("ConsistencyWriter: Highest global committed lsn received for write barrier call is {}", maxGlobalCommittedLsnReceived);
}
return Mono.just(Boolean.FALSE);
}

Expand Down
17 changes: 10 additions & 7 deletions ...cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/QuorumReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,9 +541,10 @@ private Mono<Boolean> waitForReadBarrierAsync(
barrierRequest.requestContext.forceRefreshAddressCache = false;

if (readBarrierRetryCount.decrementAndGet() == 0) {
logger.debug("QuorumReader: waitForReadBarrierAsync - Last barrier for single-region requests. Responses: {}",
JavaStreamUtils.toString(responses, "; "));

if (logger.isDebugEnabled()) {
logger.debug("QuorumReader: waitForReadBarrierAsync - Last barrier for single-region requests. Responses: {}",
JavaStreamUtils.toString(responses, "; "));
}
// retries exhausted
return Flux.just(false);

Expand Down Expand Up @@ -591,11 +592,13 @@ private Mono<Boolean> waitForReadBarrierAsync(

//trace on last retry.
if (readBarrierRetryCountMultiRegion.getAndDecrement() == 0) {
logger.debug("QuorumReader: waitForReadBarrierAsync - Last barrier for mult-region strong requests. Responses: {}",
JavaStreamUtils.toString(responses, "; "));
return Flux.just(false);
if (logger.isDebugEnabled()) {
logger.debug("QuorumReader: waitForReadBarrierAsync - Last barrier for mult-region strong requests. Responses: {}",
JavaStreamUtils.toString(responses, "; "));
}
return Flux.just(false);
} else {
return Flux.empty();
return Flux.empty();
}
}
);
Expand Down
14 changes: 8 additions & 6 deletions ...-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/StoreReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,12 +294,14 @@ private ReadReplicaResult createReadReplicaResult(List<StoreResult> responseResu
boolean hasGoneException,
RxDocumentServiceRequest entity) throws CosmosClientException {
if (responseResult.size() < replicaCountToRead) {
logger.debug("Could not get quorum number of responses. " +
"ValidResponsesReceived: {} ResponsesExpected: {}, ResolvedAddressCount: {}, ResponsesString: {}",
responseResult.size(),
replicaCountToRead,
resolvedAddressCount,
String.join(";", responseResult.stream().map(r -> r.toString()).collect(Collectors.toList())));
if (logger.isDebugEnabled()) {
logger.debug("Could not get quorum number of responses. " +
"ValidResponsesReceived: {} ResponsesExpected: {}, ResolvedAddressCount: {}, ResponsesString: {}",
responseResult.size(),
replicaCountToRead,
resolvedAddressCount,
String.join(";", responseResult.stream().map(r -> r.toString()).collect(Collectors.toList())));
}

if (hasGoneException) {
if (!entity.requestContext.performLocalRefreshOnGoneException) {
Expand Down