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/07/23 19:24:35 UTC
[lucene-solr] 03/03: @315 Take out clean shutdown for now.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit c7878954f5a18acca4c32edf91df4afe3c3f2dc9
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Jul 23 14:24:06 2020 -0500
@315 Take out clean shutdown for now.
---
.../java/org/apache/solr/cloud/ZkController.java | 2 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 86 +++++++++++-----------
2 files changed, 44 insertions(+), 44 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 8594c3a..01519b0 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -1296,7 +1296,7 @@ public class ZkController implements Closeable {
return;
} finally {
if (zkClient != null) {
- zkClient.enableCloseLock();
+ zkClient.disableCloseLock();
}
ParWork.close(zkClient);
}
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
index 6104c14..b70c861 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
@@ -654,49 +654,49 @@ public class MiniSolrCloudCluster {
*/
public void shutdown() throws Exception {
if (zkServer.getZkClient().isConnected()) {
- try {
- log.info("creating cluster shutdown zk node");
-
- zkServer.getZkClient().mkdirs("/solr" + ZkController.CLUSTER_SHUTDOWN);
- zkServer.getZkClient().printLayout();
- zkServer.getZkClient().printLayoutToStream(System.out);
-
- CountDownLatch latch = new CountDownLatch(1);
- List<String> children = zkServer.getZkClient().getChildren("/solr" + ZkStateReader.LIVE_NODES_ZKNODE, new Watcher() {
- @Override
- public void process(WatchedEvent event) {
- if (Event.EventType.None.equals(event.getType())) {
- return;
- }
- if (event.getType() == Event.EventType.NodeChildrenChanged) {
- try {
- List<String> children = zkServer.getZkClient().getChildren("/solr" + ZkStateReader.LIVE_NODES_ZKNODE, this, false);
- if (children.size() == 0) {
- latch.countDown();
- }
- } catch (KeeperException e) {
- log.error("Exception on proper shutdown", e);
- return;
- } catch (InterruptedException e) {
- ParWork.propegateInterrupt(e);
- return;
- }
- }
- }
- }, false);
-
- if (children.size() > 0) {
- boolean success = latch.await(10, TimeUnit.SECONDS);
- if (!success) {
- throw new TimeoutException("Time out waiting to see solr live nodes go down " + children.size());
- }
- }
-
- } catch (KeeperException.NodeExistsException e) {
- log.info("Shutdown zk node already exists");
- } catch (Exception e) {
- log.error("Exception on proper shutdown", e);
- }
+// try {
+// log.info("creating cluster shutdown zk node");
+//
+// zkServer.getZkClient().mkdirs("/solr" + ZkController.CLUSTER_SHUTDOWN);
+// zkServer.getZkClient().printLayout();
+// zkServer.getZkClient().printLayoutToStream(System.out);
+//
+// CountDownLatch latch = new CountDownLatch(1);
+// List<String> children = zkServer.getZkClient().getChildren("/solr" + ZkStateReader.LIVE_NODES_ZKNODE, new Watcher() {
+// @Override
+// public void process(WatchedEvent event) {
+// if (Event.EventType.None.equals(event.getType())) {
+// return;
+// }
+// if (event.getType() == Event.EventType.NodeChildrenChanged) {
+// try {
+// List<String> children = zkServer.getZkClient().getChildren("/solr" + ZkStateReader.LIVE_NODES_ZKNODE, this, false);
+// if (children.size() == 0) {
+// latch.countDown();
+// }
+// } catch (KeeperException e) {
+// log.error("Exception on proper shutdown", e);
+// return;
+// } catch (InterruptedException e) {
+// ParWork.propegateInterrupt(e);
+// return;
+// }
+// }
+// }
+// }, false);
+//
+// if (children.size() > 0) {
+// boolean success = latch.await(10, TimeUnit.SECONDS);
+// if (!success) {
+// throw new TimeoutException("Time out waiting to see solr live nodes go down " + children.size());
+// }
+// }
+//
+// } catch (KeeperException.NodeExistsException e) {
+// log.info("Shutdown zk node already exists");
+// } catch (Exception e) {
+// log.error("Exception on proper shutdown", e);
+// }
}
try {