Author: jdcryans
Date: Thu Dec 10 00:05:11 2009
New Revision: 889026
URL: http://svn.apache.org/viewvc?rev=889026&view=rev
Log:
HBASE-1816 Some compaction limiting stuff was remaining
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java?rev=889026&r1=889025&r2=889026&view=diff
==============================================================================
---
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
(original)
+++
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
Thu Dec 10 00:05:11 2009
@@ -56,8 +56,6 @@
private final HashSet<HRegion> regionsInQueue = new HashSet<HRegion>();
- private volatile int limit = 1;
-
/** @param server */
public CompactSplitThread(HRegionServer server) {
super();
@@ -74,14 +72,6 @@
while (!this.server.isStopRequested()) {
HRegion r = null;
try {
- if ((limit > 0) && (++count > limit)) {
- try {
- Thread.sleep(this.frequency);
- } catch (InterruptedException ex) {
- continue;
- }
- count = 0;
- }
r = compactionQueue.poll(this.frequency, TimeUnit.MILLISECONDS);
if (r != null && !this.server.isStopRequested()) {
synchronized (regionsInQueue) {
@@ -220,18 +210,6 @@
}
/**
- * Sets the number of compactions allowed per cycle.
- * @param limit the number of compactions allowed, or -1 to unlimit
- */
- void setLimit(int limit) {
- this.limit = limit;
- }
-
- int getLimit() {
- return this.limit;
- }
-
- /**
* Only interrupt once it's done with a run through the work loop.
*/
void interruptIfNecessary() {
