You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by vj...@apache.org on 2023/02/06 19:07:07 UTC
[phoenix] branch master updated: PHOENIX-6052 Include syscat time in mutation time (#1546)
This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new 0e1996d9d5 PHOENIX-6052 Include syscat time in mutation time (#1546)
0e1996d9d5 is described below
commit 0e1996d9d5fe4503d6a78161d4120ef72ca04f32
Author: Aman Poonia <am...@gmail.com>
AuthorDate: Tue Feb 7 00:36:59 2023 +0530
PHOENIX-6052 Include syscat time in mutation time (#1546)
---
.../src/main/java/org/apache/phoenix/execute/MutationState.java | 7 +++++--
.../java/org/apache/phoenix/monitoring/GlobalClientMetrics.java | 2 ++
.../src/main/java/org/apache/phoenix/monitoring/MetricType.java | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
index 79dd9742c1..fb77d0c0c4 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
@@ -29,6 +29,7 @@ import static org.apache.phoenix.monitoring.GlobalClientMetrics.GLOBAL_MUTATION_
import static org.apache.phoenix.monitoring.GlobalClientMetrics.GLOBAL_MUTATION_BYTES;
import static org.apache.phoenix.monitoring.GlobalClientMetrics.GLOBAL_MUTATION_COMMIT_TIME;
import static org.apache.phoenix.monitoring.GlobalClientMetrics.GLOBAL_MUTATION_INDEX_COMMIT_FAILURE_COUNT;
+import static org.apache.phoenix.monitoring.GlobalClientMetrics.GLOBAL_MUTATION_SYSCAT_TIME;
import static org.apache.phoenix.query.QueryServices.WILDCARD_QUERY_DYNAMIC_COLS_ATTRIB;
import static org.apache.phoenix.query.QueryServicesOptions.DEFAULT_WILDCARD_QUERY_DYNAMIC_COLS_ATTRIB;
@@ -902,6 +903,7 @@ public class MutationState implements SQLCloseable {
MetaDataClient client = new MetaDataClient(connection);
long serverTimeStamp = tableRef.getTimeStamp();
PTable table = null;
+ long startTime = EnvironmentEdgeManager.currentTimeMillis();
try {
// If we're auto committing, we've already validated the schema when we got the ColumnResolver,
// so no need to do it again here.
@@ -959,6 +961,9 @@ public class MutationState implements SQLCloseable {
NUM_METADATA_LOOKUP_FAILURES, 1);
}
throw e;
+ } finally {
+ long endTime = EnvironmentEdgeManager.currentTimeMillis();
+ GLOBAL_MUTATION_SYSCAT_TIME.update(endTime - startTime);
}
return serverTimeStamp == QueryConstants.UNSET_TIMESTAMP ? HConstants.LATEST_TIMESTAMP : serverTimeStamp;
}
@@ -1411,8 +1416,6 @@ public class MutationState implements SQLCloseable {
child.stop();
child.stop();
shouldRetry = false;
- mutationCommitTime = EnvironmentEdgeManager.currentTimeMillis() - startTime;
- GLOBAL_MUTATION_COMMIT_TIME.update(mutationCommitTime);
numFailedMutations = 0;
// Remove batches as we process them
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalClientMetrics.java b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalClientMetrics.java
index 222ccc5042..3bec9aa5db 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalClientMetrics.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalClientMetrics.java
@@ -25,6 +25,7 @@ import static org.apache.phoenix.monitoring.MetricType.MUTATION_BATCH_SIZE;
import static org.apache.phoenix.monitoring.MetricType.MUTATION_BYTES;
import static org.apache.phoenix.monitoring.MetricType.MUTATION_COMMIT_TIME;
import static org.apache.phoenix.monitoring.MetricType.MUTATION_SQL_COUNTER;
+import static org.apache.phoenix.monitoring.MetricType.MUTATION_SYSCAT_TIME;
import static org.apache.phoenix.monitoring.MetricType.NUM_PARALLEL_SCANS;
import static org.apache.phoenix.monitoring.MetricType.OPEN_INTERNAL_PHOENIX_CONNECTIONS_COUNTER;
import static org.apache.phoenix.monitoring.MetricType.OPEN_PHOENIX_CONNECTIONS_COUNTER;
@@ -101,6 +102,7 @@ public enum GlobalClientMetrics {
GLOBAL_MUTATION_COMMIT_TIME(MUTATION_COMMIT_TIME),
GLOBAL_MUTATION_BATCH_FAILED_COUNT(MUTATION_BATCH_FAILED_SIZE),
GLOBAL_MUTATION_INDEX_COMMIT_FAILURE_COUNT(INDEX_COMMIT_FAILURE_SIZE),
+ GLOBAL_MUTATION_SYSCAT_TIME(MUTATION_SYSCAT_TIME),
GLOBAL_QUERY_TIME(QUERY_TIME),
GLOBAL_NUM_PARALLEL_SCANS(NUM_PARALLEL_SCANS),
GLOBAL_SCAN_BYTES(SCAN_BYTES),
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/MetricType.java b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/MetricType.java
index ff38e48bb7..38a7e7f132 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/MetricType.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/MetricType.java
@@ -32,6 +32,7 @@ public enum MetricType {
MUTATION_BATCH_SIZE("ms", "Number of mutations in the batch",LogLevel.OFF, PLong.INSTANCE),
MUTATION_BYTES("mb", "Size of mutations in bytes",LogLevel.OFF, PLong.INSTANCE),
MUTATION_COMMIT_TIME("mt", "Time it took to commit a batch of mutations",LogLevel.OFF, PLong.INSTANCE),
+ MUTATION_SYSCAT_TIME("msyst", "Time it spent in syscat before mutation", LogLevel.OFF, PLong.INSTANCE),
MUTATION_BATCH_FAILED_SIZE("mfs", "Number of mutations that failed to be committed",LogLevel.OFF, PLong.INSTANCE),
MUTATION_SQL_COUNTER("msc", "Counter for number of mutation sql statements",LogLevel.OFF, PLong.INSTANCE),
UPSERT_SQL_COUNTER("uc", "Counter for number of upsert sql queries", LogLevel.OFF, PLong.INSTANCE),