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 35ec287 make resizeTimeMs metric as a Gauge instead of a Meter (#6693) 35ec287 is described below commit 35ec28746624a40dc29fc9b059307fa65187123c Author: Liang Mingqiang <mili...@linkedin.com> AuthorDate: Wed Mar 17 22:43:50 2021 -0700 make resizeTimeMs metric as a Gauge instead of a Meter (#6693) * make resizeTimeMs metric as a Gauge instead of a Meter * change the unit of RESIZE_TIME_MS as milliseconds --- .../src/main/java/org/apache/pinot/common/metrics/BrokerGauge.java | 3 ++- .../src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java | 3 +-- .../src/main/java/org/apache/pinot/common/metrics/ServerGauge.java | 1 + .../src/main/java/org/apache/pinot/common/metrics/ServerMeter.java | 1 - .../org/apache/pinot/core/query/reduce/GroupByDataTableReducer.java | 3 ++- .../java/org/apache/pinot/core/query/scheduler/QueryScheduler.java | 3 ++- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerGauge.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerGauge.java index 5a5a72a..86f8a3e 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerGauge.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerGauge.java @@ -30,7 +30,8 @@ public enum BrokerGauge implements AbstractMetrics.Gauge { MAX_BURST_QPS("tables", false), QUERY_RATE_LIMIT_DISABLED("queryQuota", true), NETTY_CONNECTION_CONNECT_TIME_MS("nettyConnection", true), - REQUEST_SIZE("requestSize", false); + REQUEST_SIZE("requestSize", false), + RESIZE_TIME_MS("milliseconds", false); private final String brokerGaugeName; private final String unit; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java index ac4129f..a6411a7 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java @@ -64,8 +64,7 @@ public enum BrokerMeter implements AbstractMetrics.Meter { ENTRIES_SCANNED_IN_FILTER("documents", false), ENTRIES_SCANNED_POST_FILTER("documents", false), - NUM_RESIZES("resizes", false), - RESIZE_TIME_MS("resizeTimeMs", false), + NUM_RESIZES("numResizes", false), REQUEST_CONNECTION_TIMEOUTS("timeouts", false), HELIX_ZOOKEEPER_RECONNECTS("reconnects", true), diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerGauge.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerGauge.java index 55e6bbc..8d566a3 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerGauge.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerGauge.java @@ -41,6 +41,7 @@ public enum ServerGauge implements AbstractMetrics.Gauge { REALTIME_OFFHEAP_MEMORY_USED("bytes", false), REALTIME_SEGMENT_NUM_PARTITIONS("realtimeSegmentNumPartitions", false), LLC_SIMULTANEOUS_SEGMENT_BUILDS("llcSimultaneousSegmentBuilds", true), + RESIZE_TIME_MS("milliseconds", false), // Upsert metrics UPSERT_PRIMARY_KEYS_COUNT("upsertPrimaryKeysCount", false); diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMeter.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMeter.java index 37e166d..0399b9d 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMeter.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMeter.java @@ -64,7 +64,6 @@ public enum ServerMeter implements AbstractMetrics.Meter { UNTAR_FAILURES("segments", false), SEGMENT_DOWNLOAD_FAILURES("segments", false), NUM_RESIZES("numResizes", false), - RESIZE_TIME_MS("resizeTimeMs", false), // Netty connection metrics NETTY_CONNECTION_BYTES_RECEIVED("nettyConnection", true), diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GroupByDataTableReducer.java b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GroupByDataTableReducer.java index 8ce0825..f0b7c29 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GroupByDataTableReducer.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GroupByDataTableReducer.java @@ -30,6 +30,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.apache.pinot.common.exception.QueryException; +import org.apache.pinot.common.metrics.BrokerGauge; import org.apache.pinot.common.metrics.BrokerMeter; import org.apache.pinot.common.metrics.BrokerMetrics; import org.apache.pinot.common.response.broker.AggregationResult; @@ -193,7 +194,7 @@ public class GroupByDataTableReducer implements DataTableReducer { IndexedTable indexedTable = getIndexedTable(dataSchema, dataTables, reducerContext); if (brokerMetrics != null) { brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.NUM_RESIZES, indexedTable.getNumResizes()); - brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.RESIZE_TIME_MS, indexedTable.getResizeTimeMs()); + brokerMetrics.addValueToTableGauge(rawTableName, BrokerGauge.RESIZE_TIME_MS, indexedTable.getResizeTimeMs()); } Iterator<Record> sortedIterator = indexedTable.iterator(); DataSchema prePostAggregationDataSchema = getPrePostAggregationDataSchema(dataSchema); 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 6a19fbf..50c2434 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 @@ -28,6 +28,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.apache.pinot.common.exception.QueryException; +import org.apache.pinot.common.metrics.ServerGauge; import org.apache.pinot.common.metrics.ServerMeter; import org.apache.pinot.common.metrics.ServerMetrics; import org.apache.pinot.common.metrics.ServerQueryPhase; @@ -203,7 +204,7 @@ public abstract class QueryScheduler { serverMetrics.addMeteredTableValue(tableNameWithType, ServerMeter.NUM_RESIZES, numResizes); } if (resizeTimeMs > 0) { - serverMetrics.addMeteredTableValue(tableNameWithType, ServerMeter.RESIZE_TIME_MS, resizeTimeMs); + serverMetrics.addValueToTableGauge(tableNameWithType, ServerGauge.RESIZE_TIME_MS, resizeTimeMs); } TimerContext timerContext = queryRequest.getTimerContext(); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org