This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 1f7c2c2f42e54d5e41d15e92d055f57e39c87932
Merge: 8ed6dbad90 a7167daa8f
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Jul 18 15:43:03 2024 -0400
Merge branch '2.1'
assemble/pom.xml | 5 --
core/pom.xml | 30 ++++----
.../hadoopImpl/mapred/AccumuloRecordReader.java | 4 +-
.../hadoopImpl/mapreduce/AccumuloRecordReader.java | 4 +-
minicluster/pom.xml | 5 --
pom.xml | 11 +--
.../accumulo/server/metrics/MetricsInfoImpl.java | 4 +-
.../accumulo/server/util/ServiceStatusCmd.java | 14 ++--
.../server/metrics/MetricsInfoImplTest.java | 4 +-
server/compaction-coordinator/pom.xml | 4 -
server/compactor/pom.xml | 4 -
.../src/test/resources/conf/generic_logger.xml | 87 ----------------------
.../src/test/resources/conf/monitor_logger.xml | 68 -----------------
server/monitor/pom.xml | 2 +-
start/pom.xml | 1 +
.../apache/accumulo/test/ClientSideIteratorIT.java | 13 ++--
.../java/org/apache/accumulo/test/PrintInfoIT.java | 4 -
17 files changed, 41 insertions(+), 223 deletions(-)
diff --cc pom.xml
index ca8db04a0d,16de14b163..ebd4c0e8ff
--- a/pom.xml
+++ b/pom.xml
@@@ -314,12 -319,13 +314,12 @@@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.2</version>
+ <version>1.3.3</version>
</dependency>
<dependency>
- <!-- legacy junit version specified here for dependency convergence
-->
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-access</artifactId>
+ <version>${version.accumulo-access}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
diff --cc
server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java
index b042fcf838,557c789141..2a829499a8
---
a/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java
@@@ -229,9 -242,9 +229,9 @@@ public class ServiceStatusCmd
Map<String,Set<String>> hostsByGroups = new TreeMap<>();
// get group names
- Result<Integer,Set<String>> queueNodes = readNodeNames(zooReader,
zRootPath);
+ Result<Set<String>> queueNodes = readNodeNames(zooReader, zRootPath);
errors.addAndGet(queueNodes.getErrorCount());
- Set<String> queues = new TreeSet<>(queueNodes.getHosts());
+ Set<String> queues = new TreeSet<>(queueNodes.getData());
queues.forEach(group -> {
var hostNames = readNodeNames(zooReader, zRootPath + "/" + group);
@@@ -298,8 -311,8 +298,8 @@@
* @return Pair with error count, the data from each node as a String.
*/
@VisibleForTesting
- Result<Integer,Set<String>> readAllNodesData(final ZooReader zooReader,
final String path) {
+ Result<Set<String>> readAllNodesData(final ZooReader zooReader, final
String path) {
- Set<String> hosts = new TreeSet<>();
+ Set<String> data = new TreeSet<>();
final AtomicInteger errorCount = new AtomicInteger(0);
try {
var locks = zooReader.getChildren(path);
diff --cc server/manager/src/test/resources/conf/generic_logger.xml
index bb51e5fe5e,bb51e5fe5e..0000000000
deleted file mode 100644,100644
--- a/server/manager/src/test/resources/conf/generic_logger.xml
+++ /dev/null
@@@ -1,87 -1,87 +1,0 @@@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
--
-- Licensed to the Apache Software Foundation (ASF) under one
-- or more contributor license agreements. See the NOTICE file
-- distributed with this work for additional information
-- regarding copyright ownership. The ASF licenses this file
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
--
-- https://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-- KIND, either express or implied. See the License for the
-- specific language governing permissions and limitations
-- under the License.
--
---->
--<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
--<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
--
-- <!-- Write out everything at the DEBUG level to the debug log -->
-- <appender name="A2" class="org.apache.log4j.RollingFileAppender">
-- <param name="File"
value="${org.apache.accumulo.core.dir.log}/${org.apache.accumulo.core.application}_${org.apache.accumulo.core.ip.localhost.hostname}.debug.log"/>
-- <param name="MaxFileSize" value="1000MB"/>
-- <param name="MaxBackupIndex" value="10"/>
-- <param name="Threshold" value="DEBUG"/>
-- <layout class="org.apache.log4j.PatternLayout">
-- <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p:
%m%n"/>
-- </layout>
-- </appender>
--
-- <!-- Write out INFO and higher to the regular log -->
-- <appender name="A3" class="org.apache.log4j.RollingFileAppender">
-- <param name="File"
value="${org.apache.accumulo.core.dir.log}/${org.apache.accumulo.core.application}_${org.apache.accumulo.core.ip.localhost.hostname}.log"/>
-- <param name="MaxFileSize" value="1000MB"/>
-- <param name="MaxBackupIndex" value="10"/>
-- <param name="Threshold" value="INFO"/>
-- <layout class="org.apache.log4j.PatternLayout">
-- <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p:
%m%n"/>
-- </layout>
-- </appender>
--
-- <!-- Send all logging data to a centralized logger -->
-- <appender name="N1" class="org.apache.log4j.net.SocketAppender">
-- <param name="remoteHost"
value="${org.apache.accumulo.core.host.log}"/>
-- <param name="port"
value="${org.apache.accumulo.core.host.log.port}"/>
-- <param name="application"
value="${org.apache.accumulo.core.application}:${org.apache.accumulo.core.ip.localhost.hostname}"/>
-- <param name="Threshold" value="WARN"/>
-- </appender>
--
-- <!-- If the centralized logger is down, buffer the log events, but drop
them if it stays down -->
-- <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
-- <appender-ref ref="N1" />
-- </appender>
--
-- <!-- Log accumulo events to the debug, normal and remote logs. -->
-- <logger name="org.apache.accumulo" additivity="false">
-- <level value="DEBUG"/>
-- <appender-ref ref="A2" />
-- <appender-ref ref="A3" />
-- <appender-ref ref="ASYNC" />
-- </logger>
--
-- <logger name="org.apache.accumulo.core.file.rfile.bcfile">
-- <level value="INFO"/>
-- </logger>
--
-- <logger name="org.mortbay.log">
-- <level value="WARN"/>
-- </logger>
--
-- <logger name="org.apache.zookeeper">
-- <level value="ERROR"/>
-- </logger>
--
-- <!-- Log non-accumulo events to the debug and normal logs. -->
-- <root>
-- <level value="INFO"/>
-- <appender-ref ref="A2" />
-- <appender-ref ref="A3" />
-- </root>
--
--</log4j:configuration>
diff --cc server/manager/src/test/resources/conf/monitor_logger.xml
index 1b24900110,1b24900110..0000000000
deleted file mode 100644,100644
--- a/server/manager/src/test/resources/conf/monitor_logger.xml
+++ /dev/null
@@@ -1,68 -1,68 +1,0 @@@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
--
-- Licensed to the Apache Software Foundation (ASF) under one
-- or more contributor license agreements. See the NOTICE file
-- distributed with this work for additional information
-- regarding copyright ownership. The ASF licenses this file
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
--
-- https://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-- KIND, either express or implied. See the License for the
-- specific language governing permissions and limitations
-- under the License.
--
---->
--<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
--<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
--
-- <!-- Write out everything at the DEBUG level to the debug log -->
-- <appender name="A2" class="org.apache.log4j.RollingFileAppender">
-- <param name="File"
value="${org.apache.accumulo.core.dir.log}/${org.apache.accumulo.core.application}_${org.apache.accumulo.core.ip.localhost.hostname}.debug.log"/>
-- <param name="MaxFileSize" value="100MB"/>
-- <param name="MaxBackupIndex" value="10"/>
-- <param name="Threshold" value="DEBUG"/>
-- <layout class="org.apache.log4j.PatternLayout">
-- <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p:
%X{application} %m%n"/>
-- </layout>
-- </appender>
--
-- <!-- Write out INFO and higher to the regular log -->
-- <appender name="A3" class="org.apache.log4j.RollingFileAppender">
-- <param name="File"
value="${org.apache.accumulo.core.dir.log}/${org.apache.accumulo.core.application}_${org.apache.accumulo.core.ip.localhost.hostname}.log"/>
-- <param name="MaxFileSize" value="100MB"/>
-- <param name="MaxBackupIndex" value="10"/>
-- <param name="Threshold" value="INFO"/>
-- <layout class="org.apache.log4j.PatternLayout">
-- <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p:
%X{application} %m%n"/>
-- </layout>
-- </appender>
--
-- <!-- Keep the last few log messages for display to the user -->
-- <appender name="GUI" class="org.apache.accumulo.server.monitor.LogService">
-- <param name="keep" value="40"/>
-- <param name="Threshold" value="WARN"/>
-- </appender>
--
-- <!-- Log accumulo messages to debug, normal and GUI -->
-- <logger name="org.apache.accumulo" additivity="false">
-- <level value="DEBUG"/>
-- <appender-ref ref="A2" />
-- <appender-ref ref="A3" />
-- <appender-ref ref="GUI" />
-- </logger>
--
-- <!-- Log non-accumulo messages to debug, normal logs. -->
-- <root>
-- <level value="INFO"/>
-- <appender-ref ref="A2" />
-- <appender-ref ref="A3" />
-- </root>
--
--</log4j:configuration>
