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/10/09 04:33:22 UTC
[lucene-solr] branch reference_impl_dev updated (083cd54 -> 0a21151)
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 083cd54 Reuse crypto keys in tests (#1932)
new 302c3b2 @968 Rejoin Overseer election in finally block.
new 0a21151 @969 Revert - did not help rarish ReplaceNodeTest fail: Duplicate request with the same requestid found.
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/cloud/Overseer.java | 9 ++++++---
.../src/java/org/apache/solr/handler/admin/CoreAdminHandler.java | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
[lucene-solr] 01/02: @968 Rejoin Overseer election in finally block.
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 302c3b26f06772fdcc02fa04a44e086ccc321ee2
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Oct 8 23:31:15 2020 -0500
@968 Rejoin Overseer election in finally block.
---
solr/core/src/java/org/apache/solr/cloud/Overseer.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 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 8959b0e..dcef0d6 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -909,9 +909,12 @@ public class Overseer implements SolrCloseable {
log.info("Overseer (id={}) closing", id);
}
if (context != null) {
- context.close(fromCSUpdateThread);
- if (!closeAndDone) {
- zkController.rejoinOverseerElection(context.electionPath, false);
+ try {
+ context.close(fromCSUpdateThread);
+ } finally {
+ if (!closeAndDone) {
+ zkController.rejoinOverseerElection(context.electionPath, false);
+ }
}
}
}
[lucene-solr] 02/02: @969 Revert - did not help rarish
ReplaceNodeTest fail: Duplicate request with the same requestid found.
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 0a21151cb5f54fa7aeca1f99f754462f11a433b0
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Oct 8 23:32:58 2020 -0500
@969 Revert - did not help rarish ReplaceNodeTest fail: Duplicate request with the same requestid found.
---
solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 74eeb61..b2042bc 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
@@ -148,7 +148,7 @@ public class CoreAdminHandler extends RequestHandlerBase implements PermissionNa
if(taskId != null) {
// Put the tasks into the maps for tracking
- if (getRequestStatusMap(RUNNING).containsKey(taskId) || getRequestStatusMap(COMPLETED).containsKey(taskId)) {
+ if (getRequestStatusMap(RUNNING).containsKey(taskId) || getRequestStatusMap(COMPLETED).containsKey(taskId) || getRequestStatusMap(FAILED).containsKey(taskId)) {
throw new SolrException(ErrorCode.BAD_REQUEST,
"Duplicate request with the same requestid found.");
}