[accumulo] branch main updated: Disable failsafe plugin in start and compactor modules (#3829)
This is an automated email from the ASF dual-hosted git repository. cshannon pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/main by this push: new bc932655b3 Disable failsafe plugin in start and compactor modules (#3829) bc932655b3 is described below commit bc932655b38a18c698fd00156a61d2b4cff05cec Author: Christopher L. Shannon AuthorDate: Tue Oct 10 09:05:25 2023 -0400 Disable failsafe plugin in start and compactor modules (#3829) After the changes in #3817 junit is no longer a dependency for the start/compactor modules and this causes errors when running int tests as failsafe gives an error because Junit is not a dependency. Adding back junit as a dependency also fails as there are no unit tests to run currently so this disables the failsafe plugin inside the start/compactor module. It can be re-enabled in the future if tests are added. --- server/compactor/pom.xml | 13 + start/pom.xml| 7 +++ 2 files changed, 20 insertions(+) diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml index a65974abe0..3696cab2c7 100644 --- a/server/compactor/pom.xml +++ b/server/compactor/pom.xml @@ -76,4 +76,17 @@ slf4j-api + + + + + org.apache.maven.plugins + maven-failsafe-plugin + +true + + + + + diff --git a/start/pom.xml b/start/pom.xml index ad83eaed4f..9ead0357da 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -76,6 +76,13 @@ false + + org.apache.maven.plugins + maven-failsafe-plugin + +true + +
[accumulo] branch elasticity updated (31323e5e5e -> 123ce96786)
This is an automated email from the ASF dual-hosted git repository. kturner pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from 31323e5e5e restores ability to list minor compactions (#3827) add eaa13849cd Removed unused method that was missed in (#3773) add 191ea250bf Add more file metadata validation tests (#3774) add 94c4e664af Use ZooCache in ExternalCompactionUtil.findCompactionCoordinator (#3813) add 1415599a5b Merge commit '94c4e664afb7bec56e6debb58027576b896c129e' add 1fd1f797ca improve scan output checks with unique values (#3814) add ce3a886c1c Merge remote-tracking branch 'upstream/2.1' add a8af46dc0a minor chckstyle fixes noticed during previous merge (#3820) add 566d46a93e Merge remote-tracking branch 'upstream/2.1' add de010341ad Removed PowerMock and the 2 unit tests using it (#3817) add 61dc5ad6a4 Bump default Accumulo RPC client to TLSv1.3 (#3792) add bc932655b3 Disable failsafe plugin in start and compactor modules (#3829) new 123ce96786 Merge remote-tracking branch 'upstream/main' into elasticity The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/accumulo/core/conf/Property.java| 6 +- .../accumulo/core/metadata/StoredTabletFile.java | 8 + .../util/compaction/ExternalCompactionUtil.java| 16 +- pom.xml| 49 --- .../constraints/MetadataConstraintsTest.java | 210 +++--- server/compactor/pom.xml | 38 +- .../apache/accumulo/compactor/CompactorTest.java | 455 - .../src/test/resources/log4j2-test.properties | 35 -- server/native/pom.xml | 5 - src/build/ci/find-unapproved-junit.sh | 8 +- start/pom.xml | 17 +- .../accumulo/test/functional/MonitorSslIT.java | 2 +- .../accumulo/test/functional/ReadWriteIT.java | 2 +- .../org/apache/accumulo/test/shell/MockShell.java | 17 +- .../apache/accumulo/test/shell/ShellServerIT.java | 68 +-- 15 files changed, 250 insertions(+), 686 deletions(-) delete mode 100644 server/compactor/src/test/java/org/apache/accumulo/compactor/CompactorTest.java delete mode 100644 server/compactor/src/test/resources/log4j2-test.properties
[accumulo] 01/01: Merge remote-tracking branch 'upstream/main' into elasticity
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 123ce967869621d527aff453bdf43f3617bc76ec
Merge: 31323e5e5e bc932655b3
Author: Keith Turner
AuthorDate: Tue Oct 10 17:51:13 2023 -0400
Merge remote-tracking branch 'upstream/main' into elasticity
.../org/apache/accumulo/core/conf/Property.java| 6 +-
.../accumulo/core/metadata/StoredTabletFile.java | 8 +
.../util/compaction/ExternalCompactionUtil.java| 16 +-
pom.xml| 49 ---
.../constraints/MetadataConstraintsTest.java | 210 +++---
server/compactor/pom.xml | 38 +-
.../apache/accumulo/compactor/CompactorTest.java | 455 -
.../src/test/resources/log4j2-test.properties | 35 --
server/native/pom.xml | 5 -
src/build/ci/find-unapproved-junit.sh | 8 +-
start/pom.xml | 17 +-
.../accumulo/test/functional/MonitorSslIT.java | 2 +-
.../accumulo/test/functional/ReadWriteIT.java | 2 +-
.../org/apache/accumulo/test/shell/MockShell.java | 17 +-
.../apache/accumulo/test/shell/ShellServerIT.java | 68 +--
15 files changed, 250 insertions(+), 686 deletions(-)
diff --cc
core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java
index e4eda5713d,cbda041d41..697f079d40
---
a/core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java
@@@ -99,15 -99,9 +99,9 @@@ public class ExternalCompactionUtil
* @return Optional HostAndPort of Coordinator node if found
*/
public static Optional findCompactionCoordinator(ClientContext
context) {
-final String lockPath = context.getZooKeeperRoot() +
Constants.ZCOORDINATOR_LOCK;
+final String lockPath = context.getZooKeeperRoot() +
Constants.ZMANAGER_LOCK;
- try {
- var zk = ZooSession.getAnonymousSession(context.getZooKeepers(),
- context.getZooKeepersSessionTimeOut());
- return ServiceLock.getLockData(zk, ServiceLock.path(lockPath))
- .map(sld -> sld.getAddress(ThriftService.COORDINATOR));
- } catch (KeeperException | InterruptedException e) {
- throw new IllegalStateException(e);
- }
+ return ServiceLock.getLockData(context.getZooCache(),
ServiceLock.path(lockPath), new ZcStat())
+ .map(sld -> sld.getAddress(ThriftService.COORDINATOR));
}
/**
@@@ -115,14 -109,14 +109,14 @@@
*/
public static Map> getCompactorAddrs(ClientContext
context) {
try {
- final Map> queuesAndAddresses = new
HashMap<>();
- final String compactorQueuesPath = context.getZooKeeperRoot() +
Constants.ZCOMPACTORS;
+ final Map> groupsAndAddresses = new
HashMap<>();
+ final String compactorGroupsPath = context.getZooKeeperRoot() +
Constants.ZCOMPACTORS;
ZooReader zooReader = context.getZooReader();
- List queues = zooReader.getChildren(compactorQueuesPath);
- for (String queue : queues) {
-queuesAndAddresses.putIfAbsent(queue, new ArrayList<>());
+ List groups = zooReader.getChildren(compactorGroupsPath);
+ for (String group : groups) {
- groupsAndAddresses.putIfAbsent(group, new ArrayList());
++groupsAndAddresses.putIfAbsent(group, new ArrayList<>());
try {
- List compactors = zooReader.getChildren(compactorQueuesPath
+ "/" + queue);
+ List compactors = zooReader.getChildren(compactorGroupsPath
+ "/" + group);
for (String compactor : compactors) {
// compactor is the address, we are checking to see if there is a
child node which
// represents the compactor's lock as a check that it's alive.
diff --cc pom.xml
index 7a5a7f1fde,602809f869..4fd8a15edd
--- a/pom.xml
+++ b/pom.xml
@@@ -322,12 -322,11 +321,6 @@@
commons-logging
1.2
--
-
- junit
- junit
- 4.13.2
-org.apache.accumulo
-accumulo-compaction-coordinator
-${project.version}
--
org.apache.accumulo
accumulo-compactor
@@@ -623,37 -622,6 +616,11 @@@
-
-
- org.objenesis
- objenesis
- 3.3
-
+
+org.opentest4j
+opentest4j
+1.2.0
+
-
- org.powermock
- powermock-api-easymock
- ${version.powermock}
-
-
- org.powermock
- powermock-core
- ${version.powermock}
-
-
- org.powermock
- powermock-module-junit4
- ${version.powermock}
-
-
- org.powermock
- powermock-refl
