Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-2565: fix update handler reopen race 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1155964 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2011-08-09 22:59:30 +00:00
parent 78d186e081
commit 25e1cf93dc
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
View File

@ -290,7 +290,7 @@ public class DirectUpdateHandler2 extends UpdateHandler {
} else if (cmd.expungeDeletes) {
writer.expungeDeletes();
}
if (!cmd.softCommit) {
writer.commit();
numDocsPending.set(0);
@ -304,10 +304,13 @@ public class DirectUpdateHandler2 extends UpdateHandler {
callPostOptimizeCallbacks();
}
if (cmd.softCommit) {
core.getSearcher(true,false,waitSearcher, true);
} else {
core.getSearcher(true,false,waitSearcher);
synchronized (this) {
if (cmd.softCommit) {
core.getSearcher(true,false,waitSearcher, true);
} else {
core.getSearcher(true,false,waitSearcher);
}
}
// reset commit tracking

9
solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
View File

@ -77,10 +77,6 @@ public class TestRealTimeGet extends SolrTestCaseJ4 {
final String field = "val_l";
Object[] syncArr;
final ConcurrentHashMap<Integer,Long> sanityModel = new ConcurrentHashMap<Integer,Long>();
private void initModel(int ndocs) {
snapshotCount = 0;
committedModelClock = 0;
@ -105,11 +101,12 @@ public class TestRealTimeGet extends SolrTestCaseJ4 {
final int deleteByQueryPercent = 4;
final int ndocs = 100;
int nWriteThreads = 10;
final int maxConcurrentCommits = 2; // number of committers at a time... needed if we want to avoid commit errors due to exceeding the max
final int maxConcurrentCommits = nWriteThreads; // number of committers at a time... it should be <= maxWarmingSearchers
// query variables
final int percentRealtimeQuery = 0; // realtime get is not implemented yet
final AtomicLong operations = new AtomicLong(1000); // number of query operations to perform in total // TODO: once lucene level passes, we can move on to the solr level
final AtomicLong operations = new AtomicLong(atLeast(10000)); // number of query operations to perform in total
int nReadThreads = 10;
initModel(ndocs);