Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-13726 Use commons-io to cleanup Closeables instead of hadoop IOUtils.

This commit is contained in:
Sean Busbey 2015-05-20 14:03:05 -05:00 committed by Sean Busbey
parent 4070770243
commit 4cab6963b0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
View File

@ -62,6 +62,7 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.Ordering; import com.google.common.collect.Ordering;
import com.google.common.collect.TreeMultimap; import com.google.common.collect.TreeMultimap;
import com.google.protobuf.ServiceException; import com.google.protobuf.ServiceException;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -134,7 +135,6 @@ import org.apache.hadoop.hbase.zookeeper.MetaTableLocator;
import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZKUtil;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException; import org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.ipc.RemoteException; import org.apache.hadoop.ipc.RemoteException;
import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.ReflectionUtils; import org.apache.hadoop.util.ReflectionUtils;
@ -435,7 +435,7 @@ public class HBaseFsck extends Configured implements Closeable {
RetryCounter retryCounter = lockFileRetryCounterFactory.create(); RetryCounter retryCounter = lockFileRetryCounterFactory.create();
do { do {
try { try {
IOUtils.closeStream(hbckOutFd); IOUtils.closeQuietly(hbckOutFd);
FSUtils.delete(FSUtils.getCurrentFileSystem(getConf()), FSUtils.delete(FSUtils.getCurrentFileSystem(getConf()),
HBCK_LOCK_PATH, true); HBCK_LOCK_PATH, true);
return; return;
@ -483,7 +483,7 @@ public class HBaseFsck extends Configured implements Closeable {
Runtime.getRuntime().addShutdownHook(new Thread() { Runtime.getRuntime().addShutdownHook(new Thread() {
@Override @Override
public void run() { public void run() {
IOUtils.closeStream(HBaseFsck.this); IOUtils.closeQuietly(HBaseFsck.this);
unlockHbck(); unlockHbck();
} }
}); });
@ -711,8 +711,11 @@ public class HBaseFsck extends Configured implements Closeable {
unlockHbck(); unlockHbck();
} catch (Exception io) { } catch (Exception io) {
LOG.warn(io); LOG.warn(io);
} finally {
IOUtils.closeQuietly(admin);
IOUtils.closeQuietly(meta);
IOUtils.closeQuietly(connection);
} }
IOUtils.cleanup(null, admin, meta, connection);
} }
private static class RegionBoundariesInformation { private static class RegionBoundariesInformation {
@ -4660,7 +4663,7 @@ public class HBaseFsck extends Configured implements Closeable {
setRetCode(code); setRetCode(code);
} }
} finally { } finally {
IOUtils.cleanup(null, this); IOUtils.closeQuietly(this);
} }
return this; return this;
} }