You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2018/05/03 06:50:35 UTC
lucene-solr:branch_7x: SOLR-12288: Add more MDC logging information
to core admin requests
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 83c6c7017 -> 0c89db842
SOLR-12288: Add more MDC logging information to core admin requests
(cherry picked from commit 8b9c2a3)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0c89db84
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0c89db84
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0c89db84
Branch: refs/heads/branch_7x
Commit: 0c89db842506e1dc9804723ebcf6d99b3947ee3e
Parents: 83c6c70
Author: Varun Thacker <va...@apache.org>
Authored: Wed May 2 19:43:14 2018 -0700
Committer: Varun Thacker <va...@apache.org>
Committed: Wed May 2 23:39:01 2018 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../java/org/apache/solr/handler/admin/CoreAdminHandler.java | 6 ++++++
.../src/java/org/apache/solr/logging/MDCLoggingContext.java | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0c89db84/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0f0375d..6d64830 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -256,6 +256,8 @@ Other Changes
* SOLR-12289: Add more MDC logging information to collection admin requests (Varun Thacker)
+* SOLR-12288: Add more MDC logging information to core admin requests (Varun Thacker)
+
================== 7.3.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0c89db84/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
index 8932c21..66dc39e 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
@@ -44,6 +44,7 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.handler.RequestHandlerBase;
+import org.apache.solr.logging.MDCLoggingContext;
import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
@@ -170,6 +171,11 @@ public class CoreAdminHandler extends RequestHandlerBase implements PermissionNa
}
final CallInfo callInfo = new CallInfo(this, req, rsp, op);
+ String coreName = req.getParams().get(CoreAdminParams.CORE);
+ if (coreName == null) {
+ coreName = req.getParams().get(CoreAdminParams.NAME);
+ }
+ MDCLoggingContext.setCoreName(coreName);
if (taskId == null) {
callInfo.call();
} else {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0c89db84/solr/core/src/java/org/apache/solr/logging/MDCLoggingContext.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/logging/MDCLoggingContext.java b/solr/core/src/java/org/apache/solr/logging/MDCLoggingContext.java
index 1f5324b..2276a9e6 100644
--- a/solr/core/src/java/org/apache/solr/logging/MDCLoggingContext.java
+++ b/solr/core/src/java/org/apache/solr/logging/MDCLoggingContext.java
@@ -69,7 +69,7 @@ public class MDCLoggingContext {
}
}
- private static void setCoreName(String core) {
+ public static void setCoreName(String core) {
if (core != null) {
MDC.put(CORE_NAME_PROP, "x:" + core);
} else {