[2/3] hbase git commit: Revert "HBASE-9465 Push entries to peer clusters serially"

[zhangduo]

http://git-wip-us.apache.org/repos/asf/hbase/blob/ba7a936f/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestSerialReplication.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestSerialReplication.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestSerialReplication.java
deleted file mode 100644
index b0f687c..000
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestSerialReplication.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * Copyright The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.replication;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.HTestConst;
-import org.apache.hadoop.hbase.MetaTableAccessor;
-import org.apache.hadoop.hbase.ServerName;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.ResultScanner;
-import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.client.Table;
-import org.apache.hadoop.hbase.client.replication.ReplicationAdmin;
-import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
-import org.apache.hadoop.hbase.testclassification.LargeTests;
-import org.apache.hadoop.hbase.testclassification.ReplicationTests;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
-import org.apache.hadoop.hbase.util.Pair;
-import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster;
-import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-@Category({ ReplicationTests.class, LargeTests.class })
-public class TestSerialReplication {
-  private static final Log LOG = 
LogFactory.getLog(TestSerialReplication.class);
-
-  private static Configuration conf1;
-  private static Configuration conf2;
-
-  private static HBaseTestingUtility utility1;
-  private static HBaseTestingUtility utility2;
-
-  private static final byte[] famName = Bytes.toBytes("f");
-  private static final byte[] VALUE = Bytes.toBytes("v");
-  private static final byte[] ROW = Bytes.toBytes("r");
-  private static final byte[][] ROWS = HTestConst.makeNAscii(ROW, 100);
-
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {
-conf1 = HBaseConfiguration.create();
-conf1.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/1");
-// smaller block size and capacity to trigger more operations
-// and test them
-conf1.setInt("hbase.regionserver.hlog.blocksize", 1024 * 20);
-conf1.setInt("replication.source.size.capacity", 1024);
-conf1.setLong("replication.source.sleepforretries", 100);
-conf1.setInt("hbase.regionserver.maxlogs", 10);
-conf1.setLong("hbase.master.logcleaner.ttl", 10);
-conf1.setBoolean("dfs.support.append", true);
-conf1.setLong(HConstants.THREAD_WAKE_FREQUENCY, 100);
-conf1.setStrings(CoprocessorHost.USER_REGION_COPROCESSOR_CONF_KEY,
-
"org.apache.hadoop.hbase.replication.TestMasterReplication$CoprocessorCounter");
-conf1.setLong("replication.source.per.peer.node.bandwidth", 100L);// Each 
WAL is 120 bytes
-conf1.setLong("replication.source.size.capacity", 1L);
-conf1.setLong(HConstants.REPLICATION_SERIALLY_WAITING_KEY, 1000L);
-conf1.setBoolean("hbase.assignment.usezk", 

[2/3] hbase git commit: Revert "HBASE-9465 Push entries to peer clusters serially"

[apurtell]

Revert "HBASE-9465 Push entries to peer clusters serially"

This reverts commit 441bc050b991c14c048617bc443b97f46e21b76f.

 Conflicts:

hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java

hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java

hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/WALProtos.java
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java

hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java

Signed-off-by: Andrew Purtell 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/93c91666
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/93c91666
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/93c91666

Branch: refs/heads/branch-1.4
Commit: 93c91666dcc4d97a4a2063f8afd5e5b80cd3b8fc
Parents: 6e4e67f
Author: Sean Busbey 
Authored: Tue Nov 7 23:50:35 2017 -0600
Committer: Andrew Purtell 
Committed: Wed Nov 8 10:00:08 2017 -0800

--
 .../apache/hadoop/hbase/HTableDescriptor.java   |  46 +--
 .../apache/hadoop/hbase/MetaTableAccessor.java  | 243 ++-
 .../client/replication/ReplicationAdmin.java|  14 +-
 .../org/apache/hadoop/hbase/HConstants.java |  26 --
 .../src/main/resources/hbase-default.xml|  14 -
 .../hbase/protobuf/generated/WALProtos.java |  16 +-
 hbase-protocol/src/main/protobuf/WAL.proto  |   1 -
 .../org/apache/hadoop/hbase/master/HMaster.java |   9 -
 .../hadoop/hbase/master/RegionStateStore.java   |  43 +-
 .../master/cleaner/ReplicationMetaCleaner.java  | 187 -
 .../RegionMergeTransactionImpl.java |   3 +-
 .../hbase/regionserver/ReplicationService.java  |   1 -
 .../regionserver/SplitTransactionImpl.java  |   2 +-
 .../replication/regionserver/Replication.java   |  14 +-
 .../regionserver/ReplicationSource.java |  68 +---
 .../regionserver/ReplicationSourceManager.java  |  87 +---
 .../ReplicationSourceWALReaderThread.java   |  31 --
 .../java/org/apache/hadoop/hbase/wal/WAL.java   |  16 -
 .../hadoop/hbase/TestMetaTableAccessor.java |  10 +-
 .../hadoop/hbase/client/TestMetaScanner.java|   2 +-
 .../master/TestAssignmentManagerOnCluster.java  |   2 +-
 .../replication/TestSerialReplication.java  | 401 ---
 .../regionserver/TestGlobalThrottler.java   |   2 +-
 23 files changed, 69 insertions(+), 1169 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/93c91666/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
index 1fd950a..7f48976 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
@@ -34,12 +34,13 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 
+import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.classification.InterfaceStability;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.client.Durability;
 import org.apache.hadoop.hbase.client.RegionReplicaUtil;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
@@ -51,7 +52,6 @@ import 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair;
 import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema;
 import org.apache.hadoop.hbase.regionserver.BloomType;
 import org.apache.hadoop.hbase.security.User;
-import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Writables;
 import org.apache.hadoop.io.WritableComparable;
@@ -1217,18 +1217,6 @@ public class HTableDescriptor implements 
WritableComparable {
   }
 
   /**
-   * Return true if there are at least one cf whose replication scope is 
serial.
-   */
-  public boolean hasSerialReplicationScope() {
-for (HColumnDescriptor column: getFamilies()){
-  if (column.getScope() == HConstants.REPLICATION_SCOPE_SERIAL){
-return true;
-  }
-}
-