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 0702e08645d94a2ebae829ba2c8f2588177799a6
Merge: 47d7b70 f80843e
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Fri Aug 21 11:27:39 2020 -0400
Merge branch '1.10' into main
.../main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java | 4 ++--
test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java | 2 +-
test/src/main/java/org/apache/accumulo/test/LocatorIT.java | 2 +-
test/src/main/java/org/apache/accumulo/test/ScanFlushWithTimeIT.java | 2 +-
.../java/org/apache/accumulo/test/TableConfigurationUpdateIT.java | 2 +-
.../src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java | 2 +-
.../org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java | 2 +-
test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --cc
test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java
index 9010deb,ba458f3..4dd8ebe
--- a/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java
@@@ -49,41 -47,43 +49,41 @@@ public class BalanceWithOfflineTableIT
final String tableName = tableNames[0];
// create a table with a bunch of splits
- final Connector c = getConnector();
- log.info("Creating table " + tableName);
- c.tableOperations().create(tableName);
- final SortedSet<Text> splits = new TreeSet<>();
- for (String split :
"a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z".split(",")) {
- splits.add(new Text(split));
- }
- log.info("Splitting table " + tableName);
- c.tableOperations().addSplits(tableName, splits);
- log.info("Balancing");
- c.instanceOperations().waitForBalance();
- log.info("Balanced");
+ try (AccumuloClient c =
Accumulo.newClient().from(getClientProperties()).build()) {
+ log.info("Creating table {}", tableName);
+ c.tableOperations().create(tableName);
+ final SortedSet<Text> splits = new TreeSet<>();
+ for (String split :
"a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z".split(",")) {
+ splits.add(new Text(split));
+ }
+ log.info("Splitting table {}", tableName);
+ c.tableOperations().addSplits(tableName, splits);
+ log.info("Balancing");
+ c.instanceOperations().waitForBalance();
+ log.info("Balanced");
- // create a new table which will unbalance the cluster
- final String table2 = tableNames[1];
- log.info("Creating table " + table2);
- c.tableOperations().create(table2);
- log.info("Creating splits " + table2);
- c.tableOperations().addSplits(table2, splits);
+ // create a new table which will unbalance the cluster
+ final String table2 = tableNames[1];
+ log.info("Creating table {}", table2);
+ c.tableOperations().create(table2);
+ log.info("Creating splits {}", table2);
+ c.tableOperations().addSplits(table2, splits);
- // offline the table, hopefully while there are some migrations going on
- log.info("Offlining " + table2);
- c.tableOperations().offline(table2, true);
- log.info("Offlined " + table2);
+ // offline the table, hopefully while there are some migrations going on
+ log.info("Offlining {}", table2);
+ c.tableOperations().offline(table2, true);
+ log.info("Offlined {}", table2);
- log.info("Waiting for balance");
+ log.info("Waiting for balance");
- SimpleThreadPool pool = new SimpleThreadPool(1, "waitForBalance");
- Future<Boolean> wait = pool.submit(new Callable<Boolean>() {
- @Override
- public Boolean call() throws Exception {
+ SimpleThreadPool pool = new SimpleThreadPool(1, "waitForBalance");
+ Future<Boolean> wait = pool.submit(() -> {
c.instanceOperations().waitForBalance();
return true;
- }
- });
- wait.get((2 * defaultTimeoutSeconds()) / 3, TimeUnit.SECONDS);
- log.info("Balance succeeded with an offline table");
+ });
- wait.get(20, TimeUnit.SECONDS);
++ wait.get((2 * defaultTimeoutSeconds()) / 3, TimeUnit.SECONDS);
+ log.info("Balance succeeded with an offline table");
+ }
}
}
diff --cc test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
index dbbdb5d,67a22a6..b409430
--- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@@ -114,27 -114,16 +114,27 @@@ public class ConditionalWriterIT extend
@Override
protected int defaultTimeoutSeconds() {
- return 60;
+ return 120;
}
- @Override
- public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration
hadoopCoreSite) {
- super.configureMiniCluster(cfg, hadoopCoreSite);
- // Set the min span to 0 so we will definitely get all the traces back.
See ACCUMULO-4365
- Map<String,String> siteConf = cfg.getSiteConfig();
- siteConf.put(Property.TRACE_SPAN_RECEIVER_PREFIX.getKey() +
"tracer.span.min.ms", "0");
- cfg.setSiteConfig(siteConf);
+ @BeforeClass
+ public static void setup() throws Exception {
+ SharedMiniClusterBase.startMiniClusterWithConfig(new Callback());
+ }
+
+ @AfterClass
+ public static void teardown() {
+ SharedMiniClusterBase.stopMiniCluster();
+ }
+
+ private static class Callback implements MiniClusterConfigurationCallback {
+ @Override
+ public void configureMiniCluster(MiniAccumuloConfigImpl cfg,
Configuration coreSite) {
+ // Set the min span to 0 so we will definitely get all the traces back.
See ACCUMULO-4365
+ Map<String,String> siteConf = cfg.getSiteConfig();
+ siteConf.put(Property.TRACE_SPAN_RECEIVER_PREFIX.getKey() +
"tracer.span.min.ms", "0");
+ cfg.setSiteConfig(siteConf);
+ }
}
public static long abs(long l) {
