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/12/16 20:23:21 UTC
[lucene-solr] branch reference_impl_dev updated (6f2f98c -> d57b723)
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 6f2f98c @1245 Test leak.
new 97d78e7 @1246 Cleanup.
new d57b723 @1247 Cleanup.
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:
.../core/backup/repository/HdfsBackupRepositoryTest.java | 2 --
.../java/org/apache/solr/common/cloud/ZkStateReader.java | 16 ++++++++--------
2 files changed, 8 insertions(+), 10 deletions(-)
[lucene-solr] 01/02: @1246 Cleanup.
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 97d78e70ef43456dd2ddd6cc88de9e0c350fd0f0
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Dec 16 14:11:31 2020 -0600
@1246 Cleanup.
---
.../solr/core/backup/repository/HdfsBackupRepositoryTest.java | 2 --
.../src/java/org/apache/solr/common/cloud/ZkStateReader.java | 10 +++++-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/core/backup/repository/HdfsBackupRepositoryTest.java b/solr/core/src/test/org/apache/solr/core/backup/repository/HdfsBackupRepositoryTest.java
index 34ec910..bb693e2 100644
--- a/solr/core/src/test/org/apache/solr/core/backup/repository/HdfsBackupRepositoryTest.java
+++ b/solr/core/src/test/org/apache/solr/core/backup/repository/HdfsBackupRepositoryTest.java
@@ -27,8 +27,6 @@ import org.apache.solr.core.HdfsDirectoryFactory;
import org.apache.solr.store.hdfs.HdfsDirectory;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
@LuceneTestCase.Nightly
public class HdfsBackupRepositoryTest extends SolrTestCase {
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 68ae466..553782f 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -920,12 +920,12 @@ public class ZkStateReader implements SolrCloseable, Replica.NodeNameToBaseUrl {
} catch (NullPointerException e) {
// okay
}
- if (notifications != null) {
- notifications.shutdownNow();
- }
+// if (notifications != null) {
+// notifications.shutdownNow();
+// }
- waitLatches.forEach(c -> { for (int i = 0; i < c.getCount(); i++) c.countDown(); });
- waitLatches.clear();
+// waitLatches.forEach(c -> { for (int i = 0; i < c.getCount(); i++) c.countDown(); });
+// waitLatches.clear();
} finally {
assert ObjectReleaseTracker.release(this);
[lucene-solr] 02/02: @1247 Cleanup.
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 d57b723e992768bdeaefd4eda3e65b28c6b17dae
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Dec 16 14:22:57 2020 -0600
@1247 Cleanup.
---
solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 553782f..dbe4cdb 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -902,9 +902,9 @@ public class ZkStateReader implements SolrCloseable, Replica.NodeNameToBaseUrl {
}
}
- if (notifications != null) {
- notifications.shutdown();
- }
+// if (notifications != null) {
+// notifications.shutdown();
+// }
stateWatchersMap.forEach((s, stateWatcher) -> IOUtils.closeQuietly(stateWatcher));
stateWatchersMap.clear();