gerlowskija commented on a change in pull request #1574: URL: https://github.com/apache/lucene-solr/pull/1574#discussion_r444888654
########## File path: solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java ########## @@ -500,6 +509,29 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw } } + private void tagRequestWithRequestId(ResponseBuilder rb) { + String rid = getRequestId(rb.req); + if (StringUtils.isBlank(rb.req.getParams().get(CommonParams.REQUEST_ID))) { + ModifiableSolrParams params = new ModifiableSolrParams(rb.req.getParams()); + params.add(CommonParams.REQUEST_ID, rid);//add rid to the request so that shards see it + rb.req.setParams(params); + } + if (rb.isDistrib) { + rb.rsp.addToLog(CommonParams.REQUEST_ID, rid); //to see it in the logs of the landing core + } + } + + public static String getRequestId(SolrQueryRequest req) { + String rid = req.getParams().get(CommonParams.REQUEST_ID); + return StringUtils.isNotBlank(rid) ? rid : generateRid(req); + } + + @SuppressForbidden(reason = "Need currentTimeMillis, only used for naming") + private static String generateRid(SolrQueryRequest req) { + String hostName = req.getCore().getCoreContainer().getHostName(); + return hostName + "-" + req.getCore().getName() + "-" + System.currentTimeMillis() + "-" + ridCounter.getAndIncrement(); Review comment: Lmk if anyone has a strong opinion here. I've gotten feedback from both directions (make it unique (but verbose) vs make it concise (but not unique)). I'm going to just choose one in the next day or two to avoid dragging things out. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org