This is an automated email from the ASF dual-hosted git repository.
domgarguilo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit f17c15ac2e997c3d3cb69c420eff246aee6958e7
Merge: c08e945e8a 3d19788123
Author: Dom Garguilo <domgargu...@apache.org>
AuthorDate: Wed Nov 27 12:16:34 2024 -0500
Merge remote-tracking branch 'upstream/3.1' into main
LICENSE | 30 -
assemble/conf/log4j2-service.properties | 10 -
assemble/src/main/resources/LICENSE | 29 -
server/monitor/pom.xml | 16 -
.../src/main/appended-resources/META-INF/LICENSE | 30 -
.../java/org/apache/accumulo/monitor/Monitor.java | 149 +-
.../accumulo/monitor/rest/logs/LogResource.java | 75 -
.../monitor/rest/logs/SanitizedLogEvent.java | 67 -
.../accumulo/monitor/rest/logs/SingleLogEvent.java | 38 -
.../rest/statistics/StatisticsResource.java | 146 -
.../monitor/rest/status/StatusInformation.java | 8 +-
.../monitor/rest/status/StatusResource.java | 4 +-
.../util/logging/AccumuloMonitorAppender.java | 253 --
.../accumulo/monitor/util/logging/RecentLogs.java | 84 -
.../org/apache/accumulo/monitor/view/WebViews.java | 17 -
.../accumulo/monitor/resources/css/screen.css | 19 -
.../monitor/resources/external/flot/LICENSE.txt | 22 -
.../external/flot/jquery.canvaswrapper.js | 549 ----
.../resources/external/flot/jquery.colorhelpers.js | 199 --
.../external/flot/jquery.flot.axislabels.js | 212 --
.../resources/external/flot/jquery.flot.browser.js | 98 -
.../external/flot/jquery.flot.categories.js | 202 --
.../external/flot/jquery.flot.composeImages.js | 330 ---
.../external/flot/jquery.flot.crosshair.js | 202 --
.../external/flot/jquery.flot.drawSeries.js | 701 -----
.../external/flot/jquery.flot.errorbars.js | 375 ---
.../external/flot/jquery.flot.fillbetween.js | 254 --
.../external/flot/jquery.flot.flatdata.js | 47 -
.../resources/external/flot/jquery.flot.hover.js | 359 ---
.../resources/external/flot/jquery.flot.image.js | 249 --
.../monitor/resources/external/flot/jquery.flot.js | 2818 --------------------
.../resources/external/flot/jquery.flot.legend.js | 437 ---
.../resources/external/flot/jquery.flot.logaxis.js | 298 ---
.../external/flot/jquery.flot.navigate.js | 834 ------
.../resources/external/flot/jquery.flot.pie.js | 794 ------
.../resources/external/flot/jquery.flot.resize.js | 60 -
.../external/flot/jquery.flot.saturated.js | 43 -
.../external/flot/jquery.flot.selection.js | 527 ----
.../resources/external/flot/jquery.flot.stack.js | 220 --
.../resources/external/flot/jquery.flot.symbol.js | 98 -
.../external/flot/jquery.flot.threshold.js | 143 -
.../resources/external/flot/jquery.flot.time.js | 586 ----
.../resources/external/flot/jquery.flot.touch.js | 320 ---
.../external/flot/jquery.flot.touchNavigate.js | 360 ---
.../external/flot/jquery.flot.uiConstants.js | 10 -
.../accumulo/monitor/resources/js/functions.js | 93 -
.../apache/accumulo/monitor/resources/js/navbar.js | 29 +-
.../accumulo/monitor/resources/js/overview.js | 192 +-
.../apache/accumulo/monitor/templates/default.ftl | 10 -
.../org/apache/accumulo/monitor/templates/log.ftl | 130 -
.../apache/accumulo/monitor/templates/navbar.ftl | 1 -
.../apache/accumulo/monitor/templates/overview.ftl | 52 +-
52 files changed, 16 insertions(+), 12813 deletions(-)
diff --cc server/monitor/pom.xml
index 789607b163,c55132d856..1dd6bcc42a
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@@ -84,14 -76,10 +76,6 @@@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
-- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
-- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-web</artifactId>
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index cb2b4e8a4c,3b2e618456..12aa0989d4
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@@ -310,9 -251,7 +263,8 @@@ public class Monitor extends AbstractSe
sleepUninterruptibly(1, TimeUnit.SECONDS);
}
}
+
if (mmi != null) {
- int minorCompactions = 0;
lookupRateTracker.startingUpdates();
indexCacheHitTracker.startingUpdates();
@@@ -697,25 -608,15 +607,24 @@@
}
var ccHost = coordinatorHost.orElseThrow();
log.info("User initiated fetch of running External Compactions from " +
ccHost);
- var client = getCoordinator(ccHost);
- TExternalCompactionList running;
try {
- running = client.getRunningCompactions(TraceUtil.traceInfo(),
getContext().rpcCreds());
- } catch (Exception e) {
- throw new IllegalStateException("Unable to get running compactions from
" + ccHost, e);
+ CompactionCoordinatorService.Client client =
+ ThriftUtil.getClient(ThriftClientTypes.COORDINATOR, ccHost,
getContext());
+ TExternalCompactionList running;
+ try {
+ running = client.getRunningCompactions(TraceUtil.traceInfo(),
getContext().rpcCreds());
- return new ExternalCompactionsSnapshot(
- running.getCompactions() == null ? Map.of() :
running.getCompactions());
++ return new
ExternalCompactionsSnapshot(Optional.ofNullable(running.getCompactions()));
+ } catch (Exception e) {
+ throw new IllegalStateException("Unable to get running compactions
from " + ccHost, e);
+ } finally {
+ if (client != null) {
+ ThriftUtil.returnClient(client, getContext());
+ }
+ }
+ } catch (TTransportException e) {
+ log.error("Unable to get Compaction coordinator at {}", ccHost);
+ throw new IllegalStateException(coordinatorMissingMsg, e);
}
-
- return new
ExternalCompactionsSnapshot(Optional.ofNullable(running.getCompactions()));
}
public RunningCompactions getRunnningCompactions() {
