1
0
Просмотр исходного кода

Port from 0.20-append - HDFS-1207. FSNamesystem.stallReplicationWork should be volatile. Contributed by Todd Lipcon.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1164734 13f79535-47bb-0310-9956-ffa450edef68
Suresh Srinivas 14 лет назад
Родитель
Сommit
9d303dba2b
2 измененных файлов с 4 добавлено и 1 удалено
  1. 3 0
      CHANGES.txt
  2. 1 1
      src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

+ 3 - 0
CHANGES.txt

@@ -66,6 +66,9 @@ Release 0.20.205.0 - unreleased
     HDFS-1054. remove sleep before retry for allocating a block.
     HDFS-1054. remove sleep before retry for allocating a block.
     (Todd Lipcon via dhruba)
     (Todd Lipcon via dhruba)
 
 
+    HDFS-1207. FSNamesystem.stallReplicationWork should be volatile.
+    (Todd Lipcon via dhruba)
+
   IMPROVEMENTS
   IMPROVEMENTS
 
 
     MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via
     MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via

+ 1 - 1
src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

@@ -301,7 +301,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean,
   // Default replication
   // Default replication
   private int defaultReplication;
   private int defaultReplication;
   // Variable to stall new replication checks for testing purposes
   // 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
   // heartbeatRecheckInterval is how often namenode checks for expired datanodes
   private long heartbeatRecheckInterval;
   private long heartbeatRecheckInterval;
   // heartbeatExpireInterval is how long namenode waits for datanode to report
   // heartbeatExpireInterval is how long namenode waits for datanode to report