From a963baba10648859ad88d4ed9a4325b66b1af0d5 Mon Sep 17 00:00:00 2001
From: Yongjun Zhang <yzhang@cloudera.com>
Date: Fri, 19 Feb 2016 09:41:22 -0800
Subject: [PATCH] HADOOP-12828. Print user when services are started. (Wei-Chiu
 Chuang via Yongjun Zhang)

---
 hadoop-common-project/hadoop-common/CHANGES.txt                | 3 +++
 .../src/main/java/org/apache/hadoop/util/StringUtils.java      | 1 +
 .../org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java     | 1 +
 3 files changed, 5 insertions(+)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 91ef68eae8d..bf84d7a6445 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1134,6 +1134,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-11031. Design Document for Credential Provider API.
     (Larry McCay via cnauroth)
 
+    HADOOP-12828. Print user when services are started.
+    (Wei-Chiu Chuang via Yongjun Zhang) 
+
   OPTIMIZATIONS
 
     HADOOP-11785. Reduce the number of listStatus operation in distcp
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java
index 1ccdb227dba..31f69146835 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java
@@ -687,6 +687,7 @@ static void startupShutdownMessage(Class<?> clazz, String[] args,
     LOG.info(
         toStartupShutdownString("STARTUP_MSG: ", new String[] {
             "Starting " + classname,
+            "  user = " + System.getProperty("user.name"),
             "  host = " + hostname,
             "  args = " + Arrays.asList(args),
             "  version = " + VersionInfo.getVersion(),
diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
index 325f8db27a0..3b439a4e4d3 100644
--- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
+++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
@@ -124,6 +124,7 @@ public void contextInitialized(ServletContextEvent sce) {
       LOG.info("-------------------------------------------------------------");
       LOG.info("  Java runtime version : {}", System.getProperty(
           "java.runtime.version"));
+      LOG.info("  User: {}", System.getProperty("user.name"));
       LOG.info("  KMS Hadoop Version: " + VersionInfo.getVersion());
       LOG.info("-------------------------------------------------------------");