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/02/24 22:10:15 UTC

[accumulo] branch master updated (9f487a0 -> 9b633b3)

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 9f487a0  Switch to Log4j2 (#1528)
     add 1775486  Re #1492 Disable unreliable replication tests (#1524)
     new 9b633b3  Merge branch '1.9'

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:
 .../accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java    | 2 ++
 .../java/org/apache/accumulo/test/replication/CyclicReplicationIT.java  | 2 ++
 .../org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java     | 2 ++
 .../test/replication/GarbageCollectorCommunicatesWithTServersIT.java    | 2 ++
 .../org/apache/accumulo/test/replication/KerberosReplicationIT.java     | 2 ++
 .../apache/accumulo/test/replication/MultiInstanceReplicationIT.java    | 2 ++
 .../org/apache/accumulo/test/replication/MultiTserverReplicationIT.java | 2 ++
 .../accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java   | 2 ++
 .../main/java/org/apache/accumulo/test/replication/ReplicationIT.java   | 2 ++
 .../apache/accumulo/test/replication/ReplicationOperationsImplIT.java   | 2 ++
 .../org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java  | 2 ++
 .../java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java  | 2 ++
 .../main/java/org/apache/accumulo/test/replication/StatusMakerIT.java   | 2 ++
 .../org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java   | 2 ++
 .../accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java   | 2 ++
 .../test/replication/UnusedWalDoesntCloseReplicationStatusIT.java       | 2 ++
 .../src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java | 2 ++
 17 files changed, 34 insertions(+)


[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 9b633b32e494f7b970ff43145f879550b47f7789
Merge: 9f487a0 1775486
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Mon Feb 24 17:10:04 2020 -0500

    Merge branch '1.9'

 .../accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java    | 2 ++
 .../java/org/apache/accumulo/test/replication/CyclicReplicationIT.java  | 2 ++
 .../org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java     | 2 ++
 .../test/replication/GarbageCollectorCommunicatesWithTServersIT.java    | 2 ++
 .../org/apache/accumulo/test/replication/KerberosReplicationIT.java     | 2 ++
 .../apache/accumulo/test/replication/MultiInstanceReplicationIT.java    | 2 ++
 .../org/apache/accumulo/test/replication/MultiTserverReplicationIT.java | 2 ++
 .../accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java   | 2 ++
 .../main/java/org/apache/accumulo/test/replication/ReplicationIT.java   | 2 ++
 .../apache/accumulo/test/replication/ReplicationOperationsImplIT.java   | 2 ++
 .../org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java  | 2 ++
 .../java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java  | 2 ++
 .../main/java/org/apache/accumulo/test/replication/StatusMakerIT.java   | 2 ++
 .../org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java   | 2 ++
 .../accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java   | 2 ++
 .../test/replication/UnusedWalDoesntCloseReplicationStatusIT.java       | 2 ++
 .../src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java | 2 ++
 17 files changed, 34 insertions(+)

diff --cc test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
index 088e01f,55e9087..c3e8a5c
--- a/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
@@@ -58,8 -55,9 +58,9 @@@ import org.apache.accumulo.server.repli
  import org.apache.accumulo.test.functional.ConfigurableMacBase;
  import org.apache.hadoop.io.Text;
  import org.easymock.EasyMock;
 -import org.easymock.IAnswer;
 +import org.junit.After;
  import org.junit.Before;
+ import org.junit.Ignore;
  import org.junit.Test;
  
  import com.google.common.collect.Iterables;
diff --cc test/src/main/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
index 15f2773,300d043..86b437f
--- a/test/src/main/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
@@@ -69,8 -69,7 +70,9 @@@ import org.slf4j.LoggerFactory
  
  import com.google.common.collect.Iterables;
  
 +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 +
+ @Ignore("Replication ITs are not stable and not currently maintained")
  @Category(MiniClusterOnlyTests.class)
  public class CyclicReplicationIT {
    private static final Logger log = LoggerFactory.getLogger(CyclicReplicationIT.class);
diff --cc test/src/main/java/org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java
index 53ba61d,d8264f1..bbbb725
--- a/test/src/main/java/org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java
@@@ -46,9 -43,10 +47,10 @@@ import org.junit.Test
  
  import com.google.common.collect.Iterables;
  
+ @Ignore("Replication ITs are not stable and not currently maintained")
  public class FinishedWorkUpdaterIT extends ConfigurableMacBase {
  
 -  private Connector conn;
 +  private AccumuloClient client;
    private FinishedWorkUpdater updater;
  
    @Before
diff --cc test/src/main/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java
index 5cef857,5343b32..d5fecb9
--- a/test/src/main/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java
@@@ -35,11 -31,12 +35,12 @@@ import org.apache.accumulo.core.conf.Pr
  import org.apache.accumulo.core.replication.ReplicationConstants;
  import org.apache.accumulo.core.security.Authorizations;
  import org.apache.accumulo.core.util.HostAndPort;
 -import org.apache.accumulo.core.zookeeper.ZooUtil;
  import org.apache.accumulo.fate.zookeeper.ZooReader;
 -import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 +import org.apache.accumulo.fate.zookeeper.ZooUtil;
 +import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
  import org.apache.accumulo.test.functional.ConfigurableMacBase;
  import org.apache.hadoop.conf.Configuration;
+ import org.junit.Ignore;
  import org.junit.Test;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
diff --cc test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
index 5fe22da,2cc2ccf..dc301bf
--- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
@@@ -122,9 -118,10 +123,10 @@@ import com.google.protobuf.TextFormat
   * MockReplicaSystem is used to "fake" the peer instance that we're replicating to. This lets us
   * test replication in a functional way without having to worry about two real systems.
   */
+ @Ignore("Replication ITs are not stable and not currently maintained")
  public class ReplicationIT extends ConfigurableMacBase {
    private static final Logger log = LoggerFactory.getLogger(ReplicationIT.class);
 -  private static final long MILLIS_BETWEEN_REPLICATION_TABLE_ONLINE_CHECKS = 5000l;
 +  private static final long MILLIS_BETWEEN_REPLICATION_TABLE_ONLINE_CHECKS = 5000L;
  
    @Override
    public int defaultTimeoutSeconds() {
diff --cc test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java
index 98e9bcb,2eb6898..010cba7
--- a/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java
@@@ -47,11 -42,14 +47,13 @@@ import org.apache.accumulo.server.zooke
  import org.apache.accumulo.test.functional.ConfigurableMacBase;
  import org.apache.hadoop.io.Text;
  import org.junit.Before;
+ import org.junit.Ignore;
  import org.junit.Test;
  
+ @Ignore("Replication ITs are not stable and not currently maintained")
  public class SequentialWorkAssignerIT extends ConfigurableMacBase {
  
 -  private Connector conn;
 +  private AccumuloClient client;
    private MockSequentialWorkAssigner assigner;
  
    private static class MockSequentialWorkAssigner extends SequentialWorkAssigner {
diff --cc test/src/main/java/org/apache/accumulo/test/replication/StatusMakerIT.java
index 52caf21,f93b255..874318e
--- a/test/src/main/java/org/apache/accumulo/test/replication/StatusMakerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/StatusMakerIT.java
@@@ -65,9 -62,10 +66,10 @@@ import org.junit.Test
  import com.google.common.collect.Iterables;
  import com.google.common.collect.Sets;
  
+ @Ignore("Replication ITs are not stable and not currently maintained")
  public class StatusMakerIT extends ConfigurableMacBase {
  
 -  private Connector conn;
 +  private AccumuloClient client;
    private VolumeManager fs;
  
    @Before
diff --cc test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java
index 2cafd48,6508007..52d8927
--- a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java
@@@ -48,11 -44,13 +48,13 @@@ import org.apache.accumulo.test.functio
  import org.apache.hadoop.fs.Path;
  import org.apache.hadoop.io.Text;
  import org.junit.Before;
+ import org.junit.Ignore;
  import org.junit.Test;
  
+ @Ignore("Replication ITs are not stable and not currently maintained")
  public class UnorderedWorkAssignerIT extends ConfigurableMacBase {
  
 -  private Connector conn;
 +  private AccumuloClient client;
    private MockUnorderedWorkAssigner assigner;
  
    private static class MockUnorderedWorkAssigner extends UnorderedWorkAssigner {
diff --cc test/src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java
index a2bc60e,6aacd14..7a153db
--- a/test/src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java
@@@ -47,13 -43,16 +47,15 @@@ import org.apache.accumulo.test.functio
  import org.apache.hadoop.fs.Path;
  import org.apache.hadoop.io.Text;
  import org.junit.Before;
+ import org.junit.Ignore;
  import org.junit.Test;
  
 -import com.google.common.collect.ImmutableMap;
  import com.google.common.collect.Iterables;
  
+ @Ignore("Replication ITs are not stable and not currently maintained")
  public class WorkMakerIT extends ConfigurableMacBase {
  
 -  private Connector conn;
 +  private AccumuloClient client;
  
    private static class MockWorkMaker extends WorkMaker {