This is an automated email from the ASF dual-hosted git repository.

siddteotia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git


The following commit(s) were added to refs/heads/master by this push:
     new 4df2d5f  Fix server and broker log for execution stats (#5589)
4df2d5f is described below

commit 4df2d5f0550631acc7411108e9469fcf83b9c396
Author: Sidd <[email protected]>
AuthorDate: Thu Jun 18 15:07:07 2020 -0700

    Fix server and broker log for execution stats (#5589)
    
    Co-authored-by: Siddharth Teotia <[email protected]>
---
 .../broker/requesthandler/BaseBrokerRequestHandler.java   |  8 +++++---
 .../apache/pinot/core/query/scheduler/QueryScheduler.java | 15 +++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git 
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
 
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
index efe303e..081abfa 100644
--- 
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
+++ 
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
@@ -400,11 +400,13 @@ public abstract class BaseBrokerRequestHandler implements 
BrokerRequestHandler {
 
     LOGGER.debug("Broker Response: {}", brokerResponse);
 
+    // Please keep the format as name=value comma-separated with no spaces
+    // Please add new entries at the end
     if (_queryLogRateLimiter.tryAcquire() || forceLog(brokerResponse, 
totalTimeMs)) {
       // Table name might have been changed (with suffix _OFFLINE/_REALTIME 
appended)
-      LOGGER.info("RequestId:{}, table:{}, timeMs:{}, docs:{}/{}, 
entries:{}/{},"
-              + " 
segments(queried/processed/matched/consuming/unavailable):{}/{}/{}/{}/{}, 
consumingFreshnessTimeMs:{},"
-              + " servers:{}/{}, groupLimitReached:{}, exceptions:{}, 
serverStats:{}, query:{}", requestId,
+      LOGGER.info("requestId={},table={},timeMs={},docs={}/{},entries={}/{},"
+              + 
"segments(queried/processed/matched/consuming/unavailable):{}/{}/{}/{}/{},consumingFreshnessTimeMs={},"
+              + 
"servers={}/{},groupLimitReached={},exceptions={},serverStats={},query={}", 
requestId,
           brokerRequest.getQuerySource().getTableName(), totalTimeMs, 
brokerResponse.getNumDocsScanned(),
           brokerResponse.getTotalDocs(), 
brokerResponse.getNumEntriesScannedInFilter(),
           brokerResponse.getNumEntriesScannedPostFilter(), 
brokerResponse.getNumSegmentsQueried(),
diff --git 
a/pinot-core/src/main/java/org/apache/pinot/core/query/scheduler/QueryScheduler.java
 
b/pinot-core/src/main/java/org/apache/pinot/core/query/scheduler/QueryScheduler.java
index ecffddc..dc2e8b9 100644
--- 
a/pinot-core/src/main/java/org/apache/pinot/core/query/scheduler/QueryScheduler.java
+++ 
b/pinot-core/src/main/java/org/apache/pinot/core/query/scheduler/QueryScheduler.java
@@ -197,13 +197,16 @@ public abstract class QueryScheduler {
     int numSegmentsQueried = queryRequest.getSegmentsToQuery().size();
     long schedulerWaitMs = 
timerContext.getPhaseDurationMs(ServerQueryPhase.SCHEDULER_WAIT);
 
+    // Please keep the format as name=value comma-separated with no spaces
+    // Please add new entries at the end
     if (queryLogRateLimiter.tryAcquire() || forceLog(schedulerWaitMs, 
numDocsScanned)) {
-      LOGGER.info(
-          "Processed 
requestId={},table={},segments(queried/processed/matched/consuming)={}/{}/{}/{},"
-              + 
"schedulerWaitMs={},totalExecMs={},totalTimeMs={},minConsumingFreshnessMs={},broker={},"
-              + "numDocsScanned={},scanInFilter={},scanPostFilter={},sched={}",
-          requestId, tableNameWithType, numSegmentsQueried, 
numSegmentsProcessed, numSegmentsMatched,
-          numSegmentsConsuming, schedulerWaitMs, 
timerContext.getPhaseDurationMs(ServerQueryPhase.QUERY_PROCESSING),
+      LOGGER.info("Processed 
requestId={},table={},segments(queried/processed/matched/consuming)={}/{}/{}/{},"
+              + 
"schedulerWaitMs={},reqDeserMs={},totalExecMs={},resSerMs={},totalTimeMs={},minConsumingFreshnessMs={},broker={},"
+              + 
"numDocsScanned={},scanInFilter={},scanPostFilter={},sched={}", requestId, 
tableNameWithType,
+          numSegmentsQueried, numSegmentsProcessed, numSegmentsMatched, 
numSegmentsConsuming, schedulerWaitMs,
+          
timerContext.getPhaseDurationMs(ServerQueryPhase.REQUEST_DESERIALIZATION),
+          timerContext.getPhaseDurationMs(ServerQueryPhase.QUERY_PROCESSING),
+          
timerContext.getPhaseDurationMs(ServerQueryPhase.RESPONSE_SERIALIZATION),
           timerContext.getPhaseDurationMs(ServerQueryPhase.TOTAL_QUERY_TIME), 
minConsumingFreshnessMs,
           queryRequest.getBrokerId(), numDocsScanned, 
numEntriesScannedInFilter, numEntriesScannedPostFilter, name());
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to