diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceTypeInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceTypeInfo.java
index b6f7f14765..87753426ac 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceTypeInfo.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceTypeInfo.java
@@ -152,9 +152,10 @@ public static void copy(ResourceTypeInfo src, ResourceTypeInfo dst) {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("<name=").append(this.getName()).append(" default-unit=").append(
-        this.getDefaultUnit()).append(" type=" + getResourceType()).append(
-        ">");
+    sb.append(this.getName());
+    if (!this.getDefaultUnit().isEmpty()) {
+      sb.append(" (unit=").append(this.getDefaultUnit()).append(")");
+    }
     return sb.toString();
   }
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java
index a1b5f6e9b0..1779899890 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java
@@ -22,8 +22,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.protocolrecords.ResourceTypes;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -118,19 +116,21 @@ private static void addMandatoryResources(
       Map<String, ResourceInformation> res) {
     ResourceInformation ri;
     if (!res.containsKey(MEMORY)) {
-      LOG.info("Adding resource type - name = " + MEMORY + ", units = "
-          + ResourceInformation.MEMORY_MB.getUnits() + ", type = "
-          + ResourceTypes.COUNTABLE);
-      ri = ResourceInformation
-          .newInstance(MEMORY,
-              ResourceInformation.MEMORY_MB.getUnits());
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("Adding resource type - name = " + MEMORY + ", units = "
+            + ResourceInformation.MEMORY_MB.getUnits() + ", type = "
+            + ResourceTypes.COUNTABLE);
+      }
+      ri = ResourceInformation.newInstance(MEMORY,
+          ResourceInformation.MEMORY_MB.getUnits());
       res.put(MEMORY, ri);
     }
     if (!res.containsKey(VCORES)) {
-      LOG.info("Adding resource type - name = " + VCORES + ", units = , type = "
-          + ResourceTypes.COUNTABLE);
-      ri =
-          ResourceInformation.newInstance(VCORES);
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("Adding resource type - name = " + VCORES
+            + ", units = , type = " + ResourceTypes.COUNTABLE);
+      }
+      ri = ResourceInformation.newInstance(VCORES);
       res.put(VCORES, ri);
     }
   }
@@ -343,11 +343,11 @@ private static void initializeResourceTypesIfNeeded(Configuration conf,
           }
           try {
             addResourcesFileToConf(resourceFile, conf);
-            LOG.debug("Found " + resourceFile + ", adding to configuration");
           } catch (FileNotFoundException fe) {
-            LOG.debug("Unable to find '" + resourceFile + "'.");
+            if (LOG.isDebugEnabled()) {
+              LOG.debug("Unable to find '" + resourceFile + "'.");
+            }
           }
-
           initializeResourcesMap(conf);
         }
       }
@@ -388,7 +388,9 @@ private static void addResourcesFileToConf(String resourceFile,
       Configuration conf) throws FileNotFoundException {
     try {
       InputStream ris = getConfInputStream(resourceFile, conf);
-      LOG.debug("Found " + resourceFile + ", adding to configuration");
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("Found " + resourceFile + ", adding to configuration");
+      }
       conf.addResource(ris);
     } catch (FileNotFoundException fe) {
       throw fe;
@@ -472,7 +474,10 @@ private static Map<String, ResourceInformation> initializeNodeResourceInformatio
         }
       }
     } catch (FileNotFoundException fe) {
-      LOG.info("Couldn't find node resources file");
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("Couldn't find node resources file: "
+            + YarnConfiguration.NODE_RESOURCES_CONFIGURATION_FILE);
+      }
     }
     return nodeResources;
   }
@@ -492,8 +497,10 @@ private static void addResourceInformation(String prop, String value,
           Long.valueOf(value.substring(0, value.length() - units.length()));
       nodeResources.get(resourceType).setValue(resourceValue);
       nodeResources.get(resourceType).setUnits(units);
-      LOG.debug("Setting value for resource type " + resourceType + " to "
-              + resourceValue + " with units " + units);
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("Setting value for resource type " + resourceType + " to "
+            + resourceValue + " with units " + units);
+      }
     }
   }