You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jm...@apache.org on 2013/02/13 19:50:34 UTC
svn commit: r1445842 - in
/hbase/branches/hbase-7290/hbase-server/src/main/java/org/apache/hadoop/hbase:
snapshot/RestoreSnapshotHelper.java util/ModifyRegionUtils.java
Author: jmhsieh
Date: Wed Feb 13 18:50:34 2013
New Revision: 1445842
URL: http://svn.apache.org/r1445842
Log:
HBASE-7453 HBASE-7423 snapshot followup (Matteo Bertozzi)
Modified:
hbase/branches/hbase-7290/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java
hbase/branches/hbase-7290/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java
Modified: hbase/branches/hbase-7290/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java?rev=1445842&r1=1445841&r2=1445842&view=diff
==============================================================================
--- hbase/branches/hbase-7290/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java (original)
+++ hbase/branches/hbase-7290/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java Wed Feb 13 18:50:34 2013
@@ -169,7 +169,7 @@ public class RestoreSnapshotHelper {
// Remove regions from the current table
monitor.rethrowException();
- ModifyRegionUtils.deleteRegions(fs, catalogTracker, regionsToRemove);
+ ModifyRegionUtils.deleteRegions(conf, fs, catalogTracker, regionsToRemove);
}
// Regions to Add: present in the snapshot but not in the current table
Modified: hbase/branches/hbase-7290/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java?rev=1445842&r1=1445841&r2=1445842&view=diff
==============================================================================
--- hbase/branches/hbase-7290/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java (original)
+++ hbase/branches/hbase-7290/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java Wed Feb 13 18:50:34 2013
@@ -185,11 +185,11 @@ public abstract class ModifyRegionUtils
* @param catalogTracker the catalog tracker
* @param regions list of {@link HRegionInfo} to delete.
*/
- public static void deleteRegions(final FileSystem fs, final CatalogTracker catalogTracker,
- final List<HRegionInfo> regions) throws IOException {
+ public static void deleteRegions(final Configuration conf, final FileSystem fs,
+ final CatalogTracker catalogTracker, final List<HRegionInfo> regions) throws IOException {
if (regions != null && regions.size() > 0) {
for (HRegionInfo hri: regions) {
- deleteRegion(fs, catalogTracker, hri);
+ deleteRegion(conf, fs, catalogTracker, hri);
}
}
}
@@ -202,12 +202,12 @@ public abstract class ModifyRegionUtils
* @param catalogTracker the catalog tracker
* @param regionInfo {@link HRegionInfo} to delete.
*/
- public static void deleteRegion(final FileSystem fs, final CatalogTracker catalogTracker,
- final HRegionInfo regionInfo) throws IOException {
+ public static void deleteRegion(final Configuration conf, final FileSystem fs,
+ final CatalogTracker catalogTracker, final HRegionInfo regionInfo) throws IOException {
// Remove region from .META.
MetaEditor.deleteRegion(catalogTracker, regionInfo);
// "Delete" region from FS
- HFileArchiver.archiveRegion(fs, regionInfo);
+ HFileArchiver.archiveRegion(conf, fs, regionInfo);
}
}