瀏覽代碼

HADOOP-8347. svn merge -c 1333321 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333322 13f79535-47bb-0310-9956-ffa450edef68
Eli Collins 13 年之前
父節點
當前提交
8b1b26a3a6

+ 3 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -152,6 +152,9 @@ Release 2.0.0 - UNRELEASED
 
 
     HADOOP-8214. make hadoop script recognize a full set of deprecated commands (rvs via tucu)
     HADOOP-8214. make hadoop script recognize a full set of deprecated commands (rvs via tucu)
 
 
+    HADOOP-8347. Hadoop Common logs misspell 'successful'.
+    (Philip Zeyliger via eli)
+
   OPTIMIZATIONS
   OPTIMIZATIONS
 
 
   BUG FIXES
   BUG FIXES

+ 2 - 2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java

@@ -218,7 +218,7 @@ public abstract class Server {
   public static final Log AUDITLOG = 
   public static final Log AUDITLOG = 
     LogFactory.getLog("SecurityLogger."+Server.class.getName());
     LogFactory.getLog("SecurityLogger."+Server.class.getName());
   private static final String AUTH_FAILED_FOR = "Auth failed for ";
   private static final String AUTH_FAILED_FOR = "Auth failed for ";
-  private static final String AUTH_SUCCESSFULL_FOR = "Auth successfull for ";
+  private static final String AUTH_SUCCESSFUL_FOR = "Auth successful for ";
   
   
   private static final ThreadLocal<Server> SERVER = new ThreadLocal<Server>();
   private static final ThreadLocal<Server> SERVER = new ThreadLocal<Server>();
 
 
@@ -1235,7 +1235,7 @@ public abstract class Server {
             LOG.debug("SASL server successfully authenticated client: " + user);
             LOG.debug("SASL server successfully authenticated client: " + user);
           }
           }
           rpcMetrics.incrAuthenticationSuccesses();
           rpcMetrics.incrAuthenticationSuccesses();
-          AUDITLOG.info(AUTH_SUCCESSFULL_FOR + user);
+          AUDITLOG.info(AUTH_SUCCESSFUL_FOR + user);
           saslContextEstablished = true;
           saslContextEstablished = true;
         }
         }
       } else {
       } else {

+ 2 - 2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ServiceAuthorizationManager.java

@@ -59,7 +59,7 @@ public class ServiceAuthorizationManager {
   public static final Log AUDITLOG =
   public static final Log AUDITLOG =
     LogFactory.getLog("SecurityLogger."+ServiceAuthorizationManager.class.getName());
     LogFactory.getLog("SecurityLogger."+ServiceAuthorizationManager.class.getName());
 
 
-  private static final String AUTHZ_SUCCESSFULL_FOR = "Authorization successfull for ";
+  private static final String AUTHZ_SUCCESSFUL_FOR = "Authorization successful for ";
   private static final String AUTHZ_FAILED_FOR = "Authorization failed for ";
   private static final String AUTHZ_FAILED_FOR = "Authorization failed for ";
 
 
   
   
@@ -108,7 +108,7 @@ public class ServiceAuthorizationManager {
           " is not authorized for protocol " + protocol + 
           " is not authorized for protocol " + protocol + 
           ", expected client Kerberos principal is " + clientPrincipal);
           ", expected client Kerberos principal is " + clientPrincipal);
     }
     }
-    AUDITLOG.info(AUTHZ_SUCCESSFULL_FOR + user + " for protocol="+protocol);
+    AUDITLOG.info(AUTHZ_SUCCESSFUL_FOR + user + " for protocol="+protocol);
   }
   }
 
 
   public synchronized void refresh(Configuration conf,
   public synchronized void refresh(Configuration conf,

+ 1 - 1
hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c

@@ -70,7 +70,7 @@ Java_org_apache_hadoop_security_JniBasedUnixGroupsNetgroupMapping_getUsersForNet
 
 
   // set the name of the group for subsequent calls to getnetgrent
   // set the name of the group for subsequent calls to getnetgrent
   // note that we want to end group lokup regardless whether setnetgrent
   // note that we want to end group lokup regardless whether setnetgrent
-  // was successfull or not (as long as it was called we need to call
+  // was successful or not (as long as it was called we need to call
   // endnetgrent)
   // endnetgrent)
   setnetgrentCalledFlag = 1;
   setnetgrentCalledFlag = 1;
   if(setnetgrent(cgroup) == 1) {
   if(setnetgrent(cgroup) == 1) {