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

HDFS-4917. Revert r1494434 previous merge that included extraneous change. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494442 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-06-19 04:04:01 +00:00
parent cd5b7bdf06
commit 0128a87eca
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -397,9 +397,6 @@ Release 2.1.0-beta - UNRELEASED
HDFS-4906. HDFS Output streams should not accept writes after being
closed. (atm)
HDFS-4917. Start-dfs.sh cannot pass the parameters correctly.
(Fengdong Yu via suresh)
BREAKDOWN OF HDFS-347 SUBTASKS AND RELATED JIRAS
HDFS-4353. Encapsulate connections to peers in Peer and PeerServer classes.

2
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh
View File

@ -47,7 +47,7 @@ if [ $# -ge 1 ]; then
fi
#Add other possible options
nameStartOpt="$nameStartOpt $@"
nameStartOpt="$nameStartOpts $@"
#---------------------------------------------------------
# namenodes

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java
View File

@ -190,7 +190,7 @@ class UnderReplicatedBlocks implements Iterable<Block> {
assert curReplicas >= 0 : "Negative replicas!";
int priLevel = getPriority(block, curReplicas, decomissionedReplicas,
expectedReplicas);
if(priorityQueues.get(priLevel).add(block)) {
if(priLevel != LEVEL && priorityQueues.get(priLevel).add(block)) {
if(NameNode.blockStateChangeLog.isDebugEnabled()) {
NameNode.blockStateChangeLog.debug(
"BLOCK* NameSystem.UnderReplicationBlock.add:"
@ -293,10 +293,10 @@ class UnderReplicatedBlocks implements Iterable<Block> {
" curPri " + curPri +
" oldPri " + oldPri);
}
if(oldPri != curPri) {
if(oldPri != LEVEL && oldPri != curPri) {
remove(block, oldPri);
}
if(priorityQueues.get(curPri).add(block)) {
if(curPri != LEVEL && priorityQueues.get(curPri).add(block)) {
if(NameNode.blockStateChangeLog.isDebugEnabled()) {
NameNode.blockStateChangeLog.debug(
"BLOCK* NameSystem.UnderReplicationBlock.update:"