Author: suresh
Date: Fri Sep 2 21:59:49 2011
New Revision: 1164734
URL: http://svn.apache.org/viewvc?rev=1164734&view=rev
Log:
Port from 0.20-append - HDFS-1207. FSNamesystem.stallReplicationWork should be
volatile. Contributed by Todd Lipcon.
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1164734&r1=1164733&r2=1164734&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Fri Sep 2 21:59:49
2011
@@ -66,6 +66,9 @@ Release 0.20.205.0 - unreleased
HDFS-1054. remove sleep before retry for allocating a block.
(Todd Lipcon via dhruba)
+ HDFS-1207. FSNamesystem.stallReplicationWork should be volatile.
+ (Todd Lipcon via dhruba)
+
IMPROVEMENTS
MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via
Modified:
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1164734&r1=1164733&r2=1164734&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
(original)
+++
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Fri Sep 2 21:59:49 2011
@@ -301,7 +301,7 @@ public class FSNamesystem implements FSC
// Default replication
private int defaultReplication;
// Variable to stall new replication checks for testing purposes
- private boolean stallReplicationWork = false;
+ private volatile boolean stallReplicationWork = false;
// heartbeatRecheckInterval is how often namenode checks for expired
datanodes
private long heartbeatRecheckInterval;
// heartbeatExpireInterval is how long namenode waits for datanode to report