[STORE] Wrap RateLimiter rather than copy RateLimitedIndexOutput
We clone RateLimitedIndexOutput from lucene just to collect pausing statistics we can do this in a more straight forward way in a delegating RateLimiter. Closes #6625
This commit is contained in:
parent
79af3228ad
commit
f0cfdc444f
|
@ -22,7 +22,7 @@ import org.apache.lucene.store.IOContext.Context;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
public final class RateLimitedFSDirectory extends FilterDirectory{
|
||||
public final class RateLimitedFSDirectory extends FilterDirectory {
|
||||
|
||||
private final StoreRateLimiting.Provider rateLimitingProvider;
|
||||
|
||||
|
@ -45,12 +45,9 @@ public final class RateLimitedFSDirectory extends FilterDirectory{
|
|||
if (type == StoreRateLimiting.Type.NONE || limiter == null) {
|
||||
return output;
|
||||
}
|
||||
if (context.context == Context.MERGE) {
|
||||
// we are mering, and type is either MERGE or ALL, rate limit...
|
||||
return new RateLimitedIndexOutput(limiter, rateListener, output);
|
||||
}
|
||||
if (type == StoreRateLimiting.Type.ALL) {
|
||||
return new RateLimitedIndexOutput(limiter, rateListener, output);
|
||||
if (context.context == Context.MERGE || type == StoreRateLimiting.Type.ALL) {
|
||||
// we are merging, and type is either MERGE or ALL, rate limit...
|
||||
return new RateLimitedIndexOutput(new RateLimiterWrapper(limiter, rateListener), output);
|
||||
}
|
||||
// we shouldn't really get here...
|
||||
return output;
|
||||
|
@ -74,65 +71,36 @@ public final class RateLimitedFSDirectory extends FilterDirectory{
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
static final class RateLimitedIndexOutput extends BufferedIndexOutput {
|
||||
|
||||
private final IndexOutput delegate;
|
||||
private final BufferedIndexOutput bufferedDelegate;
|
||||
private final RateLimiter rateLimiter;
|
||||
// we wrap the limiter to notify our store if we limited to get statistics
|
||||
static final class RateLimiterWrapper extends RateLimiter {
|
||||
private final RateLimiter delegate;
|
||||
private final StoreRateLimiting.Listener rateListener;
|
||||
private long bytesSinceLastRateLimit;
|
||||
|
||||
RateLimitedIndexOutput(final RateLimiter rateLimiter, final StoreRateLimiting.Listener rateListener, final IndexOutput delegate) {
|
||||
super(delegate instanceof BufferedIndexOutput ? ((BufferedIndexOutput) delegate).getBufferSize() : BufferedIndexOutput.DEFAULT_BUFFER_SIZE);
|
||||
if (delegate instanceof BufferedIndexOutput) {
|
||||
bufferedDelegate = (BufferedIndexOutput) delegate;
|
||||
RateLimiterWrapper(RateLimiter delegate, StoreRateLimiting.Listener rateListener) {
|
||||
this.delegate = delegate;
|
||||
} else {
|
||||
this.delegate = delegate;
|
||||
bufferedDelegate = null;
|
||||
}
|
||||
this.rateLimiter = rateLimiter;
|
||||
this.rateListener = rateListener;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void flushBuffer(byte[] b, int offset, int len) throws IOException {
|
||||
bytesSinceLastRateLimit += len;
|
||||
if (bytesSinceLastRateLimit >= rateLimiter.getMinPauseCheckBytes()) {
|
||||
long pause = rateLimiter.pause(bytesSinceLastRateLimit);
|
||||
bytesSinceLastRateLimit = 0;
|
||||
public void setMbPerSec(double mbPerSec) {
|
||||
delegate.setMbPerSec(mbPerSec);
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getMbPerSec() {
|
||||
return delegate.getMbPerSec();
|
||||
}
|
||||
|
||||
@Override
|
||||
public long pause(long bytes) {
|
||||
long pause = delegate.pause(bytes);
|
||||
rateListener.onPause(pause);
|
||||
}
|
||||
if (bufferedDelegate != null) {
|
||||
bufferedDelegate.flushBuffer(b, offset, len);
|
||||
} else {
|
||||
delegate.writeBytes(b, offset, len);
|
||||
}
|
||||
|
||||
return pause;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long length() throws IOException {
|
||||
return delegate.length();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void flush() throws IOException {
|
||||
try {
|
||||
super.flush();
|
||||
} finally {
|
||||
delegate.flush();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() throws IOException {
|
||||
try {
|
||||
super.close();
|
||||
} finally {
|
||||
delegate.close();
|
||||
}
|
||||
public long getMinPauseCheckBytes() {
|
||||
return delegate.getMinPauseCheckBytes();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue