Author: suresh
Date: Sun Oct 28 19:03:57 2012
New Revision: 1403075
URL: http://svn.apache.org/viewvc?rev=1403075&view=rev
Log:
HDFS-4106. BPServiceActor#lastHeartbeat, lastBlockReport and lastDeletedReport
should be volatile. Contributed by Jing Zhao.
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1403075&r1=1403074&r2=1403075&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Sun Oct 28
19:03:57 2012
@@ -241,6 +241,9 @@ Trunk (Unreleased)
HDFS-4115. TestHDFSCLI.testAll fails one test due to number format.
(Trevor Robinson via suresh)
+ HDFS-4106. BPServiceActor#lastHeartbeat, lastBlockReport and
+ lastDeletedReport should be volatile. (Jing Zhao via suresh)
+
BREAKDOWN OF HDFS-3077 SUBTASKS
HDFS-3077. Quorum-based protocol for reading and writing edit logs.
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java?rev=1403075&r1=1403074&r2=1403075&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
(original)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
Sun Oct 28 19:03:57 2012
@@ -75,14 +75,18 @@ class BPServiceActor implements Runnable
BPOfferService bpos;
- long lastBlockReport = 0;
- long lastDeletedReport = 0;
+ // lastBlockReport, lastDeletedReport and lastHeartbeat may be assigned/read
+ // by testing threads (through BPServiceActor#triggerXXX), while also
+ // assigned/read by the actor thread. Thus they should be declared as
volatile
+ // to make sure the "happens-before" consistency.
+ volatile long lastBlockReport = 0;
+ volatile long lastDeletedReport = 0;
boolean resetBlockReportTime = true;
Thread bpThread;
DatanodeProtocolClientSideTranslatorPB bpNamenode;
- private long lastHeartbeat = 0;
+ private volatile long lastHeartbeat = 0;
private volatile boolean initialized = false;
/**
