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 22:10:32 UTC
[lucene-solr] 04/07: @1146 should not be replaying tlogs
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 ea5efd757e90ae5ab724fa3afb99ccb9a414e431
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Nov 10 15:28:46 2020 -0600
@1146 should not be replaying tlogs
---
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 2 +-
solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index fc57248..3a8b589 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -1357,7 +1357,7 @@ public class ZkController implements Closeable, Runnable {
log.info("Register SolrCore, core={} baseUrl={} collection={}, shard={} skipRecovery={}", coreName, baseUrl, collection, shardId, skipRecovery);
AtomicReference<DocCollection> coll = new AtomicReference<>();
try {
- zkStateReader.waitForState(collection, 30, TimeUnit.SECONDS, (l, c) -> { // nocommit timeout
+ zkStateReader.waitForState(collection, 60, TimeUnit.SECONDS, (l, c) -> { // nocommit timeout
// if (isClosed()) {
// throw new AlreadyClosedException();
// }
diff --git a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
index fb14c57..af952f2 100644
--- a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
+++ b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
@@ -842,7 +842,7 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreState
}
// we shouldn't close the transaction logs either, but leaving them open
// means we can't delete them on windows (needed for tests)
- if (ulog != null) ulog.close(false);
+ if (ulog != null) ulog.close(true);
return;
}
@@ -896,7 +896,7 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreState
}
try {
- if (ulog != null) ulog.close(false);
+ if (ulog != null) ulog.close(true);
} catch (Throwable th) {
log.error("Error closing log files", th);
if (th instanceof OutOfMemoryError) {