hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-17270 Change Service to Task in BackupRestoreServerFactory (Vladimir Rodionov)
Date Wed, 07 Dec 2016 01:20:14 GMT
Repository: hbase
Updated Branches:
  refs/heads/HBASE-7912 72dfdc8a7 -> 512c1ed9c


HBASE-17270 Change Service to Task in BackupRestoreServerFactory (Vladimir Rodionov)


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

Branch: refs/heads/HBASE-7912
Commit: 512c1ed9c6a1eac9fa203b9f91986bc476051d34
Parents: 72dfdc8
Author: tedyu <yuzhihong@gmail.com>
Authored: Tue Dec 6 17:20:10 2016 -0800
Committer: tedyu <yuzhihong@gmail.com>
Committed: Tue Dec 6 17:20:10 2016 -0800

----------------------------------------------------------------------
 .../apache/hadoop/hbase/backup/BackupRestoreServerFactory.java   | 4 ++--
 .../apache/hadoop/hbase/backup/impl/FullTableBackupClient.java   | 2 +-
 .../hadoop/hbase/backup/impl/IncrementalTableBackupClient.java   | 2 +-
 .../org/apache/hadoop/hbase/backup/util/RestoreServerUtil.java   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/512c1ed9/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreServerFactory.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreServerFactory.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreServerFactory.java
index 06e367f..9f66f63 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreServerFactory.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreServerFactory.java
@@ -40,7 +40,7 @@ public final class BackupRestoreServerFactory {
    * @param conf - configuration
    * @return backup restore service instance
    */
-  public static RestoreTask getRestoreService(Configuration conf) {
+  public static RestoreTask getRestoreTask(Configuration conf) {
     Class<? extends RestoreTask> cls =
         conf.getClass(HBASE_INCR_RESTORE_IMPL_CLASS, MapReduceRestoreTask.class,
           RestoreTask.class);
@@ -54,7 +54,7 @@ public final class BackupRestoreServerFactory {
    * @param conf - configuration
    * @return backup copy service
    */
-  public static BackupCopyTask getBackupCopyService(Configuration conf) {
+  public static BackupCopyTask getBackupCopyTask(Configuration conf) {
     Class<? extends BackupCopyTask> cls =
         conf.getClass(HBASE_BACKUP_COPY_IMPL_CLASS, MapReduceBackupCopyTask.class,
           BackupCopyTask.class);

http://git-wip-us.apache.org/repos/asf/hbase/blob/512c1ed9/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java
index e068ede..dbb3800 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java
@@ -67,7 +67,7 @@ public class FullTableBackupClient extends TableBackupClient{
 
     // call ExportSnapshot to copy files based on hbase snapshot for backup
     // ExportSnapshot only support single snapshot export, need loop for multiple tables
case
-    BackupCopyTask copyService = BackupRestoreServerFactory.getBackupCopyService(conf);
+    BackupCopyTask copyService = BackupRestoreServerFactory.getBackupCopyTask(conf);
 
     // number of snapshots matches number of tables
     float numOfSnapshots = backupContext.getSnapshotNames().size();

http://git-wip-us.apache.org/repos/asf/hbase/blob/512c1ed9/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java
index 1da5b19..90f77a8 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java
@@ -95,7 +95,7 @@ public class IncrementalTableBackupClient extends TableBackupClient {
     String[] strArr = incrBackupFileList.toArray(new String[incrBackupFileList.size() + 1]);
     strArr[strArr.length - 1] = backupContext.getHLogTargetDir();
 
-    BackupCopyTask copyService = BackupRestoreServerFactory.getBackupCopyService(conf);
+    BackupCopyTask copyService = BackupRestoreServerFactory.getBackupCopyTask(conf);
     int counter = 0;
     int MAX_ITERAIONS = 2;
     while (counter++ < MAX_ITERAIONS) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/512c1ed9/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 1d0642b..4173004 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
@@ -242,7 +242,7 @@ public class RestoreServerUtil {
       }
     }
     RestoreTask restoreService =
-        BackupRestoreServerFactory.getRestoreService(conf);
+        BackupRestoreServerFactory.getRestoreTask(conf);
 
     restoreService.run(logDirs, tableNames, newTableNames, false);
     }
@@ -479,7 +479,7 @@ public class RestoreServerUtil {
         Path[] dirs = new Path[regionPathList.size()];
         regionPathList.toArray(dirs);
         RestoreTask restoreService =
-            BackupRestoreServerFactory.getRestoreService(conf);
+            BackupRestoreServerFactory.getRestoreTask(conf);
 
         restoreService.run(dirs, new TableName[] { tableName }, new TableName[] { newTableName
},
           true);


Mime
View raw message