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 2013/02/24 16:35:59 UTC
svn commit: r1449497 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/classification/ lucene/codecs/ lucene/core/
lucene/cor...
Author: markrmiller
Date: Sun Feb 24 15:35:58 2013
New Revision: 1449497
URL: http://svn.apache.org/r1449497
Log:
fix up test
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/README.txt (props changed)
lucene/dev/branches/branch_4x/lucene/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/branch_4x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/classification/ (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java (props changed)
lucene/dev/branches/branch_4x/lucene/demo/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/grouping/ (props changed)
lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/branch_4x/lucene/join/ (props changed)
lucene/dev/branches/branch_4x/lucene/licenses/ (props changed)
lucene/dev/branches/branch_4x/lucene/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/module-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/queries/ (props changed)
lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_4x/lucene/site/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/tools/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/solr/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/README.txt (props changed)
lucene/dev/branches/branch_4x/solr/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (props changed)
lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestConfig.java (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/scripts/ (props changed)
lucene/dev/branches/branch_4x/solr/site/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/testlogging.properties (props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1449497&r1=1449496&r2=1449497&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java Sun Feb 24 15:35:58 2013
@@ -449,16 +449,6 @@ public class TestReplicationHandler exte
assertTrue(slaveXsltDir.isDirectory());
assertTrue(slaveXsl.exists());
- // revert the schema
- master.copyConfigFile(CONF_DIR + "schema-replication1.xml", "schema.xml");
- masterJetty.stop();
- masterJetty = createJetty(master);
- masterClient = createNewSolrServer(masterJetty.getLocalPort());
-
- slave.copyConfigFile(CONF_DIR + "schema-replication1.xml", "schema.xml");
- slaveJetty.stop();
- slaveJetty = createJetty(slave);
- slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
}
@Test
@@ -732,91 +722,66 @@ public class TestReplicationHandler exte
String cmp = BaseDistributedSearchTestCase.compare(masterQueryResult, slaveQueryResult, 0, null);
assertEquals(null, cmp);
- // NOTE: the master only replicates after startup now!
- // revert that change.
- master.copyConfigFile(CONF_DIR + "solrconfig-master.xml", "solrconfig.xml");
- masterJetty.stop();
- masterJetty = createJetty(master);
- masterClient = createNewSolrServer(masterJetty.getLocalPort());
-
- slave.setTestPort(masterJetty.getLocalPort());
- slave.copyConfigFile(slave.getSolrConfigFile(), "solrconfig.xml");
-
- //start slave
- slaveJetty.stop();
- slaveJetty = createJetty(slave);
- slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
}
@Test
public void doTestReplicateAfterStartupWithNoActivity() throws Exception {
useFactory(null);
try {
-
- //stop slave
- slaveJetty.stop();
-
- nDocs--;
- masterClient.deleteByQuery("*:*");
-
- masterClient.commit();
-
- //change solrconfig having 'replicateAfter startup' option on master
- master.copyConfigFile(CONF_DIR + "solrconfig-master2.xml",
- "solrconfig.xml");
-
- masterJetty.stop();
-
- masterJetty = createJetty(master);
- masterClient = createNewSolrServer(masterJetty.getLocalPort());
-
- for (int i = 0; i < nDocs; i++)
- index(masterClient, "id", i, "name", "name = " + i);
-
- masterClient.commit();
-
- // now we restart to test what happens with no activity before the slave tries to
- // replicate
- masterJetty.stop();
- masterJetty.start(true);
-
- //masterClient = createNewSolrServer(masterJetty.getLocalPort());
-
- NamedList masterQueryRsp = rQuery(nDocs, "*:*", masterClient);
- SolrDocumentList masterQueryResult = (SolrDocumentList) masterQueryRsp.get("response");
- assertEquals(nDocs, masterQueryResult.getNumFound());
-
-
- slave.setTestPort(masterJetty.getLocalPort());
- slave.copyConfigFile(slave.getSolrConfigFile(), "solrconfig.xml");
-
- //start slave
- slaveJetty = createJetty(slave);
- slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
-
- //get docs from slave and check if number is equal to master
- NamedList slaveQueryRsp = rQuery(nDocs, "*:*", slaveClient);
- SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response");
- assertEquals(nDocs, slaveQueryResult.getNumFound());
-
- //compare results
- String cmp = BaseDistributedSearchTestCase.compare(masterQueryResult, slaveQueryResult, 0, null);
- assertEquals(null, cmp);
-
- // NOTE: the master only replicates after startup now!
- // revert that change.
- master.copyConfigFile(CONF_DIR + "solrconfig-master.xml", "solrconfig.xml");
- masterJetty.stop();
- masterJetty = createJetty(master);
- masterClient = createNewSolrServer(masterJetty.getLocalPort());
-
- slave.setTestPort(masterJetty.getLocalPort());
- slave.copyConfigFile(slave.getSolrConfigFile(), "solrconfig.xml");
-
- //start slave
- slaveJetty.stop();
- slaveJetty = createJetty(slave);
- slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
+
+ // stop slave
+ slaveJetty.stop();
+
+ nDocs--;
+ masterClient.deleteByQuery("*:*");
+
+ masterClient.commit();
+
+ // change solrconfig having 'replicateAfter startup' option on master
+ master.copyConfigFile(CONF_DIR + "solrconfig-master2.xml",
+ "solrconfig.xml");
+
+ masterJetty.stop();
+
+ masterJetty = createJetty(master);
+ masterClient = createNewSolrServer(masterJetty.getLocalPort());
+
+ for (int i = 0; i < nDocs; i++)
+ index(masterClient, "id", i, "name", "name = " + i);
+
+ masterClient.commit();
+
+ // now we restart to test what happens with no activity before the slave
+ // tries to
+ // replicate
+ masterJetty.stop();
+ masterJetty.start(true);
+
+ // masterClient = createNewSolrServer(masterJetty.getLocalPort());
+
+ NamedList masterQueryRsp = rQuery(nDocs, "*:*", masterClient);
+ SolrDocumentList masterQueryResult = (SolrDocumentList) masterQueryRsp
+ .get("response");
+ assertEquals(nDocs, masterQueryResult.getNumFound());
+
+ slave.setTestPort(masterJetty.getLocalPort());
+ slave.copyConfigFile(slave.getSolrConfigFile(), "solrconfig.xml");
+
+ // start slave
+ slaveJetty = createJetty(slave);
+ slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
+
+ // get docs from slave and check if number is equal to master
+ NamedList slaveQueryRsp = rQuery(nDocs, "*:*", slaveClient);
+ SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp
+ .get("response");
+ assertEquals(nDocs, slaveQueryResult.getNumFound());
+
+ // compare results
+ String cmp = BaseDistributedSearchTestCase.compare(masterQueryResult,
+ slaveQueryResult, 0, null);
+ assertEquals(null, cmp);
+
} finally {
resetFactory();
}
@@ -887,23 +852,10 @@ public class TestReplicationHandler exte
slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response");
assertEquals(docs + 2, slaveQueryResult.getNumFound());
- // NOTE: revert config on master.
- master.copyConfigFile(CONF_DIR + "solrconfig-master.xml", "solrconfig.xml");
- masterJetty.stop();
- masterJetty = createJetty(master);
- masterClient = createNewSolrServer(masterJetty.getLocalPort());
-
- slave.setTestPort(masterJetty.getLocalPort());
- slave.copyConfigFile(slave.getSolrConfigFile(), "solrconfig.xml");
-
- //start slave
- slaveJetty.stop();
- slaveJetty = createJetty(slave);
- slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
}
@Test
- @Ignore("ignore while i track down the intermittent problem with this test")
+ //@Ignore("ignore while i track down the intermittent problem with this test")
public void doTestIndexAndConfigAliasReplication() throws Exception {
clearIndexWithReplication();
@@ -956,6 +908,9 @@ public class TestReplicationHandler exte
slaveJetty = createJetty(slave);
slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
+ slaveClient.deleteByQuery("*:*");
+ slaveClient.commit();
+
//add a doc with new field and commit on master to trigger snappull from slave.
index(masterClient, "id", "2000", "name", "name = " + 2000, "newname", "newname = " + 2000);
masterClient.commit();
@@ -967,6 +922,9 @@ public class TestReplicationHandler exte
NamedList slaveQueryRsp2 = rQuery(1, "*:*", slaveClient);
SolrDocumentList slaveQueryResult2 = (SolrDocumentList) slaveQueryRsp2.get("response");
assertEquals(1, slaveQueryResult2.getNumFound());
+
+ // we need to wait until the core is reloaded
+ rQuery(1, "*:*", slaveClient);
index(slaveClient, "id", "2000", "name", "name = " + 2001, "newname", "newname = " + 2001);
slaveClient.commit();
@@ -975,20 +933,6 @@ public class TestReplicationHandler exte
SolrDocument d = ((SolrDocumentList) slaveQueryRsp.get("response")).get(0);
assertEquals("newname = 2001", (String) d.getFieldValue("newname"));
- // revert configs
- master.copyConfigFile(CONF_DIR + "solrconfig-master1.xml",
- "solrconfig.xml");
- master.copyConfigFile(CONF_DIR + "schema-replication1.xml",
- "schema.xml");
- masterJetty.stop();
-
- masterJetty = createJetty(master);
- masterClient = createNewSolrServer(masterJetty.getLocalPort());
-
- slave.copyConfigFile(CONF_DIR + "schema-replication1.xml", "schema.xml");
- slaveJetty.stop();
- slaveJetty = createJetty(slave);
- slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
}