diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/StringHelper.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/StringHelper.java index e6f23f0..de1e436 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/StringHelper.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/StringHelper.java @@ -20,6 +20,8 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; + +import java.util.Locale; import java.util.regex.Pattern; import org.apache.hadoop.classification.InterfaceAudience.Private; @@ -176,7 +178,7 @@ private static void uappend(StringBuilder sb, String part) { } public static String percent(double value) { - return String.format("%.2f", value * 100); + return String.format(Locale.US, "%.2f", value * 100); } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java index f341cf6..03eefee 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java @@ -26,6 +26,7 @@ import java.security.PrivilegedExceptionAction; import java.util.Collection; import java.util.HashSet; +import java.util.Locale; import org.apache.commons.lang.StringEscapeUtils; import org.apache.hadoop.security.UserGroupInformation; @@ -98,7 +99,8 @@ public void render(Block html) { continue; } AppInfo app = new AppInfo(appReport); - String percent = String.format("%.1f", app.getProgress() * 100.0F); + String percent = + String.format(Locale.US, "%.1f", app.getProgress() * 100.0F); // AppID numerical value parsed by parseHadoopID in yarn.dt.plugins.js appsTableData .append("[\"") diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java index 83df72b..86762cc 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java @@ -21,6 +21,7 @@ import static org.apache.hadoop.yarn.util.StringHelper.join; import java.util.ArrayList; +import java.util.Locale; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; @@ -119,7 +120,7 @@ protected void render(Block html) { _("Configured Capacity:", percent(lqinfo.getCapacity() / 100)). _("Configured Max Capacity:", percent(lqinfo.getMaxCapacity() / 100)). _("Configured Minimum User Limit Percent:", Integer.toString(lqinfo.getUserLimit()) + "%"). - _("Configured User Limit Factor:", String.format("%.1f", lqinfo.getUserLimitFactor())). + _("Configured User Limit Factor:", String.format(Locale.US, "%.1f", lqinfo.getUserLimitFactor())). _r("Active Users: ", activeUserList.toString()). _("Accessible Node Labels:", StringUtils.join(",", lqinfo.getNodeLabels())). _("Preemption:", lqinfo.getPreemptionDisabled() ? "disabled" : "enabled"); @@ -276,14 +277,14 @@ public void render(Block html) { } static String percent(float f) { - return String.format("%.1f%%", f * 100); + return String.format(Locale.US, "%.1f%%", f * 100); } static String width(float f) { - return String.format("width:%.1f%%", f * 100); + return String.format(Locale.US, "width:%.1f%%", f * 100); } static String left(float f) { - return String.format("left:%.1f%%", f * 100); + return String.format(Locale.US, "left:%.1f%%", f * 100); } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java index e05987b..80c2e69 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java @@ -32,6 +32,8 @@ import com.google.inject.Inject; +import java.util.Locale; + class DefaultSchedulerPage extends RmView { static final String _Q = ".ui-state-default.ui-corner-all"; static final float WIDTH_F = 0.8f; @@ -148,14 +150,14 @@ public void render(Block html) { } static String percent(float f) { - return String.format("%.1f%%", f * 100); + return String.format(Locale.US, "%.1f%%", f * 100); } static String width(float f) { - return String.format("width:%.1f%%", f * 100); + return String.format(Locale.US, "width:%.1f%%", f * 100); } static String left(float f) { - return String.format("left:%.1f%%", f * 100); + return String.format(Locale.US, "left:%.1f%%", f * 100); } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java index 42ee53c..d7e7101 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java @@ -25,6 +25,7 @@ import java.util.Collection; import java.util.HashSet; +import java.util.Locale; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -108,7 +109,7 @@ public FairSchedulerAppsBlock(ResourceManager rm, ViewContext ctx, continue; } AppInfo appInfo = new AppInfo(app, true, WebAppUtils.getHttpSchemePrefix(conf)); - String percent = String.format("%.1f", appInfo.getProgress()); + String percent = String.format(Locale.US, "%.1f", appInfo.getProgress()); ApplicationAttemptId attemptId = app.getCurrentAppAttempt().getAppAttemptId(); int fairShare = fsinfo.getAppFairShare(attemptId); if (fairShare == FairSchedulerInfo.INVALID_FAIR_SHARE) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java index 8c54f4e..c25738f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java @@ -21,6 +21,7 @@ import static org.apache.hadoop.yarn.util.StringHelper.join; import java.util.Collection; +import java.util.Locale; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler; @@ -235,15 +236,15 @@ public void render(Block html) { } static String percent(float f) { - return String.format("%.1f%%", f * 100); + return String.format(Locale.US, "%.1f%%", f * 100); } static String width(float f) { - return String.format("width:%.1f%%", f * 100); + return String.format(Locale.US, "width:%.1f%%", f * 100); } static String left(float f) { - return String.format("left:%.1f%%", f * 100); + return String.format(Locale.US, "left:%.1f%%", f * 100); } @Override