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 2012/11/27 23:05:19 UTC
svn commit: r1414428 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/handler/ReplicationHandler.java
core/src/test/org/apache/solr/handler/TestReplicationHandler.java
Author: markrmiller
Date: Tue Nov 27 22:05:18 2012
New Revision: 1414428
URL: http://svn.apache.org/viewvc?rev=1414428&view=rev
Log:
SOLR-4032: Files larger than an internal buffer size fail to replicate.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1414428&r1=1414427&r2=1414428&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Nov 27 22:05:18 2012
@@ -69,6 +69,9 @@ New Features
* SOLR-3911: Make Directory and DirectoryFactory first class so that the majority
of Solr's features work with any custom implementations. (Mark Miller)
+ Additional Work:
+ - SOLR-4032: Files larger than an internal buffer size fail to replicate.
+ (Mark Miller, Markus Jelsma)
* SOLR-1972: Add extra statistics to RequestHandlers - 5 & 15-minute reqs/sec
rolling averages; median, 75th, 95th, 99th, 99.9th percentile request times
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=1414428&r1=1414427&r2=1414428&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java Tue Nov 27 22:05:18 2012
@@ -1062,7 +1062,7 @@ public class ReplicationHandler extends
while (true) {
offset = offset == -1 ? 0 : offset;
int read = (int) Math.min(buf.length, filelen - offset);
- in.readBytes(buf, offset == -1 ? 0 : (int) offset, read);
+ in.readBytes(buf, 0, read);
fos.writeInt((int) read);
if (useChecksum) {
@@ -1082,6 +1082,8 @@ public class ReplicationHandler extends
fos.close();
break;
}
+ offset += read;
+ in.seek(offset);
}
} catch (IOException e) {
LOG.warn("Exception while writing response for params: " + params, e);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1414428&r1=1414427&r2=1414428&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java Tue Nov 27 22:05:18 2012
@@ -656,6 +656,8 @@ public class TestReplicationHandler exte
}
private void doTestReplicateAfterCoreReload() throws Exception {
+ int docs = TEST_NIGHTLY ? 200000 : 0;
+
//stop slave
slaveJetty.stop();
@@ -670,14 +672,14 @@ public class TestReplicationHandler exte
masterClient = createNewSolrServer(masterJetty.getLocalPort());
masterClient.deleteByQuery("*:*");
- for (int i = 0; i < 10; i++)
+ for (int i = 0; i < docs; i++)
index(masterClient, "id", i, "name", "name = " + i);
masterClient.commit();
- NamedList masterQueryRsp = rQuery(10, "*:*", masterClient);
+ NamedList masterQueryRsp = rQuery(docs, "*:*", masterClient);
SolrDocumentList masterQueryResult = (SolrDocumentList) masterQueryRsp.get("response");
- assertEquals(10, masterQueryResult.getNumFound());
+ assertEquals(docs, masterQueryResult.getNumFound());
slave.setTestPort(masterJetty.getLocalPort());
slave.copyConfigFile(slave.getSolrConfigFile(), "solrconfig.xml");
@@ -687,9 +689,9 @@ public class TestReplicationHandler exte
slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
//get docs from slave and check if number is equal to master
- NamedList slaveQueryRsp = rQuery(10, "*:*", slaveClient);
+ NamedList slaveQueryRsp = rQuery(docs, "*:*", slaveClient);
SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response");
- assertEquals(10, slaveQueryResult.getNumFound());
+ assertEquals(docs, slaveQueryResult.getNumFound());
//compare results
String cmp = BaseDistributedSearchTestCase.compare(masterQueryResult, slaveQueryResult, 0, null);
@@ -703,19 +705,19 @@ public class TestReplicationHandler exte
assertEquals(version, getIndexVersion(masterClient).get("indexversion"));
assertEquals(commits.get("commits"), getCommits(masterClient).get("commits"));
- index(masterClient, "id", 110, "name", "name = 1");
- index(masterClient, "id", 120, "name", "name = 2");
+ index(masterClient, "id", docs + 10, "name", "name = 1");
+ index(masterClient, "id", docs + 20, "name", "name = 2");
masterClient.commit();
- NamedList resp = rQuery(12, "*:*", masterClient);
+ NamedList resp = rQuery(docs + 2, "*:*", masterClient);
masterQueryResult = (SolrDocumentList) resp.get("response");
- assertEquals(12, masterQueryResult.getNumFound());
+ assertEquals(docs + 2, masterQueryResult.getNumFound());
//get docs from slave and check if number is equal to master
- slaveQueryRsp = rQuery(12, "*:*", slaveClient);
+ slaveQueryRsp = rQuery(docs + 2, "*:*", slaveClient);
slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response");
- assertEquals(12, slaveQueryResult.getNumFound());
+ assertEquals(docs + 2, slaveQueryResult.getNumFound());
// NOTE: revert config on master.
master.copyConfigFile(CONF_DIR + "solrconfig-master.xml", "solrconfig.xml");