Updating the log level to debug and warn instead of info level

Author: Hean Chhinling

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java

@@ -47,11 +47,10 @@
 import org.apache.hadoop.yarn.webapp.NotFoundException;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.utils.URLEncodedUtils;
+import javax.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServletRequest;
-
 @Private
 @Evolving
 public class WebAppUtils {
@@ -512,18 +511,16 @@ static String getPassword(Configuration conf, String alias) {
       char[] passchars = conf.getPassword(alias);
       if (passchars != null) {
         password = new String(passchars);
-        LOG.info("Successful password retrieval for alias: {}", alias);
+        LOG.debug("Successful password retrival for alias: {}", alias);
+      } else {
+        LOG.warn("Password retrieval failed, no password found for alias: {}", alias);
       }
     }
     catch (IOException ioe) {
       password = null;
       LOG.error("Unable to retrieve password for alias: {}", alias, ioe);
     }
 
-    if (password == null) {
-      LOG.error("Password does not exist for alias: {}", alias);
-    }
-
     return password;
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/util/TestWebAppUtils.java

@@ -25,7 +25,6 @@
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.hadoop.yarn.util.TestBoundedAppender;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -44,7 +43,6 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.when;
 
 public class TestWebAppUtils {
   private static final String RM1_NODE_ID = "rm1";
@@ -115,7 +113,7 @@ void testGetPassword() throws Exception {
   void testGetPasswordIOException() throws Exception {
     Configuration mockConf = Mockito.mock(Configuration.class);
 
-    when(mockConf.getPassword("error-alias")).thenThrow(new IOException("Simulated IO error"));
+    Mockito.when(mockConf.getPassword("error-alias")).thenThrow(new IOException("Simulated IO error"));
 
     assertNull(WebAppUtils.getPassword(mockConf, "error-alias"));
   }
@@ -197,7 +195,7 @@ protected Configuration provisionCredentialsForSSL() throws IOException,
   void testAppendQueryParams() throws Exception {
     HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
     String targetUri = "/test/path";
-    when(request.getCharacterEncoding()).thenReturn(null);
+    Mockito.when(request.getCharacterEncoding()).thenReturn(null);
     Map<String, String> paramResultMap = new HashMap<>();
     paramResultMap.put("param1=x", targetUri + "?" + "param1=x");
     paramResultMap
@@ -206,7 +204,7 @@ void testAppendQueryParams() throws Exception {
         targetUri + "?" + "param1=x&param2=y&param3=x+y");
 
     for (Map.Entry<String, String> entry : paramResultMap.entrySet()) {
-      when(request.getQueryString()).thenReturn(entry.getKey());
+      Mockito.when(request.getQueryString()).thenReturn(entry.getKey());
       String uri = WebAppUtils.appendQueryParams(request, targetUri);
       assertEquals(entry.getValue(), uri);
     }
@@ -216,8 +214,8 @@ void testAppendQueryParams() throws Exception {
   void testGetHtmlEscapedURIWithQueryString() throws Exception {
     HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
     String targetUri = "/test/path";
-    when(request.getCharacterEncoding()).thenReturn(null);
-    when(request.getRequestURI()).thenReturn(targetUri);
+    Mockito.when(request.getCharacterEncoding()).thenReturn(null);
+    Mockito.when(request.getRequestURI()).thenReturn(targetUri);
     Map<String, String> paramResultMap = new HashMap<>();
     paramResultMap.put("param1=x", targetUri + "?" + "param1=x");
     paramResultMap
@@ -226,7 +224,7 @@ void testGetHtmlEscapedURIWithQueryString() throws Exception {
         targetUri + "?" + "param1=x&amp;param2=y&amp;param3=x+y");
 
     for (Map.Entry<String, String> entry : paramResultMap.entrySet()) {
-      when(request.getQueryString()).thenReturn(entry.getKey());
+      Mockito.when(request.getQueryString()).thenReturn(entry.getKey());
       String uri = WebAppUtils.getHtmlEscapedURIWithQueryString(request);
       assertEquals(entry.getValue(), uri);
     }