You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/12/11 09:28:03 UTC
[34/47] lucene-solr:jira/http2: SOLR-12801: Try to harden closing of
zk db in TestConfigSetsAPIZkFailure.
SOLR-12801: Try to harden closing of zk db in TestConfigSetsAPIZkFailure.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/56b95914
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/56b95914
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/56b95914
Branch: refs/heads/jira/http2
Commit: 56b959141fa3e06db2ea6c079adb01bdab87c003
Parents: 1305501
Author: markrmiller <ma...@apache.org>
Authored: Sun Dec 9 23:03:11 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Mon Dec 10 10:02:58 2018 -0600
----------------------------------------------------------------------
.../src/java/org/apache/solr/cloud/ZkTestServer.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/56b95914/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
index 1150c48..8aa1e7d 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
@@ -104,6 +104,8 @@ public class ZkTestServer {
protected volatile SolrZkClient rootClient;
protected volatile SolrZkClient chRootClient;
+ private volatile ZKDatabase zkDb;
+
static public enum LimitViolationAction {
IGNORE,
REPORT,
@@ -514,6 +516,7 @@ public class ZkTestServer {
}
public void setZKDatabase(ZKDatabase zkDb) {
+ this.zkDb = zkDb;
zkServer.zooKeeperServer.setZKDatabase(zkDb);
}
@@ -611,6 +614,11 @@ public class ZkTestServer {
} catch (Exception e) {
log.error("Exception shutting down ZooKeeper Test Server",e);
}
+
+ if (zkDb != null) {
+ zkDb.close();
+ }
+
while (true) {
try {
zooThread.join();