You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2020/01/31 13:48:21 UTC

[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] 01/01: Merge branch '1.9'

Posted by ct...@apache.org.
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 <ct...@apache.org>
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);
    }