Skip to content

lastFillTimeMillis fix #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xanec merged 1 commit into from
Oct 31, 2017
Merged

lastFillTimeMillis fix #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/main/java/com/metamx/emitter/core/HttpPostEmitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public class HttpPostEmitter implements Flushable, Closeable, Emitter
private final AtomicInteger allocatedBuffers = new AtomicInteger();
private final AtomicInteger droppedBuffers = new AtomicInteger();

private volatile long lastFillTimeMillis = 0;
private volatile long lastFillTimeMillis;
private final ConcurrentTimeCounter batchFillingTimeCounter = new ConcurrentTimeCounter();

private final Object startLock = new Object();
Expand Down Expand Up @@ -166,6 +166,7 @@ public HttpPostEmitter(HttpEmitterConfig config, AsyncHttpClient client, ObjectM
}
emittingThread = new EmittingThread(config);
concurrentBatch.set(new Batch(this, acquireBuffer(), 0));
lastFillTimeMillis = config.minHttpTimeoutMillis;
}

@Override
Expand Down Expand Up @@ -280,9 +281,11 @@ private void writeLargeEvent(byte[] eventBytes)
*/
void onSealExclusive(Batch batch, long elapsedTimeMillis)
{
batchFillingTimeCounter.add((int) Math.max(elapsedTimeMillis, 0));
if (elapsedTimeMillis > 0) {
// If elapsedTimeMillis is 0 or negative, it's likely because System.currentTimeMillis() is not monotonic, so not
// accounting this time for determining batch sending timeout.
lastFillTimeMillis = elapsedTimeMillis;
batchFillingTimeCounter.add((int) Math.max(elapsedTimeMillis, 0));
}
addBatchToEmitQueue(batch);
wakeUpEmittingThread();
Expand Down