You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/05/02 09:19:57 UTC
svn commit: r1098504 - in /lucene/dev/trunk/lucene/src:
java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java
java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java
test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java
Author: simonw
Date: Mon May 2 07:19:57 2011
New Revision: 1098504
URL: http://svn.apache.org/viewvc?rev=1098504&view=rev
Log:
LUCENE-3023: fixed TestFlushByRamOrCountsPolicy test-case and removed uncommented leftovers from RT branch
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java?rev=1098504&r1=1098503&r2=1098504&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java Mon May 2 07:19:57 2011
@@ -207,10 +207,6 @@ public abstract class DocumentsWriterPer
public abstract ThreadState getAndLock(Thread requestingThread, DocumentsWriter documentsWriter, Document doc);
- //public abstract void clearThreadBindings(ThreadState perThread);
-
- //public abstract void clearAllThreadBindings();
-
/**
* Returns an iterator providing access to all {@link ThreadState}
* instances.
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java?rev=1098504&r1=1098503&r2=1098504&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java Mon May 2 07:19:57 2011
@@ -82,16 +82,4 @@ public class ThreadAffinityDocumentsWrit
minThreadState.lock();
return minThreadState;
}
-
- /*
- @Override
- public void clearThreadBindings(ThreadState perThread) {
- threadBindings.clear();
- }
-
- @Override
- public void clearAllThreadBindings() {
- threadBindings.clear();
- }
- */
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java?rev=1098504&r1=1098503&r2=1098504&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java Mon May 2 07:19:57 2011
@@ -53,12 +53,12 @@ public class TestFlushByRamOrCountsPolic
}
for (int i = 0; i < numThreads.length; i++) {
- // with a 512 mb ram buffer we should never stall
- runFlushByRam(numThreads[i], 512.d, true);
+ // with a 256 mb ram buffer we should never stall
+ runFlushByRam(numThreads[i], 256.d, true);
}
}
- protected void runFlushByRam(int numThreads, double maxRam,
+ protected void runFlushByRam(int numThreads, double maxRamMB,
boolean ensureNotStalled) throws IOException, CorruptIndexException,
LockObtainFailedException, InterruptedException {
final int numDocumentsToIndex = 50 + random.nextInt(150);
@@ -67,12 +67,11 @@ public class TestFlushByRamOrCountsPolic
MockDefaultFlushPolicy flushPolicy = new MockDefaultFlushPolicy();
IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(random)).setFlushPolicy(flushPolicy);
-
final int numDWPT = 1 + random.nextInt(8);
DocumentsWriterPerThreadPool threadPool = new ThreadAffinityDocumentsWriterThreadPool(
numDWPT);
iwc.setIndexerThreadPool(threadPool);
- iwc.setRAMBufferSizeMB(1 + random.nextInt(10) + random.nextDouble());
+ iwc.setRAMBufferSizeMB(maxRamMB);
iwc.setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH);
iwc.setMaxBufferedDeleteTerms(IndexWriterConfig.DISABLE_AUTO_FLUSH);
IndexWriter writer = new IndexWriter(dir, iwc);
@@ -272,13 +271,6 @@ public class TestFlushByRamOrCountsPolic
assertFalse(
"single thread must not block numThreads: " + numThreads[i],
docsWriter.healthiness.hasBlocked());
- // this assumption is too strict in this test
-// } else {
-// if (docsWriter.healthiness.wasStalled) {
-// // TODO maybe this assumtion is too strickt
-// assertTrue(" we should have blocked here numThreads: "
-// + numThreads[i], docsWriter.healthiness.hasBlocked());
-// }
}
assertActiveBytesAfter(flushControl);
writer.close(true);