You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2015/05/27 23:45:08 UTC
[1/2] hbase git commit: HBASE-13726 Use commons-io to cleanup
Closeables instead of hadoop IOUtils.
Repository: hbase
Updated Branches:
refs/heads/branch-1 7df1814f7 -> d5f57027b
HBASE-13726 Use commons-io to cleanup Closeables instead of hadoop IOUtils.
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d28091ee
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d28091ee
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d28091ee
Branch: refs/heads/branch-1
Commit: d28091eeade821b5ec67061546d07fa0b6838c62
Parents: 7df1814
Author: Sean Busbey <bu...@apache.org>
Authored: Wed May 20 14:03:05 2015 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Wed May 27 16:32:22 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/util/HBaseFsck.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d28091ee/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
index b4548f6..937c7cd 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
@@ -63,6 +63,7 @@ import com.google.common.collect.Ordering;
import com.google.common.collect.TreeMultimap;
import com.google.protobuf.ServiceException;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -138,7 +139,6 @@ import org.apache.hadoop.hbase.zookeeper.ZKTableStateManager;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException;
-import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.ipc.RemoteException;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.ReflectionUtils;
@@ -445,7 +445,7 @@ public class HBaseFsck extends Configured implements Closeable {
RetryCounter retryCounter = lockFileRetryCounterFactory.create();
do {
try {
- IOUtils.closeStream(hbckOutFd);
+ IOUtils.closeQuietly(hbckOutFd);
FSUtils.delete(FSUtils.getCurrentFileSystem(getConf()),
HBCK_LOCK_PATH, true);
return;
@@ -493,7 +493,7 @@ public class HBaseFsck extends Configured implements Closeable {
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
- IOUtils.closeStream(HBaseFsck.this);
+ IOUtils.closeQuietly(HBaseFsck.this);
unlockHbck();
}
});
@@ -720,7 +720,9 @@ public class HBaseFsck extends Configured implements Closeable {
@Override
public void close() throws IOException {
- IOUtils.cleanup(null, admin, meta, connection);
+ IOUtils.closeQuietly(admin);
+ IOUtils.closeQuietly(meta);
+ IOUtils.closeQuietly(connection);
}
private static class RegionBoundariesInformation {
@@ -4694,7 +4696,7 @@ public class HBaseFsck extends Configured implements Closeable {
setRetCode(code);
}
} finally {
- IOUtils.cleanup(null, this);
+ IOUtils.closeQuietly(this);
}
return this;
}
[2/2] hbase git commit: HBASE-13716 use HdfsConstants instead of
deprecated FSConstants.
Posted by bu...@apache.org.
HBASE-13716 use HdfsConstants instead of deprecated FSConstants.
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d5f57027
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d5f57027
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d5f57027
Branch: refs/heads/branch-1
Commit: d5f57027b81c30e0522e5a046bbf851e4c74717b
Parents: d28091e
Author: Sean Busbey <bu...@apache.org>
Authored: Wed May 20 09:09:00 2015 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Wed May 27 16:33:40 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/master/HMaster.java | 3 ++-
.../src/main/java/org/apache/hadoop/hbase/util/FSUtils.java | 8 ++++----
.../java/org/apache/hadoop/hbase/wal/TestWALFactory.java | 4 ++--
3 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5f57027/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 052cbcf..2b180ad 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1570,7 +1570,8 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
LOG.fatal("Failed to become active master", t);
// HBASE-5680: Likely hadoop23 vs hadoop 20.x/1.x incompatibility
if (t instanceof NoClassDefFoundError &&
- t.getMessage().contains("org/apache/hadoop/hdfs/protocol/FSConstants$SafeModeAction")) {
+ t.getMessage()
+ .contains("org/apache/hadoop/hdfs/protocol/HdfsConstants$SafeModeAction")) {
// improved error message for this special case
abort("HBase is having a problem with its Hadoop jars. You may need to "
+ "recompile HBase against Hadoop version "
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5f57027/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
index ae689d1..d0b1f42 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
@@ -505,7 +505,7 @@ public abstract class FSUtils {
/**
* We use reflection because {@link DistributedFileSystem#setSafeMode(
- * FSConstants.SafeModeAction action, boolean isChecked)} is not in hadoop 1.1
+ * HdfsConstants.SafeModeAction action, boolean isChecked)} is not in hadoop 1.1
*
* @param dfs
* @return whether we're in safe mode
@@ -515,15 +515,15 @@ public abstract class FSUtils {
boolean inSafeMode = false;
try {
Method m = DistributedFileSystem.class.getMethod("setSafeMode", new Class<?> []{
- org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction.class, boolean.class});
+ org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction.class, boolean.class});
inSafeMode = (Boolean) m.invoke(dfs,
- org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction.SAFEMODE_GET, true);
+ org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction.SAFEMODE_GET, true);
} catch (Exception e) {
if (e instanceof IOException) throw (IOException) e;
// Check whether dfs is on safemode.
inSafeMode = dfs.setSafeMode(
- org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction.SAFEMODE_GET);
+ org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction.SAFEMODE_GET);
}
return inSafeMode;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5f57027/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java
index 56b2d67..467c63d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java
@@ -57,7 +57,7 @@ import org.apache.hadoop.hbase.util.FSUtils;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.protocol.HdfsConstants;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -383,7 +383,7 @@ public class TestWALFactory {
// Stop the cluster. (ensure restart since we're sharing MiniDFSCluster)
try {
DistributedFileSystem dfs = (DistributedFileSystem) cluster.getFileSystem();
- dfs.setSafeMode(FSConstants.SafeModeAction.SAFEMODE_ENTER);
+ dfs.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
TEST_UTIL.shutdownMiniDFSCluster();
try {
// wal.writer.close() will throw an exception,