From 33d7976debe07cd65d465d299b34bb234906f847 Mon Sep 17 00:00:00 2001 From: Jonathan Hsieh Date: Wed, 13 Feb 2013 18:50:34 +0000 Subject: [PATCH] HBASE-7453 HBASE-7423 snapshot followup (Matteo Bertozzi) git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/hbase-7290@1445842 13f79535-47bb-0310-9956-ffa450edef68 --- .../hadoop/hbase/snapshot/RestoreSnapshotHelper.java | 2 +- .../apache/hadoop/hbase/util/ModifyRegionUtils.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java index 7ba5cb2f7b5..b87b5669a79 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java @@ -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 diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java index 28d2a2240cc..66840f2ace8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java @@ -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 regions) throws IOException { + public static void deleteRegions(final Configuration conf, final FileSystem fs, + final CatalogTracker catalogTracker, final List 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); } }