Repository: hbase Updated Branches: refs/heads/14123 f976dd12f -> 7c1eb6536
http://git-wip-us.apache.org/repos/asf/hbase/blob/7c1eb653/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/RestoreServerUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/RestoreServerUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/RestoreServerUtil.java index 8a01a65..088bebc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/RestoreServerUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/RestoreServerUtil.java @@ -50,7 +50,6 @@ import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.io.HFileLink; -import org.apache.hadoop.hbase.io.hfile.CacheConfig; import org.apache.hadoop.hbase.io.hfile.HFile; import org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles; import org.apache.hadoop.hbase.regionserver.HRegionFileSystem; @@ -72,7 +71,7 @@ public class RestoreServerUtil { public static final Log LOG = LogFactory.getLog(RestoreServerUtil.class); - private final String[] ignoreDirs = { "recovered.edits" }; + private final String[] ignoreDirs = { HConstants.RECOVERED_EDITS_DIR }; private final long TABLE_AVAILABILITY_WAIT_TIME = 180000; @@ -545,23 +544,6 @@ public class RestoreServerUtil { */ private LoadIncrementalHFiles createLoader(Path tableArchivePath, boolean multipleTables) throws IOException { - // set configuration for restore: - // LoadIncrementalHFile needs more time - // <name>hbase.rpc.timeout</name> <value>600000</value> - // calculates - Integer milliSecInMin = 60000; - Integer previousMillis = this.conf.getInt("hbase.rpc.timeout", 0); - Integer numberOfFilesInDir = - multipleTables ? getMaxNumberOfFilesInSubDir(tableArchivePath) : - getNumberOfFilesInDir(tableArchivePath); - Integer calculatedMillis = numberOfFilesInDir * milliSecInMin; // 1 minute per file - Integer resultMillis = Math.max(calculatedMillis, previousMillis); - if (resultMillis > previousMillis) { - LOG.info("Setting configuration for restore with LoadIncrementalHFile: " - + "hbase.rpc.timeout to " + calculatedMillis / milliSecInMin - + " minutes, to handle the number of files in backup " + tableArchivePath); - this.conf.setInt("hbase.rpc.timeout", resultMillis); - } // By default, it is 32 and loader will fail if # of files in any region exceed this // limit. Bad for snapshot restore. @@ -632,7 +614,7 @@ public class RestoreServerUtil { || HFileLink.isHFileLink(hfile.getName())) { continue; } - HFile.Reader reader = HFile.createReader(fs, hfile, new CacheConfig(conf), conf); + HFile.Reader reader = HFile.createReader(fs, hfile, conf); final byte[] first, last; try { reader.loadFileInfo(); http://git-wip-us.apache.org/repos/asf/hbase/blob/7c1eb653/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileInputFormat2.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileInputFormat2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileInputFormat2.java index a00d390..b54a859 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileInputFormat2.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileInputFormat2.java @@ -27,7 +27,6 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathFilter; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.io.hfile.CacheConfig; import org.apache.hadoop.hbase.io.hfile.HFile; import org.apache.hadoop.hbase.io.hfile.HFile.Reader; import org.apache.hadoop.hbase.io.hfile.HFileScanner; @@ -87,7 +86,7 @@ public class HFileInputFormat2 extends FileInputFormat<NullWritable, Cell> { Path path = fileSplit.getPath(); FileSystem fs = path.getFileSystem(conf); LOG.info("Initialize HFileRecordReader for {}", path); - this.in = HFile.createReader(fs, path, new CacheConfig(conf), conf); + this.in = HFile.createReader(fs, path, conf); // The file info must be loaded before the scanner can be used. // This seems like a bug in HBase, but it's easily worked around. http://git-wip-us.apache.org/repos/asf/hbase/blob/7c1eb653/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java index ae4d02e..ed6e2a5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java @@ -99,7 +99,6 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.util.concurrent.ThreadFactoryBuilder; - /** * Tool to load the output of HFileOutputFormat into an existing table. */ @@ -963,7 +962,8 @@ public class LoadIncrementalHFiles extends Configured implements Tool { boolean success = false; try { LOG.debug("Going to connect to server " + getLocation() + " for row " - + Bytes.toStringBinary(getRow()) + " with hfile group " + famPaths); + + Bytes.toStringBinary(getRow()) + " with hfile group " + + LoadIncrementalHFiles.this.toString( famPaths)); byte[] regionName = getLocation().getRegionInfo().getRegionName(); try (Table table = conn.getTable(getTableName())) { secureClient = new SecureBulkLoadClient(getConf(), table); @@ -1031,6 +1031,21 @@ public class LoadIncrementalHFiles extends Configured implements Tool { } } + private final String toString(List<Pair<byte[], String>> list) { + StringBuffer sb = new StringBuffer(); + sb.append("["); + if(list != null){ + for(Pair<byte[], String> pair: list) { + sb.append("{"); + sb.append(Bytes.toStringBinary(pair.getFirst())); + sb.append(","); + sb.append(pair.getSecond()); + sb.append("}"); + } + } + sb.append("]"); + return sb.toString(); + } private boolean isSecureBulkLoadEndpointAvailable() { String classes = getConf().get(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY, ""); return classes.contains("org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint"); http://git-wip-us.apache.org/repos/asf/hbase/blob/7c1eb653/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java index 9d75e2e..189b470 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java @@ -49,10 +49,9 @@ public class ZKProcedureCoordinatorRpcs implements ProcedureCoordinatorRpcs { * @param procedureClass procedure type name is a category for when there are multiple kinds of * procedures.-- this becomes a znode so be aware of the naming restrictions * @param coordName name of the node running the coordinator - * @throws KeeperException if an unexpected zk error occurs */ public ZKProcedureCoordinatorRpcs(ZooKeeperWatcher watcher, - String procedureClass, String coordName) throws IOException { + String procedureClass, String coordName) { this.watcher = watcher; this.procedureType = procedureClass; this.coordName = coordName; http://git-wip-us.apache.org/repos/asf/hbase/blob/7c1eb653/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 6ac88be..4ab5ea6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -47,6 +47,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReentrantReadWriteLock; import javax.management.MalformedObjectNameException; @@ -374,7 +375,7 @@ public class HRegionServer extends HasThread implements // WAL roller. log is protected rather than private to avoid // eclipse warning when accessed by inner classes - public final LogRoller walRoller; + protected final LogRoller walRoller; // flag set after we're done setting up server threads final AtomicBoolean online = new AtomicBoolean(false); @@ -1911,6 +1912,10 @@ public class HRegionServer extends HasThread implements return wal; } + public LogRoller getWalRoller() { + return walRoller; + } + @Override public Connection getConnection() { return getClusterConnection(); http://git-wip-us.apache.org/repos/asf/hbase/blob/7c1eb653/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java index c95fdb0..05f166a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java @@ -41,7 +41,7 @@ import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.BackupInfo.BackupState; import org.apache.hadoop.hbase.backup.impl.BackupSystemTable; -import org.apache.hadoop.hbase.backup.impl.HBaseBackupAdmin; +import org.apache.hadoop.hbase.backup.impl.BackupAdminImpl; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; @@ -174,7 +174,7 @@ public class TestBackupBase { String backupId; try { conn = ConnectionFactory.createConnection(conf1); - badmin = new HBaseBackupAdmin(conn); + badmin = new BackupAdminImpl(conn); BackupRequest request = new BackupRequest(); request.setBackupType(type).setTableList(tables).setTargetRootDir(path); backupId = badmin.backupTables(request); @@ -272,7 +272,7 @@ public class TestBackupBase { } protected BackupAdmin getBackupAdmin() throws IOException { - return new HBaseBackupAdmin(TEST_UTIL.getConnection()); + return new BackupAdminImpl(TEST_UTIL.getConnection()); } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/7c1eb653/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupCommandLineTool.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupCommandLineTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupCommandLineTool.java index 3a632fc..af9691a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupCommandLineTool.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupCommandLineTool.java @@ -32,6 +32,19 @@ import org.junit.experimental.categories.Category; @Category(SmallTests.class) public class TestBackupCommandLineTool { + + private final static String USAGE_DESCRIBE = "Usage: bin/hbase backup describe <backup_id>"; + private final static String USAGE_CREATE = "Usage: bin/hbase backup create"; + private final static String USAGE_HISTORY = "Usage: bin/hbase backup history"; + private final static String USAGE_BACKUP = "Usage: bin/hbase backup"; + private final static String USAGE_DELETE = "Usage: bin/hbase backup delete"; + private final static String USAGE_PROGRESS = "Usage: bin/hbase backup progress"; + private final static String USAGE_SET = "Usage: bin/hbase backup set"; + private final static String USAGE_RESTORE = "Usage: bin/hbase restore"; + + + + Configuration conf; @Before public void setUpBefore() throws Exception { @@ -48,7 +61,7 @@ public class TestBackupCommandLineTool { String output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup describe <backupId>") >= 0); + assertTrue(output.indexOf(USAGE_DESCRIBE) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -57,7 +70,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup describe <backupId>") >= 0); + assertTrue(output.indexOf(USAGE_DESCRIBE) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -66,7 +79,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup describe <backupId>") >= 0); + assertTrue(output.indexOf(USAGE_DESCRIBE) >= 0); } @Test @@ -78,7 +91,7 @@ public class TestBackupCommandLineTool { String output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup create") >= 0); + assertTrue(output.indexOf(USAGE_CREATE) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -87,7 +100,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup create") >= 0); + assertTrue(output.indexOf(USAGE_CREATE) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -96,7 +109,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup create") >= 0); + assertTrue(output.indexOf(USAGE_CREATE) >= 0); } @Test @@ -108,7 +121,7 @@ public class TestBackupCommandLineTool { String output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup history") >= 0); + assertTrue(output.indexOf(USAGE_HISTORY) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -117,7 +130,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup history") >= 0); + assertTrue(output.indexOf(USAGE_HISTORY) >= 0); } @@ -130,7 +143,7 @@ public class TestBackupCommandLineTool { String output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup delete") >= 0); + assertTrue(output.indexOf(USAGE_DELETE) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -139,7 +152,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup delete") >= 0); + assertTrue(output.indexOf(USAGE_DELETE) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -148,7 +161,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup delete") >= 0); + assertTrue(output.indexOf(USAGE_DELETE) >= 0); } @Test @@ -160,7 +173,7 @@ public class TestBackupCommandLineTool { String output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup progress") >= 0); + assertTrue(output.indexOf(USAGE_PROGRESS) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -169,7 +182,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup progress") >= 0); + assertTrue(output.indexOf(USAGE_PROGRESS) >= 0); } @Test @@ -181,7 +194,7 @@ public class TestBackupCommandLineTool { String output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup set") >= 0); + assertTrue(output.indexOf(USAGE_SET) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -190,7 +203,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup set") >= 0); + assertTrue(output.indexOf(USAGE_SET) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -199,7 +212,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup set") >= 0); + assertTrue(output.indexOf(USAGE_SET) >= 0); } @@ -212,7 +225,7 @@ public class TestBackupCommandLineTool { String output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup") >= 0); + assertTrue(output.indexOf(USAGE_BACKUP) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -221,7 +234,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup") >= 0); + assertTrue(output.indexOf(USAGE_BACKUP) >= 0); } @Test @@ -233,7 +246,7 @@ public class TestBackupCommandLineTool { String output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase restore") >= 0); + assertTrue(output.indexOf(USAGE_RESTORE) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -242,7 +255,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase restore") >= 0); + assertTrue(output.indexOf(USAGE_RESTORE) >= 0); } @Test @@ -254,7 +267,7 @@ public class TestBackupCommandLineTool { String output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup") >= 0); + assertTrue(output.indexOf(USAGE_BACKUP) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -263,7 +276,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup") >= 0); + assertTrue(output.indexOf(USAGE_BACKUP) >= 0); } @@ -277,7 +290,7 @@ public class TestBackupCommandLineTool { String output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup") >= 0); + assertTrue(output.indexOf(USAGE_BACKUP) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -286,7 +299,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup") >= 0); + assertTrue(output.indexOf(USAGE_BACKUP) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -295,7 +308,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup") >= 0); + assertTrue(output.indexOf(USAGE_BACKUP) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -304,7 +317,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup") >= 0); + assertTrue(output.indexOf(USAGE_BACKUP) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -313,7 +326,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup") >= 0); + assertTrue(output.indexOf(USAGE_BACKUP) >= 0); } @Test @@ -325,7 +338,7 @@ public class TestBackupCommandLineTool { String output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase restore") >= 0); + assertTrue(output.indexOf(USAGE_RESTORE) >= 0); } @@ -338,7 +351,7 @@ public class TestBackupCommandLineTool { String output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup create") >= 0); + assertTrue(output.indexOf(USAGE_CREATE) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -347,7 +360,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup create") >= 0); + assertTrue(output.indexOf(USAGE_CREATE) >= 0); baos = new ByteArrayOutputStream(); System.setOut(new PrintStream(baos)); @@ -356,7 +369,7 @@ public class TestBackupCommandLineTool { output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup create") >= 0); + assertTrue(output.indexOf(USAGE_CREATE) >= 0); } @Test @@ -368,7 +381,7 @@ public class TestBackupCommandLineTool { String output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup delete") >= 0); + assertTrue(output.indexOf(USAGE_DELETE) >= 0); } @@ -381,7 +394,7 @@ public class TestBackupCommandLineTool { String output = baos.toString(); System.out.println(baos.toString()); - assertTrue(output.indexOf("Usage: bin/hbase backup history") >= 0); + assertTrue(output.indexOf(USAGE_HISTORY) >= 0); } http://git-wip-us.apache.org/repos/asf/hbase/blob/7c1eb653/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDescribe.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDescribe.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDescribe.java index 6db3bf3..57548fc 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDescribe.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDescribe.java @@ -57,13 +57,13 @@ public class TestBackupDescribe extends TestBackupBase { assertTrue(ret < 0); ByteArrayOutputStream baos = new ByteArrayOutputStream(); - System.setOut(new PrintStream(baos)); + System.setErr(new PrintStream(baos)); args = new String[]{"progress" }; ToolRunner.run(TEST_UTIL.getConfiguration(), new BackupDriver(), args); String output = baos.toString(); LOG.info("Output from progress: " + output); - assertTrue(output.indexOf(BackupCommands.NO_INFO_FOUND) >= 0); + assertTrue(output.indexOf(BackupCommands.NO_ACTIVE_SESSION_FOUND) >= 0); } @Test http://git-wip-us.apache.org/repos/asf/hbase/blob/7c1eb653/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupMultipleDeletes.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupMultipleDeletes.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupMultipleDeletes.java index 1caba22..f4b9499 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupMultipleDeletes.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupMultipleDeletes.java @@ -28,7 +28,7 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.backup.impl.HBaseBackupAdmin; +import org.apache.hadoop.hbase.backup.impl.BackupAdminImpl; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.HBaseAdmin; @@ -60,7 +60,7 @@ public class TestBackupMultipleDeletes extends TestBackupBase { HBaseAdmin admin = null; Connection conn = ConnectionFactory.createConnection(conf1); admin = (HBaseAdmin) conn.getAdmin(); - BackupAdmin client = new HBaseBackupAdmin(conn); + BackupAdmin client = new BackupAdminImpl(conn); BackupRequest request = new BackupRequest(); request.setBackupType(BackupType.FULL).setTableList(tables).setTargetRootDir(BACKUP_ROOT_DIR); String backupIdFull = client.backupTables(request); http://git-wip-us.apache.org/repos/asf/hbase/blob/7c1eb653/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java index 9a845ba..38872d2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java @@ -30,7 +30,7 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.backup.impl.HBaseBackupAdmin; +import org.apache.hadoop.hbase.backup.impl.BackupAdminImpl; import org.apache.hadoop.hbase.backup.util.RestoreServerUtil; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; @@ -84,7 +84,7 @@ public class TestIncrementalBackup extends TestBackupBase { HBaseAdmin admin = null; admin = (HBaseAdmin) conn.getAdmin(); - HBaseBackupAdmin client = new HBaseBackupAdmin(conn); + BackupAdminImpl client = new BackupAdminImpl(conn); BackupRequest request = new BackupRequest(); request.setBackupType(BackupType.FULL).setTableList(tables).setTargetRootDir(BACKUP_ROOT_DIR); http://git-wip-us.apache.org/repos/asf/hbase/blob/7c1eb653/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackupDeleteTable.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackupDeleteTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackupDeleteTable.java index 52e247c..973e787 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackupDeleteTable.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackupDeleteTable.java @@ -25,7 +25,7 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.backup.impl.HBaseBackupAdmin; +import org.apache.hadoop.hbase.backup.impl.BackupAdminImpl; import org.apache.hadoop.hbase.backup.util.RestoreServerUtil; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; @@ -63,7 +63,7 @@ public class TestIncrementalBackupDeleteTable extends TestBackupBase { HBaseAdmin admin = null; Connection conn = ConnectionFactory.createConnection(conf1); admin = (HBaseAdmin) conn.getAdmin(); - HBaseBackupAdmin client = new HBaseBackupAdmin(conn); + BackupAdminImpl client = new BackupAdminImpl(conn); BackupRequest request = new BackupRequest(); request.setBackupType(BackupType.FULL).setTableList(tables).setTargetRootDir(BACKUP_ROOT_DIR); http://git-wip-us.apache.org/repos/asf/hbase/blob/7c1eb653/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java index 8609f7f..2741d7f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java @@ -213,17 +213,6 @@ public class MockNoopMasterServices implements MasterServices, Server { return null; //To change body of implemented methods use File | Settings | File Templates. } - - /* - * Restore table set - */ - public long restoreTables(String backupRootDir, - String backupId, boolean check, List<TableName> sTableList, - List<TableName> tTableList, boolean isOverwrite, long nonceGroup, long nonce) - throws IOException { - return -1; - } - @Override public List<HTableDescriptor> listTableDescriptorsByNamespace(String name) throws IOException { return null; //To change body of implemented methods use File | Settings | File Templates. http://git-wip-us.apache.org/repos/asf/hbase/blob/7c1eb653/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java index 9adfaee..7c1158e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java @@ -101,6 +101,7 @@ import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.wal.AbstractFSWALProvider; +import org.apache.hadoop.hbase.wal.FSHLogProvider; import org.apache.hadoop.hbase.wal.WAL; import org.apache.hadoop.hbase.wal.WALFactory; import org.apache.hadoop.hbase.wal.WALSplitter;
