svn commit: r737253 - in /hadoop/core/trunk: ./ src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/datacollection/agent/ src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/datacollection/connector/http/ src/contrib/fairscheduler/src/java/org/apache...

[cd...@apache.org]

Author: cdouglas
Date: Fri Jan 23 23:50:18 2009
New Revision: 737253

URL: http://svn.apache.org/viewvc?rev=737253&view=rev
Log:
HADOOP-4671. Mark loop control variables shared between threads as volatile.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java
    hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java
    hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java
    hadoop/core/trunk/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdateReducer.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=737253&r1=737252&r2=737253&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri Jan 23 23:50:18 2009
@@ -639,6 +639,9 @@
     killed after initialization, but before running. 
     (Sreekanth Ramakrishnan via yhemanth)
 
+    HADOOP-4671. Mark loop control variables shared between threads as
+    volatile. (cdouglas)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java?rev=737253&r1=737252&r2=737253&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java (original)
+++ hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java Fri Jan 23 23:50:18 2009
@@ -41,7 +41,7 @@
   ChukwaAgent agent;
   int portno;
   ServerSocket s= null;
-  boolean closing = false;
+  volatile boolean closing = false;
   
   private class ListenThread extends Thread
   {

Modified: hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java?rev=737253&r1=737252&r2=737253&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java (original)
+++ hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java Fri Jan 23 23:50:18 2009
@@ -63,7 +63,7 @@
   ChukwaAgent agent;
   String argDestination = null;
   
-  private boolean stopMe = false;
+  private volatile boolean stopMe = false;
   private boolean reloadConfiguration = false;
   private Iterator<String> collectors = null;
   protected ChukwaSender connectorClient = null;

Modified: hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java?rev=737253&r1=737252&r2=737253&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java (original)
+++ hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java Fri Jan 23 23:50:18 2009
@@ -55,7 +55,7 @@
     new HashMap<JobInProgress, JobInfo>();
   protected long lastUpdateTime;           // Time when we last updated infos
   protected boolean initialized;  // Are we initialized?
-  protected boolean running;      // Are we running?
+  protected volatile boolean running; // Are we running?
   protected boolean useFifo;      // Set if we want to revert to FIFO behavior
   protected boolean assignMultiple; // Simultaneously assign map and reduce?
   protected boolean sizeBasedWeight; // Give larger weights to larger jobs

Modified: hadoop/core/trunk/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdateReducer.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdateReducer.java?rev=737253&r1=737252&r2=737253&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdateReducer.java (original)
+++ hadoop/core/trunk/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdateReducer.java Fri Jan 23 23:50:18 2009
@@ -90,7 +90,7 @@
     // close the shard
     final Reporter fReporter = reporter;
     new Closeable() {
-      boolean closed = false;
+      volatile boolean closed = false;
 
       public void close() throws IOException {
         // spawn a thread to give progress heartbeats

Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java?rev=737253&r1=737252&r2=737253&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java Fri Jan 23 23:50:18 2009
@@ -63,7 +63,7 @@
   private NamenodeProtocol namenode;
   private Configuration conf;
   private InetSocketAddress nameNodeAddr;
-  private boolean shouldRun;
+  private volatile boolean shouldRun;
   private HttpServer infoServer;
   private int infoPort;
   private String infoBindAddress;