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..0000000
--- 
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", false);
-
-    utility1 = new HBaseTestingUtility(conf1);
-    utility1.startMiniZKCluster();
-    MiniZooKeeperCluster miniZK = utility1.getZkCluster();
-    new ZooKeeperWatcher(conf1, "cluster1", null, true);
-
-    conf2 = new Configuration(conf1);
-    conf2.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/2");
-
-    utility2 = new HBaseTestingUtility(conf2);
-    utility2.setZkCluster(miniZK);
-    new ZooKeeperWatcher(conf2, "cluster2", null, true);
-
-    ReplicationAdmin admin1 = new ReplicationAdmin(conf1);
-    ReplicationPeerConfig rpc = new ReplicationPeerConfig();
-    rpc.setClusterKey(utility2.getClusterKey());
-    admin1.addPeer("1", rpc, null);
-
-    utility1.startMiniCluster(1, 3);
-    utility2.startMiniCluster(1, 1);
-
-    utility1.getHBaseAdmin().setBalancerRunning(false, true);
-  }
-
-  @Test
-  public void testRegionMoveAndFailover() throws Exception {
-    TableName tableName = TableName.valueOf("testRSFailover");
-    HTableDescriptor table = new HTableDescriptor(tableName);
-    HColumnDescriptor fam = new HColumnDescriptor(famName);
-    fam.setScope(HConstants.REPLICATION_SCOPE_SERIAL);
-    table.addFamily(fam);
-    utility1.getHBaseAdmin().createTable(table);
-    utility2.getHBaseAdmin().createTable(table);
-    try(Table t1 = utility1.getConnection().getTable(tableName);
-        Table t2 = utility2.getConnection().getTable(tableName)) {
-      LOG.info("move to 1");
-      moveRegion(t1, 1);
-      LOG.info("move to 0");
-      moveRegion(t1, 0);
-      for (int i = 10; i < 20; i++) {
-        Put put = new Put(ROWS[i]);
-        put.addColumn(famName, VALUE, VALUE);
-        t1.put(put);
-      }
-      LOG.info("move to 2");
-      moveRegion(t1, 2);
-      for (int i = 20; i < 30; i++) {
-        Put put = new Put(ROWS[i]);
-        put.addColumn(famName, VALUE, VALUE);
-        t1.put(put);
-      }
-      utility1.getHBaseCluster().abortRegionServer(2);
-      for (int i = 30; i < 40; i++) {
-        Put put = new Put(ROWS[i]);
-        put.addColumn(famName, VALUE, VALUE);
-        t1.put(put);
-      }
-
-      long start = EnvironmentEdgeManager.currentTime();
-      while (EnvironmentEdgeManager.currentTime() - start < 18000000) {
-        Scan scan = new Scan();
-        scan.setCaching(100);
-        List<Cell> list = new ArrayList<>();
-        try (ResultScanner results = t2.getScanner(scan)) {
-          for (Result result : results) {
-            assertEquals(1, result.rawCells().length);
-            list.add(result.rawCells()[0]);
-          }
-        }
-        List<Integer> listOfNumbers = getRowNumbers(list);
-        LOG.info(Arrays.toString(listOfNumbers.toArray()));
-        assertIntegerList(listOfNumbers, 10, 1);
-        if (listOfNumbers.size() != 30) {
-          LOG.info("Waiting all logs pushed to slave. Expected 30 , actual " + 
list.size());
-          Thread.sleep(200);
-          continue;
-        }
-        return;
-      }
-      throw new Exception("Not all logs have been pushed");
-    } finally {
-      utility1.getHBaseAdmin().disableTable(tableName);
-      utility2.getHBaseAdmin().disableTable(tableName);
-      utility1.getHBaseAdmin().deleteTable(tableName);
-      utility2.getHBaseAdmin().deleteTable(tableName);
-    }
-  }
-
-  @Test
-  public void testRegionSplit() throws Exception {
-    TableName tableName = TableName.valueOf("testRegionSplit");
-    HTableDescriptor table = new HTableDescriptor(tableName);
-    HColumnDescriptor fam = new HColumnDescriptor(famName);
-    fam.setScope(HConstants.REPLICATION_SCOPE_SERIAL);
-    table.addFamily(fam);
-    utility1.getHBaseAdmin().createTable(table);
-    utility2.getHBaseAdmin().createTable(table);
-    try(Table t1 = utility1.getConnection().getTable(tableName);
-        Table t2 = utility2.getConnection().getTable(tableName)) {
-
-      for (int i = 10; i < 100; i += 10) {
-        Put put = new Put(ROWS[i]);
-        put.addColumn(famName, VALUE, VALUE);
-        t1.put(put);
-      }
-      utility1.getHBaseAdmin().split(tableName, ROWS[50]);
-      Thread.sleep(5000L);
-      for (int i = 11; i < 100; i += 10) {
-        Put put = new Put(ROWS[i]);
-        put.addColumn(famName, VALUE, VALUE);
-        t1.put(put);
-      }
-      balanceTwoRegions(t1);
-      for (int i = 12; i < 100; i += 10) {
-        Put put = new Put(ROWS[i]);
-        put.addColumn(famName, VALUE, VALUE);
-        t1.put(put);
-      }
-
-      long start = EnvironmentEdgeManager.currentTime();
-      while (EnvironmentEdgeManager.currentTime() - start < 180000) {
-        Scan scan = new Scan();
-        scan.setCaching(100);
-        List<Cell> list = new ArrayList<>();
-        try (ResultScanner results = t2.getScanner(scan)) {
-          for (Result result : results) {
-            assertEquals(1, result.rawCells().length);
-            list.add(result.rawCells()[0]);
-          }
-        }
-        List<Integer> listOfNumbers = getRowNumbers(list);
-        List<Integer> list0 = new ArrayList<>();
-        List<Integer> list1 = new ArrayList<>();
-        List<Integer> list21 = new ArrayList<>();
-        List<Integer> list22 = new ArrayList<>();
-        for (int num : listOfNumbers) {
-          if (num % 10 == 0) {
-            list0.add(num);
-          } else if (num % 10 == 1) {
-            list1.add(num);
-          } else if (num < 50) { //num%10==2
-            list21.add(num);
-          } else { // num%10==1&&num>50
-            list22.add(num);
-          }
-        }
-
-        LOG.info(Arrays.toString(list0.toArray()));
-        LOG.info(Arrays.toString(list1.toArray()));
-        LOG.info(Arrays.toString(list21.toArray()));
-        LOG.info(Arrays.toString(list22.toArray()));
-        assertIntegerList(list0, 10, 10);
-        assertIntegerList(list1, 11, 10);
-        assertIntegerList(list21, 12, 10);
-        assertIntegerList(list22, 52, 10);
-        if (!list1.isEmpty()) {
-          assertEquals(9, list0.size());
-        }
-        if (!list21.isEmpty() || !list22.isEmpty()) {
-          assertEquals(9, list1.size());
-        }
-
-        if (list.size() == 27) {
-          return;
-        }
-        LOG.info("Waiting all logs pushed to slave. Expected 27 , actual " + 
list.size());
-        Thread.sleep(200);
-      }
-      throw new Exception("Not all logs have been pushed");
-    } finally {
-      utility1.getHBaseAdmin().disableTable(tableName);
-      utility2.getHBaseAdmin().disableTable(tableName);
-      utility1.getHBaseAdmin().deleteTable(tableName);
-      utility2.getHBaseAdmin().deleteTable(tableName);
-    }
-  }
-
-  @Test
-  public void testRegionMerge() throws Exception {
-    TableName tableName = TableName.valueOf("testRegionMerge");
-    HTableDescriptor table = new HTableDescriptor(tableName);
-    HColumnDescriptor fam = new HColumnDescriptor(famName);
-    fam.setScope(HConstants.REPLICATION_SCOPE_SERIAL);
-    table.addFamily(fam);
-    utility1.getHBaseAdmin().createTable(table);
-    utility2.getHBaseAdmin().createTable(table);
-    utility1.getHBaseAdmin().split(tableName, ROWS[50]);
-    Thread.sleep(5000L);
-
-    try(Table t1 = utility1.getConnection().getTable(tableName);
-        Table t2 = utility2.getConnection().getTable(tableName)) {
-      for (int i = 10; i < 100; i += 10) {
-        Put put = new Put(ROWS[i]);
-        put.addColumn(famName, VALUE, VALUE);
-        t1.put(put);
-      }
-      List<Pair<HRegionInfo, ServerName>> regions =
-          
MetaTableAccessor.getTableRegionsAndLocations(utility1.getZooKeeperWatcher(),
-              utility1.getConnection(), tableName);
-      assertEquals(2, regions.size());
-      
utility1.getHBaseAdmin().mergeRegions(regions.get(0).getFirst().getRegionName(),
-          regions.get(1).getFirst().getRegionName(), true);
-      for (int i = 11; i < 100; i += 10) {
-        Put put = new Put(ROWS[i]);
-        put.addColumn(famName, VALUE, VALUE);
-        t1.put(put);
-      }
-
-      long start = EnvironmentEdgeManager.currentTime();
-      while (EnvironmentEdgeManager.currentTime() - start < 180000) {
-        Scan scan = new Scan();
-        scan.setCaching(100);
-        List<Cell> list = new ArrayList<>();
-        try (ResultScanner results = t2.getScanner(scan)) {
-          for (Result result : results) {
-            assertEquals(1, result.rawCells().length);
-            list.add(result.rawCells()[0]);
-          }
-        }
-        List<Integer> listOfNumbers = getRowNumbers(list);
-        List<Integer> list0 = new ArrayList<>();
-        List<Integer> list1 = new ArrayList<>();
-        for (int num : listOfNumbers) {
-          if (num % 10 == 0) {
-            list0.add(num);
-          } else {
-            list1.add(num);
-          }
-        }
-        LOG.info(Arrays.toString(list0.toArray()));
-        LOG.info(Arrays.toString(list1.toArray()));
-        assertIntegerList(list0, 10, 10);
-        assertIntegerList(list1, 11, 10);
-        if (!list1.isEmpty()) {
-          assertEquals(9, list0.size());
-        }
-        if (list.size() == 18) {
-          return;
-        }
-        LOG.info("Waiting all logs pushed to slave. Expected 18 , actual " + 
list.size());
-        Thread.sleep(200);
-      }
-    } finally {
-      utility1.getHBaseAdmin().disableTable(tableName);
-      utility2.getHBaseAdmin().disableTable(tableName);
-      utility1.getHBaseAdmin().deleteTable(tableName);
-      utility2.getHBaseAdmin().deleteTable(tableName);
-    }
-  }
-
-  private List<Integer> getRowNumbers(List<Cell> cells) {
-    List<Integer> listOfRowNumbers = new ArrayList<>();
-    for (Cell c : cells) {
-      listOfRowNumbers.add(Integer.parseInt(Bytes
-          .toString(c.getRowArray(), c.getRowOffset() + ROW.length,
-              c.getRowLength() - ROW.length)));
-    }
-    return listOfRowNumbers;
-  }
-
-  @AfterClass
-  public static void setUpAfterClass() throws Exception {
-    utility2.shutdownMiniCluster();
-    utility1.shutdownMiniCluster();
-  }
-
-  private void moveRegion(Table table, int index) throws IOException {
-    List<Pair<HRegionInfo, ServerName>> regions =
-        
MetaTableAccessor.getTableRegionsAndLocations(utility1.getZooKeeperWatcher(),
-            utility1.getConnection(), table.getName());
-    assertEquals(1, regions.size());
-    HRegionInfo regionInfo = regions.get(0).getFirst();
-    ServerName name = 
utility1.getHBaseCluster().getRegionServer(index).getServerName();
-    utility1.getHBaseAdmin()
-        .move(regionInfo.getEncodedNameAsBytes(), 
Bytes.toBytes(name.getServerName()));
-    try {
-      Thread.sleep(5000L); // wait to complete
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-    }
-  }
-
-  private void balanceTwoRegions(Table table) throws Exception {
-    List<Pair<HRegionInfo, ServerName>> regions =
-        
MetaTableAccessor.getTableRegionsAndLocations(utility1.getZooKeeperWatcher(),
-            utility1.getConnection(), table.getName());
-    assertEquals(2, regions.size());
-    HRegionInfo regionInfo1 = regions.get(0).getFirst();
-    ServerName name1 = 
utility1.getHBaseCluster().getRegionServer(0).getServerName();
-    HRegionInfo regionInfo2 = regions.get(1).getFirst();
-    ServerName name2 = 
utility1.getHBaseCluster().getRegionServer(1).getServerName();
-    utility1.getHBaseAdmin()
-        .move(regionInfo1.getEncodedNameAsBytes(), 
Bytes.toBytes(name1.getServerName()));
-    Thread.sleep(5000L);
-    utility1.getHBaseAdmin()
-        .move(regionInfo2.getEncodedNameAsBytes(), 
Bytes.toBytes(name2.getServerName()));
-    Thread.sleep(5000L);
-  }
-
-  private void assertIntegerList(List<Integer> list, int start, int step) {
-    for (int i = 0; i < list.size(); i++) {
-      assertTrue(list.get(i) == start + step * i);
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/ba7a936f/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestGlobalThrottler.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestGlobalThrottler.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestGlobalThrottler.java
index 48ef781..6e19fc2 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestGlobalThrottler.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestGlobalThrottler.java
@@ -115,7 +115,7 @@ public class TestGlobalThrottler {
     TableName tableName = TableName.valueOf("testQuota");
     HTableDescriptor table = new HTableDescriptor(tableName);
     HColumnDescriptor fam = new HColumnDescriptor(famName);
-    fam.setScope(HConstants.REPLICATION_SCOPE_SERIAL);
+    fam.setScope(HConstants.REPLICATION_SCOPE_LOCAL);
     table.addFamily(fam);
     utility1.getHBaseAdmin().createTable(table);
     utility2.getHBaseAdmin().createTable(table);

Reply via email to