You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/04/23 17:35:21 UTC
[17/40] lucene-solr:jira/solr-11833: SOLR-6286:
TestReplicationHandler.doTestReplicateAfterCoreReload(): stop checking for
identical commits before/after master core reload;
and make non-nightly mode test 10 docs instead of 0.
SOLR-6286: TestReplicationHandler.doTestReplicateAfterCoreReload(): stop checking for identical commits before/after master core reload; and make non-nightly mode test 10 docs instead of 0.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/46037dc6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/46037dc6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/46037dc6
Branch: refs/heads/jira/solr-11833
Commit: 46037dc67494a746857048399c02a6cf6f7a07c1
Parents: 42da6f7
Author: Steve Rowe <sa...@apache.org>
Authored: Thu Apr 19 14:49:10 2018 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Thu Apr 19 14:49:10 2018 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 4 +++
.../solr/handler/TestReplicationHandler.java | 36 +++++++++-----------
2 files changed, 21 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46037dc6/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 298abad..be3f704 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -170,6 +170,10 @@ Bug Fixes
* SOLR-12187: Replica should watch clusterstate and unload itself if its entry is removed (Cao Manh Dat)
+* SOLR-6286: TestReplicationHandler.doTestReplicateAfterCoreReload(): stop checking for identical
+ commits before/after master core reload; and make non-nightly mode test 10 docs instead of 0.
+ (shalin, hossman, Mark Miller, Steve Rowe)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46037dc6/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
index 8c24754..e22f4f7 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
@@ -231,22 +231,22 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
return details;
}
- private NamedList<Object> getCommits(SolrClient s) throws Exception {
-
-
- ModifiableSolrParams params = new ModifiableSolrParams();
- params.set("command","commits");
- params.set("_trace","getCommits");
- params.set("qt",ReplicationHandler.PATH);
- QueryRequest req = new QueryRequest(params);
-
- NamedList<Object> res = s.request(req);
-
- assertNotNull("null response from server", res);
-
-
- return res;
- }
+// private NamedList<Object> getCommits(SolrClient s) throws Exception {
+//
+//
+// ModifiableSolrParams params = new ModifiableSolrParams();
+// params.set("command","commits");
+// params.set("_trace","getCommits");
+// params.set("qt",ReplicationHandler.PATH);
+// QueryRequest req = new QueryRequest(params);
+//
+// NamedList<Object> res = s.request(req);
+//
+// assertNotNull("null response from server", res);
+//
+//
+// return res;
+// }
private NamedList<Object> getIndexVersion(SolrClient s) throws Exception {
@@ -1239,7 +1239,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
@Test
public void doTestReplicateAfterCoreReload() throws Exception {
- int docs = TEST_NIGHTLY ? 200000 : 0;
+ int docs = TEST_NIGHTLY ? 200000 : 10;
//stop slave
slaveJetty.stop();
@@ -1283,12 +1283,10 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
assertEquals(null, cmp);
Object version = getIndexVersion(masterClient).get("indexversion");
- NamedList<Object> commits = getCommits(masterClient);
reloadCore(masterClient, "collection1");
assertEquals(version, getIndexVersion(masterClient).get("indexversion"));
- assertEquals(commits.get("commits"), getCommits(masterClient).get("commits"));
index(masterClient, "id", docs + 10, "name", "name = 1");
index(masterClient, "id", docs + 20, "name", "name = 2");