You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2013/02/14 04:08:16 UTC
svn commit: r1446036 - in
/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util:
FSUtils.java HBaseFsck.java
Author: enis
Date: Thu Feb 14 03:08:16 2013
New Revision: 1446036
URL: http://svn.apache.org/r1446036
Log:
HBASE-7832. Use User.getShortName() in FSUtils
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java?rev=1446036&r1=1446035&r2=1446036&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java Thu Feb 14 03:08:16 2013
@@ -23,7 +23,6 @@ import java.io.DataInputStream;
import java.io.EOFException;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URI;
import java.net.URISyntaxException;
@@ -52,6 +51,7 @@ import org.apache.hadoop.hbase.HRegionIn
import org.apache.hadoop.hbase.RemoteExceptionHandler;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.regionserver.HRegion;
+import org.apache.hadoop.hbase.security.User;
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.security.AccessControlException;
@@ -1192,32 +1192,22 @@ public abstract class FSUtils {
/**
* Throw an exception if an action is not permitted by a user on a file.
*
- * @param ugi
+ * @param user
* the user
* @param file
* the file
* @param action
* the action
*/
- public static void checkAccess(UserGroupInformation ugi, FileStatus file,
+ public static void checkAccess(User user, FileStatus file,
FsAction action) throws AccessControlException {
- // See HBASE-7814. UserGroupInformation from hadoop 0.20.x may not support getShortUserName().
- String username;
- try {
- Method m = UserGroupInformation.class.getMethod("getShortUserName", new Class<?>[]{});
- username = (String) m.invoke(ugi);
- } catch (NoSuchMethodException e) {
- username = ugi.getUserName();
- } catch (InvocationTargetException e) {
- username = ugi.getUserName();
- } catch (IllegalAccessException iae) {
- username = ugi.getUserName();
- }
+ // See HBASE-7814. UserGroupInformation from hadoop 0.20.x may not support getShortName().
+ String username = user.getShortName();
if (username.equals(file.getOwner())) {
if (file.getPermission().getUserAction().implies(action)) {
return;
}
- } else if (contains(ugi.getGroupNames(), file.getGroup())) {
+ } else if (contains(user.getGroupNames(), file.getGroup())) {
if (file.getPermission().getGroupAction().implies(action)) {
return;
}
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java?rev=1446036&r1=1446035&r2=1446036&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java Thu Feb 14 03:08:16 2013
@@ -1411,14 +1411,14 @@ public class HBaseFsck extends Configure
Path hbaseDir = new Path(getConf().get(HConstants.HBASE_DIR));
FileSystem fs = hbaseDir.getFileSystem(getConf());
- UserGroupInformation ugi = User.getCurrent().getUGI();
+ User user = User.getCurrent();
FileStatus[] files = fs.listStatus(hbaseDir);
for (FileStatus file : files) {
try {
- FSUtils.checkAccess(ugi, file, FsAction.WRITE);
+ FSUtils.checkAccess(user, file, FsAction.WRITE);
} catch (AccessControlException ace) {
LOG.warn("Got AccessControlException when preCheckPermission ", ace);
- errors.reportError(ERROR_CODE.WRONG_USAGE, "Current user " + ugi.getUserName()
+ errors.reportError(ERROR_CODE.WRONG_USAGE, "Current user " + user.getShortName()
+ " does not have write perms to " + file.getPath()
+ ". Please rerun hbck as hdfs user " + file.getOwner());
throw new AccessControlException(ace);