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 su...@apache.org on 2013/01/23 20:02:58 UTC
svn commit: r1437628 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt
src/main/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
Author: suresh
Date: Wed Jan 23 19:02:57 2013
New Revision: 1437628
URL: http://svn.apache.org/viewvc?rev=1437628&view=rev
Log:
HDFS-4426. Merge change 1437627 from trunk.
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/namenode/SecondaryNameNode.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=1437628&r1=1437627&r2=1437628&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 Jan 23 19:02:57 2013
@@ -2024,6 +2024,9 @@ Release 0.23.6 - UNRELEASED
HDFS-4385. Maven RAT plugin is not checking all source files (tgraves)
+ HDFS-4426. Secondary namenode shuts down immediately after startup.
+ (Arpit Agarwal via suresh)
+
Release 0.23.5 - 2012-11-28
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.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/namenode/SecondaryNameNode.java?rev=1437628&r1=1437627&r2=1437628&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java Wed Jan 23 19:02:57 2013
@@ -282,6 +282,17 @@ public class SecondaryNameNode implement
}
/**
+ * Wait for the service to finish.
+ * (Normally, it runs forever.)
+ */
+ private void join() {
+ try {
+ infoServer.join();
+ } catch (InterruptedException ie) {
+ }
+ }
+
+ /**
* Shut down this instance of the datanode.
* Returns only after shutdown is complete.
*/
@@ -607,6 +618,7 @@ public class SecondaryNameNode implement
if (secondary != null) {
secondary.startCheckpointThread();
+ secondary.join();
}
}