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

Make query/cpu/time still report on error (#3535)

This commit is contained in:
Charles Allen 2016-10-18 06:26:21 -07:00 committed by Gian Merlino
parent 8ea5f9324d
commit 2c5c8198db
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
processing/src/main/java/io/druid/query/CPUTimeMetricQueryRunner.java
View File

@ -21,8 +21,6 @@ package io.druid.query;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.util.concurrent.MoreExecutors;
import com.metamx.common.ISE; import com.metamx.common.ISE;
import com.metamx.common.guava.Accumulator; import com.metamx.common.guava.Accumulator;
import com.metamx.common.guava.Sequence; import com.metamx.common.guava.Sequence;
@ -33,6 +31,7 @@ import com.metamx.emitter.service.ServiceEmitter;
import com.metamx.emitter.service.ServiceMetricEvent; import com.metamx.emitter.service.ServiceMetricEvent;
import io.druid.common.utils.VMUtils; import io.druid.common.utils.VMUtils;
import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
@ -70,7 +69,7 @@ public class CPUTimeMetricQueryRunner<T> implements QueryRunner<T>
) )
{ {
final Sequence<T> baseSequence = delegate.run(query, responseContext); final Sequence<T> baseSequence = delegate.run(query, responseContext);
return Sequences.withEffect( return Sequences.withBaggage(
new Sequence<T>() new Sequence<T>()
{ {
@Override @Override
@ -135,10 +134,10 @@ public class CPUTimeMetricQueryRunner<T> implements QueryRunner<T>
}; };
} }
}, },
new Runnable() new Closeable()
{ {
@Override @Override
public void run() public void close()
{ {
if (report) { if (report) {
final long cpuTime = cpuTimeAccumulator.get(); final long cpuTime = cpuTimeAccumulator.get();
@ -148,8 +147,7 @@ public class CPUTimeMetricQueryRunner<T> implements QueryRunner<T>
} }
} }
} }
}, }
MoreExecutors.sameThreadExecutor()
); );
} }