You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/08/12 01:57:45 UTC
[lucene-solr] branch reference_impl_dev updated (bd8a330 -> 2c0a4ac)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from bd8a330 @515 Tweak remote proxy, make sure non nightly tests actually cache lazy collection refs.
new 24c0e4b @516 Setup isLeader for dist commit.
new 2c0a4ac @517 Avoid NPE in qos filter.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
solr/core/src/java/org/apache/solr/servlet/SolrQoSFilter.java | 3 ++-
.../apache/solr/update/processor/DistributedZkUpdateProcessor.java | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
[lucene-solr] 02/02: @517 Avoid NPE in qos filter.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 2c0a4ac27c6cf7dab7ecb0a8a9de74d9b8f8011a
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Aug 11 20:56:17 2020 -0500
@517 Avoid NPE in qos filter.
---
solr/core/src/java/org/apache/solr/servlet/SolrQoSFilter.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrQoSFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrQoSFilter.java
index 8a1c2b4..76b5ea7 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrQoSFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrQoSFilter.java
@@ -60,7 +60,8 @@ public class SolrQoSFilter extends QoSFilter {
throws IOException, ServletException {
HttpServletRequest req = (HttpServletRequest) request;
String source = req.getHeader(QoSParams.REQUEST_SOURCE);
- if (!req.getPathInfo().startsWith("/img/") && (source == null || !source.equals(QoSParams.INTERNAL))) {
+ boolean imagePath = req.getPathInfo() != null && req.getPathInfo().startsWith("/img/");
+ if (!imagePath && (source == null || !source.equals(QoSParams.INTERNAL))) {
// TODO - we don't need to call this *every* request
double ourLoad = sysStats.getAvarageUsagePerCPU();
[lucene-solr] 01/02: @516 Setup isLeader for dist commit.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 24c0e4b9c86ca223bda1540ae9fb103ffc4c525f
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Aug 11 20:55:59 2020 -0500
@516 Setup isLeader for dist commit.
---
.../apache/solr/update/processor/DistributedZkUpdateProcessor.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java
index fa4e88e..730b7cf 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java
@@ -159,8 +159,9 @@ public class DistributedZkUpdateProcessor extends DistributedUpdateProcessor {
@Override
public void processCommit(CommitUpdateCommand cmd) throws IOException {
- {
- log.info("processCommit - start commit isLeader={} commit_end_point={} replicaType={}", isLeader, req.getParams().get(COMMIT_END_POINT), replicaType);
+ setupRequest(cmd);
+
+ log.info("processCommit - start commit isLeader={} commit_end_point={} replicaType={}", isLeader, req.getParams().get(COMMIT_END_POINT), replicaType);
try (ParWork worker = new ParWork(this, false, true)) {
clusterState = zkController.getClusterState();
@@ -288,7 +289,6 @@ public class DistributedZkUpdateProcessor extends DistributedUpdateProcessor {
worker.addCollect("distCommit");
}
log.info("processCommit(CommitUpdateCommand) - end");
- }
}
@Override