This is an automated email from the ASF dual-hosted git repository.
klcopp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 29c0e81 HIVE-25926: Move all logging from AcidMetricService to
AcidMetricLogger (Viktor Csomor, reviewed by Karen Coppage)
29c0e81 is described below
commit 29c0e81d938dbc7d56a600476c06ed9a6cba6298
Author: Viktor Csomor
AuthorDate: Mon Feb 7 09:37:53 2022 +0100
HIVE-25926: Move all logging from AcidMetricService to AcidMetricLogger
(Viktor Csomor, reviewed by Karen Coppage)
The common logic required by the `AcidMetricLogger` and the
`AcidMetricService` had been extracted to a package-private component
`AcidMetricData`.
This change enabled to move the logging from AcidMetricService to
AcidMetricLogger.
Added methods:
- logMultipleWorkerVersions
- logFailedCompactionsPercentage
- logOldestInitiatorAge
Tests added.
Closes #2995.
---
.../ql/txn/compactor/TestCompactionMetrics.java| 1 -
.../hadoop/hive/metastore/conf/MetastoreConf.java | 3 +-
.../hive/metastore/metrics/AcidMetricLogger.java | 52 ++-
.../hive/metastore/metrics/AcidMetricService.java | 149 ++--
.../metastore/metrics/CompactionMetricData.java| 210 +++
.../metrics/TestCompactionMetricData.java | 390 +
.../TestMultipleWorkerVersionDetection.java| 123 ---
7 files changed, 678 insertions(+), 250 deletions(-)
diff --git
a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCompactionMetrics.java
b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCompactionMetrics.java
index eea0c3b..07a3212 100644
---
a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCompactionMetrics.java
+++
b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCompactionMetrics.java
@@ -55,7 +55,6 @@ import org.apache.hadoop.hive.metastore.txn.CompactionInfo;
import org.apache.hadoop.hive.metastore.txn.ThrowingTxnHandler;
import org.apache.hadoop.hive.metastore.txn.TxnStore;
import org.apache.hadoop.hive.metastore.txn.TxnUtils;
-import org.apache.hadoop.hive.metastore.utils.TestTxnDbUtil;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
index aa6b18d..ae23b2f 100644
---
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
+++
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
@@ -608,8 +608,7 @@ public class MetastoreConf {
"hive.metastore.compactor.worker.detect.multiple.versions.threshold",
24, TimeUnit.HOURS,
"Defines a time-window in hours from the current time backwards\n," +
"in which a warning is being raised if multiple worker version are
detected.\n" +
-"The setting has no effect if the metastore.metrics.enabled is
disabled \n" +
-"or the metastore.acidmetrics.thread.on is turned off."),
+"The setting has no effect if the
metastore.compactor.acid.metrics.logger.frequency is 0."),
COMPACTOR_MINOR_STATS_COMPRESSION(
"metastore.compactor.enable.stats.compression",
"metastore.compactor.enable.stats.compression", true,
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/AcidMetricLogger.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/AcidMetricLogger.java
index e8ad33b..35450a4 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/AcidMetricLogger.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/AcidMetricLogger.java
@@ -20,6 +20,8 @@ package org.apache.hadoop.hive.metastore.metrics;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.metastore.MetastoreTaskThread;
import org.apache.hadoop.hive.metastore.api.MetaException;
+import org.apache.hadoop.hive.metastore.api.ShowCompactRequest;
+import org.apache.hadoop.hive.metastore.api.ShowCompactResponse;
import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
import org.apache.hadoop.hive.metastore.txn.CompactionMetricsData;
import org.apache.hadoop.hive.metastore.txn.MetricsInfo;
@@ -56,7 +58,7 @@ public class AcidMetricLogger implements MetastoreTaskThread {
public void run() {
try {
logDbMetrics();
- logDeltaMetrics();
+ logMetrics();
} catch (MetaException e) {
LOG.warn("Caught exception while trying to log acid metrics data.", e);
}
@@ -74,6 +76,17 @@ public
