You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by ki...@apache.org on 2013/07/10 18:42:38 UTC
svn commit: r1501843 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: ./
src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/
src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/
src/test/java/org/apache/hadoop/hdf...
Author: kihwal
Date: Wed Jul 10 16:42:38 2013
New Revision: 1501843
URL: http://svn.apache.org/r1501843
Log:
svn merge -c 1501841. Merging from trunk to branch-2 to fix HDFS-4887.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1501843&r1=1501842&r2=1501843&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jul 10 16:42:38 2013
@@ -449,6 +449,8 @@ Release 2.1.0-beta - 2013-07-02
HDFS-4948. mvn site for hadoop-hdfs-nfs fails. (brandonli)
+ HDFS-4887. TestNNThroughputBenchmark exits abruptly. (kihwal)
+
BREAKDOWN OF HDFS-347 SUBTASKS AND RELATED JIRAS
HDFS-4353. Encapsulate connections to peers in Peer and PeerServer classes.
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java?rev=1501843&r1=1501842&r2=1501843&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java Wed Jul 10 16:42:38 2013
@@ -227,6 +227,9 @@ public class BlockManager {
/** for block replicas placement */
private BlockPlacementPolicy blockplacement;
+
+ /** Check whether name system is running before terminating */
+ private boolean checkNSRunning = true;
public BlockManager(final Namesystem namesystem, final FSClusterStats stats,
final Configuration conf) throws IOException {
@@ -356,6 +359,12 @@ public class BlockManager {
return blockTokenSecretManager;
}
+ /** Allow silent termination of replication monitor for testing */
+ @VisibleForTesting
+ void enableRMTerminationForTesting() {
+ checkNSRunning = false;
+ }
+
private boolean isBlockTokenEnabled() {
return blockTokenSecretManager != null;
}
@@ -3113,6 +3122,9 @@ assert storedBlock.findDatanode(dn) < 0
+ " while shutting down.", t);
}
break;
+ } else if (!checkNSRunning && t instanceof InterruptedException) {
+ LOG.info("Stopping ReplicationMonitor for testing.");
+ break;
}
LOG.fatal("ReplicationMonitor thread received Runtime exception. ", t);
terminate(1, t);
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java?rev=1501843&r1=1501842&r2=1501843&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java Wed Jul 10 16:42:38 2013
@@ -108,6 +108,22 @@ public class BlockManagerTestUtil {
}
/**
+ * Stop the replication monitor thread
+ * @param blockManager
+ */
+ public static void stopReplicationThread(final BlockManager blockManager)
+ throws IOException {
+ blockManager.enableRMTerminationForTesting();
+ blockManager.replicationThread.interrupt();
+ try {
+ blockManager.replicationThread.join();
+ } catch(InterruptedException ie) {
+ throw new IOException(
+ "Interrupted while trying to stop ReplicationMonitor");
+ }
+ }
+
+ /**
* @param blockManager
* @return corruptReplicas from block manager
*/
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java?rev=1501843&r1=1501842&r2=1501843&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java Wed Jul 10 16:42:38 2013
@@ -1194,14 +1194,8 @@ public class NNThroughputBenchmark {
// start data-nodes; create a bunch of files; generate block reports.
blockReportObject.generateInputs(ignore);
// stop replication monitor
- BlockManagerTestUtil.getReplicationThread(namesystem.getBlockManager())
- .interrupt();
- try {
- BlockManagerTestUtil.getReplicationThread(namesystem.getBlockManager())
- .join();
- } catch(InterruptedException ei) {
- return;
- }
+ BlockManagerTestUtil.stopReplicationThread(namesystem.getBlockManager());
+
// report blocks once
int nrDatanodes = blockReportObject.getNumDatanodes();
for(int idx=0; idx < nrDatanodes; idx++) {