svn commit: r1478437 - in /hadoop/common/branches/branch-1.2: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java

[suresh]

Author: suresh
Date: Thu May  2 16:43:27 2013
New Revision: 1478437

URL: http://svn.apache.org/r1478437
Log:
HDFS-3817. Merge change 1478433 from branch-1

Modified:
    hadoop/common/branches/branch-1.2/CHANGES.txt
    
hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java

Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1478437&r1=1478436&r2=1478437&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Thu May  2 16:43:27 2013
@@ -616,6 +616,9 @@ Release 1.2.0 - 2013.04.16
     HADOOP-8711. Provide an option for IPC server users to avoid printing stack
     information for certain exceptions. (Brandon Li via suresh)
 
+    HDFS-3817. Avoid printing stack information for SafeModeException.
+    (Brandon Li via suresh)
+
 Release 1.1.2 - 2013.01.30
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=1478437&r1=1478436&r2=1478437&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
 (original)
+++ 
hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
 Thu May  2 16:43:27 2013
@@ -324,7 +324,9 @@ public class NameNode implements ClientP
     this.server = RPC.getServer(this, socAddr.getHostName(),
         socAddr.getPort(), handlerCount, false, conf, namesystem
         .getDelegationTokenSecretManager());
-
+    // Set terse exception whose stack trace won't be logged
+    this.server.addTerseExceptions(SafeModeException.class);
+    
     // The rpc-server port can be ephemeral... ensure we have the correct info
     this.serverAddress = this.server.getListenerAddress(); 
     FileSystem.setDefaultUri(conf, getUri(serverAddress));