This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push: new 95d0ec864e PHOENIX-6699 Phoenix metrics overwriting DefaultMetricsSystem in RegionServers (addendum: set up hbase prefix for ITs) 95d0ec864e is described below commit 95d0ec864e3102ea11b32a8bd8a90d2db3373a22 Author: Istvan Toth <st...@apache.org> AuthorDate: Tue May 10 08:02:38 2022 +0200 PHOENIX-6699 Phoenix metrics overwriting DefaultMetricsSystem in RegionServers (addendum: set up hbase prefix for ITs) --- phoenix-core/src/test/resources/hadoop-metrics2.properties | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/test/resources/hadoop-metrics2.properties b/phoenix-core/src/test/resources/hadoop-metrics2.properties index 27cadc9ef1..4eaf15791b 100644 --- a/phoenix-core/src/test/resources/hadoop-metrics2.properties +++ b/phoenix-core/src/test/resources/hadoop-metrics2.properties @@ -20,8 +20,11 @@ # Either will be loaded by the metrics system (but not both). # # NOTE: The metrics system is only initialized once per JVM (but does ref-counting, so we can't -#shutdown and restart), so we only load the first prefix that we find. Generally, this will be -#phoenix (unless someone else registers first, but for many clients, there should only be one). +# shutdown and restart), so we only load the first prefix that we find. Generally, this will be +# phoenix (unless someone else registers first, but for many clients, there should only be one). +# +# Since PHOENIX-6699 we do not overwrite the hbase prefix created by HBase in the minicluster, +# so we set up both the hbase or phoenix prefixes for the tests # # Usually, you would use hadoop-metrics2-phoenix.properties, but we use the generic # hadoop-metrics2.properties to ensure it these are loaded regardless of where we are running, @@ -35,6 +38,9 @@ phoenix.source.start_mbeans=true phoenix.sink.sink0.class=org.apache.phoenix.monitoring.GlobalPhoenixMetricsTestSink +hbase.source.start_mbeans=true +hbase.sink.sink0.class=org.apache.phoenix.monitoring.GlobalPhoenixMetricsTestSink + # Frequency, in seconds, of sampling from the sources # High Frequency for test purposes *.period=1