diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 432bb68d9a..2cf7111030 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -339,6 +339,8 @@ Release 0.23.3 - UNRELEASED
     HDFS-3100. In BlockSender, throw an exception when it needs to verify
     checksum but the meta data does not exist.  (Brandon Li via szetszwo)
 
+    HDFS-3132. Fix findbugs warning on HDFS trunk. (todd)
+
   BREAKDOWN OF HDFS-1623 SUBTASKS
 
     HDFS-2179. Add fencing framework and mechanisms for NameNode HA. (todd)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
index d68ec52098..c1fbe3edb9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
@@ -187,7 +187,7 @@ public long getProtocolVersion(String protocol,
   protected FSNamesystem namesystem; 
   protected final Configuration conf;
   protected NamenodeRole role;
-  private HAState state;
+  private volatile HAState state;
   private final boolean haEnabled;
   private final HAContext haContext;
   protected boolean allowStaleStandbyReads;