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/30 05:53:26 UTC
[lucene-solr] 01/03: @460 Bit of cleanup.
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 461364af99279245fda9810e6ea40f4541036bb5
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Jul 29 23:48:18 2020 -0500
@460 Bit of cleanup.
---
.../apache/solr/cloud/overseer/ZkStateWriter.java | 20 +++++++++++++-------
.../org/apache/solr/core/ConfigSetProperties.java | 1 -
.../org/apache/solr/update/SolrCmdDistributor.java | 2 +-
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
index 07c1342..e167031 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
@@ -170,13 +170,12 @@ public class ZkStateWriter {
* @throws KeeperException if any ZooKeeper operation results in an error
* @throws InterruptedException if the current thread is interrupted
*/
- public ClusterState writePendingUpdates(ClusterState prevState) throws IllegalStateException, KeeperException, InterruptedException {
+ public ClusterState writePendingUpdates(ClusterState state) throws IllegalStateException, KeeperException, InterruptedException {
if (log.isDebugEnabled()) {
log.debug("writePendingUpdates() - start updates.size={}", updates.size());
}
-
- assert prevState != null;
+ ClusterState prevState = reader.getClusterState();
Timer.Context timerContext = stats.time("update_state");
boolean success = false;
ClusterState newClusterState = null;
@@ -303,7 +302,7 @@ public class ZkStateWriter {
log.debug("Write state.json bytes={} cs={}", data.length, newClusterState);
}
try {
- prevVersion = -1;
+ prevVersion = 0;
reader.getZkClient().create(path, data, CreateMode.PERSISTENT, true);
} catch (KeeperException.NodeExistsException e) {
stat = reader.getZkClient().setData(path, data, -1, true);
@@ -327,14 +326,21 @@ public class ZkStateWriter {
}
// }
- updates.clear();
// numUpdates = 0;
if (c != null) {
try {
+ System.out.println("waiting to see state " + prevVersion);
+ Integer finalPrevVersion = prevVersion;
reader.waitForState(c.getName(), 15, TimeUnit.SECONDS,
(l, col) -> {
- if (col != null && col.getZNodeVersion() > prevState.getZNodeVersion()) {
+
+ if (col != null) {
+ System.out.println("the version " + col.getZNodeVersion());
+ }
+
+ if (col != null && col.getZNodeVersion() > finalPrevVersion) {
if (log.isDebugEnabled()) log.debug("Waited for ver: {}", col.getZNodeVersion());
+ System.out.println("found the version");
return true;
}
return false;
@@ -358,7 +364,7 @@ public class ZkStateWriter {
if (exception != null) {
throw exception;
}
-
+ updates.clear();
success = true;
} finally {
timerContext.stop();
diff --git a/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java b/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java
index c0c75ea..a711238 100644
--- a/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java
+++ b/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java
@@ -60,7 +60,6 @@ public class ConfigSetProperties {
try (InputStream resource = loader.openResource(name)) {
try (InputStreamReader reader = new InputStreamReader(resource, StandardCharsets.UTF_8)) {
try {
- System.out.println("JSON:" + IOUtils.toString(reader));
return readFromInputStream(reader);
} finally {
ParWork.close(reader);
diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
index 32bbe78..39dc1fe 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
@@ -130,7 +130,7 @@ public class SolrCmdDistributor implements Closeable {
log.info("check retry true");
return true;
} else {
- log.info("max retries exhausted retry false");
+ log.info("max retries exhausted or not a retryable error {} {}", err.req.retries, rspCode);
return false;
}
} else {