[accumulo] branch master updated (c02f701 -> e1f6cba)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from c02f701 Merge branch '1.9' add c5d80ec Bump checkstyle from 8.21 to 8.29 new e1f6cba Remove obsoleted checkstyle config 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: pom.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-)
[accumulo] 01/01: Remove obsoleted checkstyle config
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit e1f6cba01b0878c50f279c3022c801465a9baec7 Author: Christopher Tubbs AuthorDate: Fri Jan 31 20:40:44 2020 -0500 Remove obsoleted checkstyle config Remove checkstyle config which was removed from the latest checkstyle --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index 35d7840..a6c1c4d 100644 --- a/pom.xml +++ b/pom.xml @@ -1234,12 +1234,9 @@ - - -
[accumulo] branch dependabot/maven/com.puppycrawl.tools-checkstyle-8.29 created (now c5d80ec)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.puppycrawl.tools-checkstyle-8.29 in repository https://gitbox.apache.org/repos/asf/accumulo.git. at c5d80ec Bump checkstyle from 8.21 to 8.29 No new revisions were added by this update.
[accumulo] 01/02: Fix #1491 Stabilize ChaoticBalancerIT in 1.x
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit e6f059e9ba05db952f85b3a10d1fc99f0e84d313
Author: Christopher Tubbs
AuthorDate: Fri Jan 31 05:32:29 2020 -0500
Fix #1491 Stabilize ChaoticBalancerIT in 1.x
Backport fixes from ACCUMULO-4602
(520d23d85dfce9297bab887726322861163a1fb2)
---
.../master/balancer/ChaoticLoadBalancer.java | 2 +-
.../test/functional/ChaoticBalancerIT.java | 25 +++---
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
index 2a02555..ae06bb8 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
@@ -75,7 +75,7 @@ public class ChaoticLoadBalancer extends TabletBalancer {
for (TableInfo ti : e.getValue().getTableMap().values()) {
numTablets += ti.tablets;
}
- if (numTablets < avg) {
+ if (numTablets <= avg) {
tServerArray.add(e.getKey());
toAssign.put(e.getKey(), avg - numTablets);
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
index 4b0580b..188770c 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
@@ -17,21 +17,22 @@
package org.apache.accumulo.test.functional;
import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.apache.accumulo.core.cli.BatchWriterOpts;
import org.apache.accumulo.core.cli.ScannerOpts;
import org.apache.accumulo.core.client.ClientConfiguration;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.admin.NewTableConfiguration;
import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.harness.AccumuloClusterHarness;
import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
import org.apache.accumulo.server.master.balancer.ChaoticLoadBalancer;
import org.apache.accumulo.test.TestIngest;
import org.apache.accumulo.test.VerifyIngest;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.Text;
import org.junit.Test;
public class ChaoticBalancerIT extends AccumuloClusterHarness {
@@ -54,16 +55,14 @@ public class ChaoticBalancerIT extends
AccumuloClusterHarness {
@Test
public void test() throws Exception {
Connector c = getConnector();
-String[] names = getUniqueNames(2);
-String tableName = names[0], unused = names[1];
-c.tableOperations().create(tableName);
-c.tableOperations().setProperty(tableName,
Property.TABLE_SPLIT_THRESHOLD.getKey(), "10K");
-SortedSet splits = new TreeSet<>();
-for (int i = 0; i < 100; i++) {
- splits.add(new Text(String.format("%03d", i)));
-}
-c.tableOperations().create(unused);
-c.tableOperations().addSplits(unused, splits);
+String[] names = getUniqueNames(1);
+String tableName = names[0];
+NewTableConfiguration ntc = new NewTableConfiguration();
+ntc.setProperties(Stream
+.of(new Pair<>(Property.TABLE_SPLIT_THRESHOLD.getKey(), "10K"),
+new Pair<>(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE.getKey(),
"1K"))
+.collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)));
+c.tableOperations().create(tableName, ntc);
TestIngest.Opts opts = new TestIngest.Opts();
VerifyIngest.Opts vopts = new VerifyIngest.Opts();
vopts.rows = opts.rows = 2;
[accumulo] 01/01: Merge branch '1.9'
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit c02f701a819bcfb1481f1610187a3358b61e876b
Merge: 374e517 2c1c72f
Author: Christopher Tubbs
AuthorDate: Fri Jan 31 08:47:49 2020 -0500
Merge branch '1.9'
test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java | 2 +-
.../org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java| 2 +-
test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java| 2 +-
.../java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java | 2 +-
.../java/org/apache/accumulo/test/master/SuspendedTabletsIT.java | 5 +
.../apache/accumulo/test/replication/MultiInstanceReplicationIT.java | 2 +-
6 files changed, 10 insertions(+), 5 deletions(-)
diff --cc
test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java
index 786d9ed,b1009df..72dc26d
--- a/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java
@@@ -81,9 -84,13 +81,14 @@@ public class SuspendedTabletsIT extend
public static final int TABLETS = 100;
@Override
+ protected int defaultTimeoutSeconds() {
+ return 5 * 60;
+ }
+
+ @Override
public void configure(MiniAccumuloConfigImpl cfg, Configuration fsConf) {
cfg.setProperty(Property.TABLE_SUSPEND_DURATION, SUSPEND_DURATION + "ms");
+cfg.setClientProperty(ClientProperty.INSTANCE_ZOOKEEPERS_TIMEOUT, "5s");
cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "5s");
cfg.setNumTservers(TSERVERS);
}
[accumulo] branch 1.9 updated (da198ba -> 2c1c72f)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 1.9 in repository https://gitbox.apache.org/repos/asf/accumulo.git. from da198ba Fix unused var and generics warning new e6f059e Fix #1491 Stabilize ChaoticBalancerIT in 1.x new 2c1c72f Fix #1482 Increase timeouts on some slow ITs The 2 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: .../master/balancer/ChaoticLoadBalancer.java | 2 +- .../org/apache/accumulo/test/ExistingMacIT.java| 2 +- .../test/RecoveryCompactionsAreFlushesIT.java | 2 +- .../org/apache/accumulo/test/WaitForBalanceIT.java | 2 +- .../test/functional/ChaoticBalancerIT.java | 25 ++-- .../accumulo/test/functional/ConstraintIT.java | 2 +- .../test/functional/MetadataMaxFilesIT.java| 2 +- .../accumulo/test/master/SuspendedTabletsIT.java | 9 +- .../test/performance/RollWALPerformanceIT.java | 135 - .../performance/metadata/FastBulkImportIT.java | 113 - .../accumulo/test/proxy/ProxyDurabilityIT.java | 2 +- .../replication/MultiInstanceReplicationIT.java| 2 +- 12 files changed, 27 insertions(+), 271 deletions(-) delete mode 100644 test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java delete mode 100644 test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java
[accumulo] branch master updated (374e517 -> c02f701)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 374e517 Remove unreachable code in DatafileManager (#1490) new e6f059e Fix #1491 Stabilize ChaoticBalancerIT in 1.x new 2c1c72f Fix #1482 Increase timeouts on some slow ITs new c02f701 Merge branch '1.9' The 3 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: test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java | 2 +- .../org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java| 2 +- test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java| 2 +- .../java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java | 2 +- .../java/org/apache/accumulo/test/master/SuspendedTabletsIT.java | 5 + .../apache/accumulo/test/replication/MultiInstanceReplicationIT.java | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-)
[accumulo] 02/02: Fix #1482 Increase timeouts on some slow ITs
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 2c1c72f5cf4375b8afdd3662783760d8ab62e5bf
Author: Christopher Tubbs
AuthorDate: Fri Jan 31 07:47:26 2020 -0500
Fix #1482 Increase timeouts on some slow ITs
Stabilize some ITs by increasing timeouts to values which cause them to
pass more frequently on modest developer hardware and adding a timeout
to one that was missing it.
Also backport the removal of some flakey performance-related tests,
which were already removed in newer branches.
---
.../org/apache/accumulo/test/ExistingMacIT.java| 2 +-
.../test/RecoveryCompactionsAreFlushesIT.java | 2 +-
.../org/apache/accumulo/test/WaitForBalanceIT.java | 2 +-
.../accumulo/test/functional/ConstraintIT.java | 2 +-
.../test/functional/MetadataMaxFilesIT.java| 2 +-
.../accumulo/test/master/SuspendedTabletsIT.java | 9 +-
.../test/performance/RollWALPerformanceIT.java | 135 -
.../performance/metadata/FastBulkImportIT.java | 113 -
.../accumulo/test/proxy/ProxyDurabilityIT.java | 2 +-
.../replication/MultiInstanceReplicationIT.java| 2 +-
10 files changed, 14 insertions(+), 257 deletions(-)
diff --git a/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
b/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
index da22fa8..83815ec 100644
--- a/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
@@ -59,7 +59,7 @@ import org.junit.Test;
public class ExistingMacIT extends ConfigurableMacBase {
@Override
public int defaultTimeoutSeconds() {
-return 2 * 60;
+return 4 * 60;
}
@Override
diff --git
a/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java
b/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java
index 4e11274..255b228 100644
---
a/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java
@@ -46,7 +46,7 @@ public class RecoveryCompactionsAreFlushesIT extends
AccumuloClusterHarness {
@Override
public int defaultTimeoutSeconds() {
-return 60;
+return 180;
}
@Override
diff --git a/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java
b/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java
index 45e307d..a1625bc 100644
--- a/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java
@@ -43,7 +43,7 @@ public class WaitForBalanceIT extends ConfigurableMacBase {
@Override
public int defaultTimeoutSeconds() {
-return 60;
+return 120;
}
@Test
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
index d0b2540..5d1b511 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
@@ -51,7 +51,7 @@ public class ConstraintIT extends AccumuloClusterHarness {
@Override
protected int defaultTimeoutSeconds() {
-return 30;
+return 60;
}
@Test
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
index b4b04d8..1cc9aaf 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
@@ -56,7 +56,7 @@ public class MetadataMaxFilesIT extends ConfigurableMacBase {
@Override
protected int defaultTimeoutSeconds() {
-return 4 * 60;
+return 5 * 60;
}
@Test
diff --git
a/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java
b/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java
index c86ecf0..b1009df 100644
--- a/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java
@@ -84,6 +84,11 @@ public class SuspendedTabletsIT extends ConfigurableMacBase {
public static final int TABLETS = 100;
@Override
+ protected int defaultTimeoutSeconds() {
+return 5 * 60;
+ }
+
+ @Override
public void configure(MiniAccumuloConfigImpl cfg, Configuration fsConf) {
cfg.setProperty(Property.TABLE_SUSPEND_DURATION, SUSPEND_DURATION + "ms");
cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "5s");
@@ -273,8 +278,8 @@ public class SuspendedTabletsIT extends ConfigurableMacBase
{
assertTrue(recoverTime - killTime >
[accumulo] branch master updated (0216247 -> 374e517)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 0216247 Clean up warnings in master branch add 374e517 Remove unreachable code in DatafileManager (#1490) No new revisions were added by this update. Summary of changes: .../accumulo/tserver/tablet/DatafileManager.java| 21 - 1 file changed, 4 insertions(+), 17 deletions(-)
