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/11/10 04:38:27 UTC
[lucene-solr] 03/05: @1131 Working out collections queue.
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 ebdb2c38380c96dc40fb6d85cf028b88001ece0b
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Nov 9 20:58:11 2020 -0600
@1131 Working out collections queue.
---
solr/core/src/java/org/apache/solr/cloud/Overseer.java | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index 4f73290..683f3da 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -956,6 +956,12 @@ public class Overseer implements SolrCloseable {
Map<String,byte[]> data = zkController.getZkClient().getData(fullPaths);
+ try {
+ zkController.getZkClient().delete(fullPaths, true);
+ } catch (Exception e) {
+ log.warn("Exception deleting processed zk nodes", e);
+ }
+
overseer.getTaskExecutor().submit(() -> {
try {
runAsync(items, fullPaths, data);
@@ -1032,17 +1038,6 @@ public class Overseer implements SolrCloseable {
} catch (Exception e) {
log.warn("Exception deleting processed zk nodes", e);
}
- try {
- for (String item : items) {
- if (item.startsWith("qnr-")) {
- fullPaths.remove(path + "/" + item);
- }
- }
-
- zkController.getZkClient().delete(fullPaths, true);
- } catch (Exception e) {
- log.warn("Exception deleting processed zk nodes", e);
- }
}
}
}