You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ed...@apache.org on 2024/04/27 20:53:11 UTC
(accumulo) 01/01: Merge remote-tracking branch 'upstream/main' into elasticity
This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 03d3a6d911f5711e95d5ebc990821bd2a69a85e9
Merge: 07bf1bc6fd e682a2f229
Author: Ed <de...@etcoleman.com>
AuthorDate: Sat Apr 27 16:40:04 2024 -0400
Merge remote-tracking branch 'upstream/main' into elasticity
.../java/org/apache/accumulo/core/metrics/MetricsProducer.java | 4 ++--
.../monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java | 1 +
.../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 2 +-
.../org/apache/accumulo/test/functional/MemoryStarvedScanIT.java | 7 +++++--
.../java/org/apache/accumulo/test/functional/ZombieTServer.java | 7 +++++++
5 files changed, 16 insertions(+), 5 deletions(-)
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 0d99ea3f0f,6c07e9bb32..74ec7b89a5
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@@ -488,8 -492,9 +488,9 @@@ public class Monitor extends AbstractSe
log.debug("Using {} to advertise monitor location in ZooKeeper", advertiseHost);
MetricsInfo metricsInfo = getContext().getMetricsInfo();
- metricsInfo.addServiceTags(getApplicationName(),
- HostAndPort.fromParts(advertiseHost, livePort));
+ metricsInfo.addServiceTags(getApplicationName(), HostAndPort.fromParts(advertiseHost, livePort),
+ getResourceGroup());
+ metricsInfo.addMetricsProducers(this);
metricsInfo.init();
try {
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 9947b5e48b,409d1ecada..93f3e58def
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -582,12 -711,18 +582,12 @@@ public class TabletServer extends Abstr
updateMetrics = new TabletServerUpdateMetrics();
scanMetrics = new TabletServerScanMetrics();
mincMetrics = new TabletServerMinCMetrics();
- ceMetrics = new CompactionExecutorsMetrics();
pausedMetrics = new PausedCompactionMetrics();
- metricsInfo.addMetricsProducers(metrics, updateMetrics, scanMetrics, mincMetrics,
+ metricsInfo.addMetricsProducers(this, metrics, updateMetrics, scanMetrics, mincMetrics,
- ceMetrics, pausedMetrics);
+ pausedMetrics);
metricsInfo.init();
- this.compactionManager = new CompactionManager(() -> Iterators
- .transform(onlineTablets.snapshot().values().iterator(), Tablet::asCompactable),
- getContext(), ceMetrics);
- compactionManager.start();
-
announceExistence();
try {
diff --cc test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java
index 0becd57120,d2cb595b3d..0c9b08e0ab
--- a/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java
@@@ -48,14 -43,9 +48,15 @@@ import org.apache.accumulo.core.conf.Pr
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.fate.zookeeper.ZooCache;
import org.apache.accumulo.core.iterators.WrappingIterator;
+import org.apache.accumulo.core.lock.ServiceLock;
+import org.apache.accumulo.core.lock.ServiceLockData;
+import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
import org.apache.accumulo.core.metrics.MetricsProducer;
+import org.apache.accumulo.core.rpc.ThriftUtil;
+import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
+ import org.apache.accumulo.core.spi.metrics.LoggingMeterRegistryFactory;
import org.apache.accumulo.harness.MiniClusterConfigurationCallback;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.minicluster.MemoryUnit;
diff --cc test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
index ab90bcf870,d7562f78c1..bc10568f7c
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
@@@ -129,6 -132,11 +130,12 @@@ public class ZombieTServer
HostAndPort.fromParts("0.0.0.0", port));
String addressString = serverPort.address.toString();
+
+ MetricsInfo metricsInfo = context.getMetricsInfo();
- metricsInfo.addServiceTags("zombie.server", serverPort.address);
++ metricsInfo.addServiceTags("zombie.server", serverPort.address,
++ Constants.DEFAULT_RESOURCE_GROUP_NAME);
+ metricsInfo.init();
+
var zLockPath =
ServiceLock.path(context.getZooKeeperRoot() + Constants.ZTSERVERS + "/" + addressString);
ZooReaderWriter zoo = context.getZooReaderWriter();