You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ge...@apache.org on 2020/06/18 16:50:15 UTC
[lucene-solr] 01/02: Revert "SOLR-14566: Log NOW value on
coordinator node for dist search requests"
This is an automated email from the ASF dual-hosted git repository.
gerlowskija pushed a commit to branch SOLR_14566_add_now_to_coordinator_logging2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 99f3c81906c8377c154462430a1a79d4ce6561ec
Author: Jason Gerlowski <ja...@lucidworks.com>
AuthorDate: Thu Jun 18 11:01:42 2020 -0400
Revert "SOLR-14566: Log NOW value on coordinator node for dist search requests"
This reverts commit 460cd727db8194524041dd7b002c24a420a28eef.
---
solr/CHANGES.txt | 3 ---
.../java/org/apache/solr/handler/component/SearchHandler.java | 11 ++---------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index cc24a73..80c467a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -141,9 +141,6 @@ Improvements
* SOLR-14442: bin/solr and bin\solr.cmd invoke jstack <SOLR_PID> before forceful termination, if jstack is available.
Also, bin\solr.cmd executes forceful termination even port is unbinded already (Christine Poerschke via Mikhail Khludnev).
-* SOLR-14566: Solr now logs the NOW value on coordinator requests that is used on downstream per-shard requests. This
- allows easier association between shard requests and their corresponding coordinator request when reading logs. (Jason Gerlowski)
-
Optimizations
---------------------
* SOLR-8306: Do not collect expand documents when expand.rows=0 (Marshall Sanders, Amelia Henderson)
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
index 0c8e508..2051b20 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
@@ -25,7 +25,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import org.apache.commons.lang3.StringUtils;
import org.apache.lucene.index.ExitableDirectoryReader;
import org.apache.lucene.search.TotalHits;
import org.apache.solr.client.solrj.SolrServerException;
@@ -371,12 +370,6 @@ public class SearchHandler extends RequestHandlerBase implements SolrCoreAware,
rb.finished = new ArrayList<>();
int nextStage = 0;
-
- final String nowTimestamp = (rb.requestInfo != null) ? Long.toString(rb.requestInfo.getNOW().getTime()) : null;
- if (StringUtils.isNotEmpty(nowTimestamp)) {
- rsp.addToLog("NOW", nowTimestamp);
- }
-
do {
rb.stage = nextStage;
nextStage = ResponseBuilder.STAGE_DONE;
@@ -411,9 +404,9 @@ public class SearchHandler extends RequestHandlerBase implements SolrCoreAware,
params.set(ShardParams.SHARDS_PURPOSE, sreq.purpose);
params.set(ShardParams.SHARD_URL, shard); // so the shard knows what was asked
params.set(CommonParams.OMIT_HEADER, false);
- if (nowTimestamp != null) {
+ if (rb.requestInfo != null) {
// we could try and detect when this is needed, but it could be tricky
- params.set("NOW", nowTimestamp);
+ params.set("NOW", Long.toString(rb.requestInfo.getNOW().getTime()));
}
String shardQt = params.get(ShardParams.SHARDS_QT);
if (shardQt != null) {