You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ge...@apache.org on 2023/08/25 19:50:41 UTC
[solr-sandbox] branch main updated: Add 'collection' MDC to more producer logs (#57)
This is an automated email from the ASF dual-hosted git repository.
gerlowskija pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-sandbox.git
The following commit(s) were added to refs/heads/main by this push:
new 9ea4e99 Add 'collection' MDC to more producer logs (#57)
9ea4e99 is described below
commit 9ea4e996eedb3bde637b17aad5f0214dcd1d8bd7
Author: Jason Gerlowski <ge...@apache.org>
AuthorDate: Fri Aug 25 15:50:35 2023 -0400
Add 'collection' MDC to more producer logs (#57)
---
.../crossdc/messageprocessor/SolrMessageProcessor.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/crossdc-consumer/src/main/java/org/apache/solr/crossdc/messageprocessor/SolrMessageProcessor.java b/crossdc-consumer/src/main/java/org/apache/solr/crossdc/messageprocessor/SolrMessageProcessor.java
index aad1b77..8b3a635 100644
--- a/crossdc-consumer/src/main/java/org/apache/solr/crossdc/messageprocessor/SolrMessageProcessor.java
+++ b/crossdc-consumer/src/main/java/org/apache/solr/crossdc/messageprocessor/SolrMessageProcessor.java
@@ -34,6 +34,7 @@ import org.apache.solr.crossdc.common.MirroredSolrRequest;
import org.apache.solr.crossdc.common.SolrExceptionUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
import java.lang.invoke.MethodHandles;
import java.util.List;
@@ -63,11 +64,13 @@ public class SolrMessageProcessor extends MessageProcessor implements IQueueHand
@Override
public Result<MirroredSolrRequest> handleItem(MirroredSolrRequest mirroredSolrRequest) {
- connectToSolrIfNeeded();
+ try (final MDC.MDCCloseable mdc = MDC.putCloseable("collection", getCollectionFromRequest(mirroredSolrRequest))) {
+ connectToSolrIfNeeded();
- // preventCircularMirroring(mirroredSolrRequest); TODO: isn't this handled by the mirroring handler?
+ // preventCircularMirroring(mirroredSolrRequest); TODO: isn't this handled by the mirroring handler?
- return processMirroredRequest(mirroredSolrRequest);
+ return processMirroredRequest(mirroredSolrRequest);
+ }
}
private Result<MirroredSolrRequest> processMirroredRequest(MirroredSolrRequest request) {
@@ -353,4 +356,9 @@ public class SolrMessageProcessor extends MessageProcessor implements IQueueHand
}
}
+ private static String getCollectionFromRequest(MirroredSolrRequest mirroredSolrRequest) {
+ if (mirroredSolrRequest == null || mirroredSolrRequest.getSolrRequest() == null) return null;
+
+ return mirroredSolrRequest.getSolrRequest().getCollection();
+ }
}