@@ -492,7 +492,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean { * Dump all metadata into specified file */ synchronized void metaSave(String filename) throws IOException { - checkAccess(); + checkSuperuserPrivilege(); File file = new File(System.getProperty("hadoop.log.dir"), filename); PrintWriter out = new PrintWriter(new BufferedWriter( @@ -597,7 +597,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean { */ synchronized BlocksWithLocations getBlocks(DatanodeID datanode, long size) throws IOException { - checkAccess(); + checkSuperuserPrivilege(); DatanodeDescriptor node = getDatanode(datanode); if (node == null) { @@ -1771,7 +1771,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean { */ void setQuota(String path, long nsQuota, long dsQuota) throws IOException { if (isPermissionEnabled) { - checkAccess(); + checkSuperuserPrivilege(); } dir.setQuota(path, nsQuota, dsQuota); @@ -3384,7 +3384,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean { } long[] getStats() throws IOException { - checkAccess(); + checkSuperuserPrivilege(); synchronized(heartbeats) { return new long[] {this.capacityTotal, this.capacityUsed, this.capacityRemaining, @@ -3524,7 +3524,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean { public synchronized DatanodeInfo[] datanodeReport( DatanodeReportType type ) throws AccessControlException { - checkAccess(); + checkSuperuserPrivilege(); ArrayList<DatanodeDescriptor> results = getDatanodeListForReport(type); DatanodeInfo[] arr = new DatanodeInfo[results.size()]; @@ -3543,7 +3543,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean { * @throws IOException if */ synchronized void saveNamespace() throws AccessControlException, IOException { - checkAccess(); + checkSuperuserPrivilege(); if(!isInSafeMode()) { throw new IOException("Safe mode should be turned ON " + "in order to create namespace image."); @@ -3799,7 +3799,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean { * 4. Removed from exclude --> stop decommission. */ public void refreshNodes(Configuration conf) throws IOException { - checkAccess(); + checkSuperuserPrivilege(); // Reread the config to get dfs.hosts and dfs.hosts.exclude filenames. // Update the file names and refresh internal includes and excludes list if (conf == null) @@ -3833,7 +3833,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean { } void finalizeUpgrade() throws IOException { - checkAccess(); + checkSuperuserPrivilege(); getFSImage().finalizeUpgrade(); } @@ -4280,7 +4280,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean { boolean setSafeMode(SafeModeAction action) throws IOException { if (action != SafeModeAction.SAFEMODE_GET) { - checkAccess(); + checkSuperuserPrivilege(); switch(action) { case SAFEMODE_LEAVE: // leave safe mode leaveSafeMode(false); @@ -4462,7 +4462,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean { return checkPermission(path, false, null, null, null, null); } - private void checkAccess() throws AccessControlException { + private void checkSuperuserPrivilege() throws AccessControlException { if (isPermissionEnabled) { PermissionChecker.checkSuperuserPrivilege(fsOwner, supergroup); } src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java aa80cb7aa8fc3f316e81ad81fe5ee3d2845526fc Lee Tucker ltucker@whatslowthis-lm.corp.yahoo.com http://github.com/yahoo/hadoop/commit/5eefa72f7c0073c9c9e7bd26430891ed09670de1 5eefa72f7c0073c9c9e7bd26430891ed09670de1 2009-06-08T15:04:25-07:00 2009-06-08T15:04:25-07:00 Applying patch 2788241.5818.patch 5f6bbf4c46938ef689005de82b0d7fddd3d32cfa Lee Tucker ltucker@whatslowthis-lm.corp.yahoo.com