Author: szetszwo
Date: Fri Apr 27 21:18:59 2012
New Revision: 1331599
URL: http://svn.apache.org/viewvc?rev=1331599&view=rev
Log:
svn merge -c 1331598 from trunk for HDFS-3331. In namenode, check superuser
privilege for setBalancerBandwidth and acquire the write lock for
finalizeUpgrade.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/ (props
changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
(props changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1331598
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1331599&r1=1331598&r2=1331599&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Apr 27 21:18:59 2012
@@ -798,7 +798,11 @@ Release 0.23.3 - UNRELEASED
HDFS-3321. Fix safe mode turn off tip message. (Ravi Prakash via szetszwo)
- HDFS-3334. Fix ByteRangeInputStream stream leakage. (Daryn Sharp via
szetszwo)
+ HDFS-3334. Fix ByteRangeInputStream stream leakage. (Daryn Sharp via
+ szetszwo)
+
+ HDFS-3331. In namenode, check superuser privilege for setBalancerBandwidth
+ and acquire the write lock for finalizeUpgrade. (szetszwo)
Release 0.23.2 - UNRELEASED
Propchange:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1331598
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java?rev=1331599&r1=1331598&r2=1331599&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
Fri Apr 27 21:18:59 2012
@@ -651,7 +651,6 @@ public class DatanodeManager {
* checks if any of the hosts have changed states:
*/
public void refreshNodes(final Configuration conf) throws IOException {
- namesystem.checkSuperuserPrivilege();
refreshHostsReader(conf);
namesystem.writeLock();
try {
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1331599&r1=1331598&r2=1331599&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Fri Apr 27 21:18:59 2012
@@ -3332,8 +3332,26 @@ public class FSNamesystem implements Nam
}
void finalizeUpgrade() throws IOException {
+ writeLock();
+ try {
+ checkOperation(OperationCategory.WRITE);
+ checkSuperuserPrivilege();
+ getFSImage().finalizeUpgrade();
+ } finally {
+ writeUnlock();
+ }
+ }
+
+ void refreshNodes() throws IOException {
+ checkOperation(OperationCategory.UNCHECKED);
+ checkSuperuserPrivilege();
+ getBlockManager().getDatanodeManager().refreshNodes(new
HdfsConfiguration());
+ }
+
+ void setBalancerBandwidth(long bandwidth) throws IOException {
+ checkOperation(OperationCategory.UNCHECKED);
checkSuperuserPrivilege();
- getFSImage().finalizeUpgrade();
+ getBlockManager().getDatanodeManager().setBalancerBandwidth(bandwidth);
}
/**
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java?rev=1331599&r1=1331598&r2=1331599&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
Fri Apr 27 21:18:59 2012
@@ -708,9 +708,7 @@ class NameNodeRpcServer implements Namen
@Override // ClientProtocol
public void refreshNodes() throws IOException {
- namesystem.checkOperation(OperationCategory.UNCHECKED);
- namesystem.getBlockManager().getDatanodeManager().refreshNodes(
- new HdfsConfiguration());
+ namesystem.refreshNodes();
}
@Override // NamenodeProtocol
@@ -733,7 +731,6 @@ class NameNodeRpcServer implements Namen
@Override // ClientProtocol
public void finalizeUpgrade() throws IOException {
- namesystem.checkOperation(OperationCategory.WRITE);
namesystem.finalizeUpgrade();
}
@@ -773,8 +770,7 @@ class NameNodeRpcServer implements Namen
*/
@Override // ClientProtocol
public void setBalancerBandwidth(long bandwidth) throws IOException {
- namesystem.checkOperation(OperationCategory.UNCHECKED);
-
namesystem.getBlockManager().getDatanodeManager().setBalancerBandwidth(bandwidth);
+ namesystem.setBalancerBandwidth(bandwidth);
}
@Override // ClientProtocol
