[accumulo] branch 1.10 updated (51dde75 -> 252897d)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch 1.10 in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 51dde75 Configure surefire/failsafe forkCount separately (#1756) add 252897d Back port #1754 to 1.10 No new revisions were added by this update. Summary of changes: .../org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[accumulo] branch 1.10 updated (51dde75 -> 252897d)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch 1.10 in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 51dde75 Configure surefire/failsafe forkCount separately (#1756) add 252897d Back port #1754 to 1.10 No new revisions were added by this update. Summary of changes: .../org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[accumulo] branch main updated (56a2ab3 -> ea5fa7d)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 56a2ab3 Update jvm option for JDWP (#1754) add 252897d Back port #1754 to 1.10 add ea5fa7d Merge branch '1.10' into main No new revisions were added by this update. Summary of changes:
[accumulo] branch main updated (f88cb3b -> 56a2ab3)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git. from f88cb3b ZooReader/ZooReaderWriter cleanup (#1755) add 56a2ab3 Update jvm option for JDWP (#1754) No new revisions were added by this update. Summary of changes: .../org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[accumulo] branch main updated (c4e47ba -> f88cb3b)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from c4e47ba Merge branch '1.10' into main
add f88cb3b ZooReader/ZooReaderWriter cleanup (#1755)
No new revisions were added by this update.
Summary of changes:
.../core/clientImpl/ReplicationClient.java | 2 +-
.../org/apache/accumulo/core/util/MonitorUtil.java | 2 +-
.../java/org/apache/accumulo/fate/AdminUtil.java | 4 +-
.../java/org/apache/accumulo/fate/ZooStore.java| 11 +-
.../apache/accumulo/fate/zookeeper/ZooLock.java| 2 +-
.../accumulo/fate/zookeeper/ZooQueueLock.java | 6 +-
.../apache/accumulo/fate/zookeeper/ZooReader.java | 233 --
.../accumulo/fate/zookeeper/ZooReaderWriter.java | 477 +
.../accumulo/fate/zookeeper/ZooReservation.java| 6 +-
.../apache/accumulo/core/util/MonitorUtilTest.java | 5 +-
.../fate/zookeeper/ZooReaderWriterTest.java| 34 +-
minicluster/pom.xml| 4 -
.../miniclusterImpl/MiniAccumuloClusterImpl.java | 3 +-
.../accumulo/server/log/WalStateManager.java | 8 +-
.../accumulo/server/master/LiveTServerSet.java | 10 +-
.../accumulo/server/problems/ProblemReport.java| 2 +-
.../replication/ZooKeeperInitialization.java | 10 +-
.../ZooAuthenticationKeyDistributor.java | 9 +-
.../delegation/ZooAuthenticationKeyWatcher.java| 6 +-
.../server/security/handler/ZKPermHandler.java | 10 +-
...r.java => IllegalTableTransitionException.java} | 10 +-
.../accumulo/server/tables/TableManager.java | 108 ++---
.../apache/accumulo/server/util/ChangeSecret.java | 2 +-
.../accumulo/server/util/CleanZookeeper.java | 2 +-
.../accumulo/server/util/DeleteZooInstance.java| 4 +-
.../apache/accumulo/server/util/DumpZookeeper.java | 10 +-
.../apache/accumulo/server/util/ListInstances.java | 2 +-
.../accumulo/server/util/SystemPropUtil.java | 4 +-
.../server/zookeeper/DistributedWorkQueue.java | 2 +-
.../server/problems/ProblemReportTest.java | 7 +-
.../replication/ZooKeeperInitializationTest.java | 73
.../ZooAuthenticationKeyDistributorTest.java | 17 +-
.../ZooAuthenticationKeyWatcherTest.java | 30 +-
.../IllegalTableTransitionExceptionTest.java | 38 +-
.../java/org/apache/accumulo/master/Master.java| 5 +-
.../master/MasterClientServiceHandler.java | 5 +-
.../org/apache/accumulo/master/MasterTime.java | 6 +-
.../replication/MasterReplicationCoordinator.java | 4 +-
.../apache/accumulo/master/state/MergeStats.java | 3 +-
.../master/tableOps/clone/CloneZookeeper.java | 3 +-
.../master/tableOps/compact/CompactRange.java | 93 ++--
.../master/tableOps/compact/CompactionDriver.java | 2 +-
.../tableOps/compact/cancel/CancelCompactions.java | 26 +-
.../master/tableOps/create/PopulateZookeeper.java | 3 +-
.../tableOps/namespace/rename/RenameNamespace.java | 20 +-
.../tableImport/ImportPopulateZookeeper.java | 4 +-
.../accumulo/master/upgrade/Upgrader9to10.java | 4 +-
.../java/org/apache/accumulo/monitor/Monitor.java | 15 +-
.../org/apache/accumulo/tracer/ZooTraceClient.java | 2 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 4 +-
.../accumulo/test/fate/zookeeper/ZooLockIT.java| 8 +-
.../accumulo/test/functional/BackupMasterIT.java | 2 +-
.../test/functional/GarbageCollectorIT.java| 4 +-
.../replication/MultiTserverReplicationIT.java | 4 +-
54 files changed, 431 insertions(+), 939 deletions(-)
copy
server/base/src/main/java/org/apache/accumulo/server/tables/{TableObserver.java
=> IllegalTableTransitionException.java} (75%)
delete mode 100644
server/base/src/test/java/org/apache/accumulo/server/replication/ZooKeeperInitializationTest.java
[accumulo] 01/01: Merge branch '1.10' into main
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit c4e47bab9d86eca894317efcb19fa11e6225425f
Merge: 353c611 51dde75
Author: Christopher Tubbs
AuthorDate: Wed Oct 28 12:57:21 2020 -0400
Merge branch '1.10' into main
.github/workflows/maven.yaml | 2 +-
minicluster/pom.xml | 13 +
pom.xml | 18 --
test/src/test/scripts/run-test.sh | 2 +-
4 files changed, 31 insertions(+), 4 deletions(-)
diff --cc .github/workflows/maven.yaml
index 279fade,09839b9..c14acb8
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@@ -60,9 -60,8 +60,9 @@@ jobs
strategy:
matrix:
profile:
- - {name: 'unit-tests',args: 'verify -PskipQA -DskipTests=false
-DforkCount=1C'}
- - {name: 'Hadoop2', args: 'verify javadoc:jar -DskipITs'}
- - {name: 'Hadoop3', args: 'verify javadoc:jar -DskipITs
-Dhadoop.profile=3'}
++ - {name: 'unit-tests',args: 'verify -PskipQA -DskipTests=false'}
+ - {name: 'qa-checks', args: 'verify javadoc:jar -Psec-bugs
-DskipTests=true -Dspotbugs.timeout=360'}
+ - {name: 'hadoop-compat', args: 'package -DskipTests
-Dhadoop.version=3.0.3'}
fail-fast: false
timeout-minutes: 60
runs-on: ubuntu-latest
diff --cc pom.xml
index f067b23,a794f6c..ba39330
--- a/pom.xml
+++ b/pom.xml
@@@ -122,21 -122,20 +122,20 @@@
${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml
+ 1
-
- 1
-
-14.0.1
-2.6.5
+3.2.1
+2.6.1
4.1.0-incubating
-3.1.0-incubating
+3.2.0-incubating
false
-
-9.2.26.v20180806
-8
-1.8
-1.8
-3.5.0
+3.0.1-b06
+2.3.0.1
+2.30.1
+9.4.27.v20200227
+11
+11
+11
true
2.0.7
@@@ -1607,25 -1368,42 +1609,37 @@@
src/main/spotbugs/exclude-filter.xml
-
- hadoop-default
-
-
- !hadoop.profile
-
-
-
-2
-
-
-
-
- hadoop3
-
-
- hadoop.profile
- 3
-
-
-
-3.0.3
-
+ sec-bugs
+
+
+
+com.github.spotbugs
+spotbugs-maven-plugin
+
+
+
+ com.h3xstream.findsecbugs
+ findsecbugs-plugin
+ 1.8.0
+
+
+
+
+
+
+
+ forkCount
+
+
+ forkCount
+
+
+
+ ${forkCount}
+ ${forkCount}
+
+
[accumulo] branch main updated (353c611 -> c4e47ba)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 353c611 Formatting add 51dde75 Configure surefire/failsafe forkCount separately (#1756) new c4e47ba Merge branch '1.10' into main 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: .github/workflows/maven.yaml | 2 +- minicluster/pom.xml | 13 + pom.xml | 18 -- test/src/test/scripts/run-test.sh | 2 +- 4 files changed, 31 insertions(+), 4 deletions(-)
[accumulo] branch 1.10 updated: Configure surefire/failsafe forkCount separately (#1756)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 1.10
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.10 by this push:
new 51dde75 Configure surefire/failsafe forkCount separately (#1756)
51dde75 is described below
commit 51dde7545a57aa9c130e5bd5e7b3236d624c4499
Author: Christopher Tubbs
AuthorDate: Wed Oct 28 12:55:22 2020 -0400
Configure surefire/failsafe forkCount separately (#1756)
* Create new configuration properties in the build configuration for
surefire.forkCount and failsafe.forkCount to enable configuring them
independently of one another
* Create a profile to set both surefire.forkCount and failsafe.forkCount
together, if desired
* Remove forkCount settings from the build workflow, instead selecting
sane defaults that are equivalent
* Force minicluter to use one surefire fork only (along with start
module) to avoid potential conflicts
---
.github/workflows/maven.yaml | 4 ++--
minicluster/pom.xml | 13 +
pom.xml | 18 --
test/src/test/scripts/run-test.sh | 2 +-
4 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index 5b7cdb3..09839b9 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -60,8 +60,8 @@ jobs:
strategy:
matrix:
profile:
- - {name: 'Hadoop2', args: 'verify javadoc:jar -DskipITs
-DforkCount=1C'}
- - {name: 'Hadoop3', args: 'verify javadoc:jar -DskipITs
-DforkCount=1C -Dhadoop.profile=3'}
+ - {name: 'Hadoop2', args: 'verify javadoc:jar -DskipITs'}
+ - {name: 'Hadoop3', args: 'verify javadoc:jar -DskipITs
-Dhadoop.profile=3'}
fail-fast: false
timeout-minutes: 60
runs-on: ubuntu-latest
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index 005bb4e..ed1de58 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -118,6 +118,19 @@
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+1
+false
+
+
+
+
net.revelc.code
diff --git a/pom.xml b/pom.xml
index 84101f1..a794f6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,9 +122,8 @@
${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml
+1
-
-1
14.0.1
2.6.5
@@ -148,6 +147,7 @@
source-release-tar
false
+1C
3.0.0-M3
@@ -705,6 +705,7 @@
org.apache.maven.plugins
maven-surefire-plugin
+${surefire.forkCount}
${surefire.excludedGroups}
${surefire.groups}
@@ -717,6 +718,7 @@
org.apache.maven.plugins
maven-failsafe-plugin
+${failsafe.forkCount}
${failsafe.excludedGroups}
${failsafe.groups}
@@ -1391,5 +1393,17 @@
3.0.3
+
+ forkCount
+
+
+ forkCount
+
+
+
+${forkCount}
+${forkCount}
+
+
diff --git a/test/src/test/scripts/run-test.sh
b/test/src/test/scripts/run-test.sh
index 0e9670f..d643b08 100755
--- a/test/src/test/scripts/run-test.sh
+++ b/test/src/test/scripts/run-test.sh
@@ -38,5 +38,5 @@ cd "$bin/.."
tests=$1
shift
-# Let the user provide additional maven options (like -DforkCount=2)
+# Let the user provide additional maven options (like -Dsurefire.forkCount=2)
mvn verify -Dit.test="$tests" -Dtest=testnamethatdoesntexist
-DfailIfNoTests=false "$@"
