svn merge -c 1442824 from trunk for HDFS-4468. Use the new StringUtils methods added by HADOOP-9252 and fix TestHDFSCLI and TestQuota.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442825 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze
parent
2d5f195730
commit
f817236ff2
|
|
@ -463,6 +463,9 @@ Release 2.0.3-alpha - Unreleased
|
|||
HDFS-4344. dfshealth.jsp throws NumberFormatException when
|
||||
dfs.hosts/dfs.hosts.exclude includes port number. (Andy Isaacson via atm)
|
||||
|
||||
HDFS-4468. Use the new StringUtils methods added by HADOOP-9252 and fix
|
||||
TestHDFSCLI and TestQuota. (szetszwo)
|
||||
|
||||
BREAKDOWN OF HDFS-3077 SUBTASKS
|
||||
|
||||
HDFS-3077. Quorum-based protocol for reading and writing edit logs.
|
||||
|
|
|
|||
|
|
@ -923,6 +923,11 @@ public class DFSUtil {
|
|||
return capacity <= 0 ? 0 : (remaining * 100.0f)/capacity;
|
||||
}
|
||||
|
||||
/** Convert percentage to a string. */
|
||||
public static String percent2String(double percentage) {
|
||||
return StringUtils.format("%.2f%%", percentage);
|
||||
}
|
||||
|
||||
/**
|
||||
* Round bytes to GiB (gibibyte)
|
||||
* @param bytes number of bytes
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ package org.apache.hadoop.hdfs.protocol;
|
|||
|
||||
import org.apache.hadoop.classification.InterfaceAudience;
|
||||
import org.apache.hadoop.classification.InterfaceStability;
|
||||
import org.apache.hadoop.util.StringUtils;
|
||||
import static org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix.long2String;
|
||||
|
||||
@InterfaceAudience.Private
|
||||
@InterfaceStability.Evolving
|
||||
|
|
@ -41,9 +41,9 @@ public class DSQuotaExceededException extends QuotaExceededException {
|
|||
public String getMessage() {
|
||||
String msg = super.getMessage();
|
||||
if (msg == null) {
|
||||
return "The DiskSpace quota" + (pathName==null?"":(" of " + pathName)) +
|
||||
" is exceeded: quota=" + StringUtils.humanReadableInt(quota) +
|
||||
" diskspace consumed=" + StringUtils.humanReadableInt(count);
|
||||
return "The DiskSpace quota" + (pathName==null?"": " of " + pathName)
|
||||
+ " is exceeded: quota = " + quota + " B = " + long2String(quota, "B", 2)
|
||||
+ " but diskspace consumed = " + count + " B = " + long2String(count, "B", 2);
|
||||
} else {
|
||||
return msg;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,13 @@
|
|||
*/
|
||||
package org.apache.hadoop.hdfs.protocol;
|
||||
|
||||
import static org.apache.hadoop.hdfs.DFSUtil.percent2String;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import org.apache.hadoop.classification.InterfaceAudience;
|
||||
import org.apache.hadoop.classification.InterfaceStability;
|
||||
import org.apache.hadoop.hdfs.DFSConfigKeys;
|
||||
import org.apache.hadoop.hdfs.DFSUtil;
|
||||
import org.apache.hadoop.net.NetUtils;
|
||||
import org.apache.hadoop.net.NetworkTopology;
|
||||
|
|
@ -242,8 +245,8 @@ public class DatanodeInfo extends DatanodeID implements Node {
|
|||
buffer.append("DFS Used: "+u+" ("+StringUtils.byteDesc(u)+")"+"\n");
|
||||
buffer.append("Non DFS Used: "+nonDFSUsed+" ("+StringUtils.byteDesc(nonDFSUsed)+")"+"\n");
|
||||
buffer.append("DFS Remaining: " +r+ " ("+StringUtils.byteDesc(r)+")"+"\n");
|
||||
buffer.append("DFS Used%: "+StringUtils.limitDecimalTo2(usedPercent)+"%\n");
|
||||
buffer.append("DFS Remaining%: "+StringUtils.limitDecimalTo2(remainingPercent)+"%\n");
|
||||
buffer.append("DFS Used%: "+percent2String(usedPercent) + "\n");
|
||||
buffer.append("DFS Remaining%: "+percent2String(remainingPercent) + "\n");
|
||||
buffer.append("Last contact: "+new Date(lastUpdate)+"\n");
|
||||
return buffer.toString();
|
||||
}
|
||||
|
|
@ -267,7 +270,7 @@ public class DatanodeInfo extends DatanodeID implements Node {
|
|||
}
|
||||
buffer.append(" " + c + "(" + StringUtils.byteDesc(c)+")");
|
||||
buffer.append(" " + u + "(" + StringUtils.byteDesc(u)+")");
|
||||
buffer.append(" " + StringUtils.limitDecimalTo2(((1.0*u)/c)*100)+"%");
|
||||
buffer.append(" " + percent2String(u/(double)c));
|
||||
buffer.append(" " + r + "(" + StringUtils.byteDesc(r)+")");
|
||||
buffer.append(" " + new Date(lastUpdate));
|
||||
return buffer.toString();
|
||||
|
|
|
|||
|
|
@ -569,12 +569,10 @@ class ClusterJspHelper {
|
|||
toXmlItemBlock(doc, "DFS Remaining", StringUtils.byteDesc(free));
|
||||
|
||||
// dfsUsedPercent
|
||||
toXmlItemBlock(doc, "DFS Used%",
|
||||
StringUtils.limitDecimalTo2(dfsUsedPercent)+ "%");
|
||||
toXmlItemBlock(doc, "DFS Used%", DFSUtil.percent2String(dfsUsedPercent));
|
||||
|
||||
// dfsRemainingPercent
|
||||
toXmlItemBlock(doc, "DFS Remaining%",
|
||||
StringUtils.limitDecimalTo2(dfsRemainingPercent) + "%");
|
||||
toXmlItemBlock(doc, "DFS Remaining%", DFSUtil.percent2String(dfsRemainingPercent));
|
||||
|
||||
doc.endTag(); // storage
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@
|
|||
*/
|
||||
package org.apache.hadoop.hdfs.server.namenode;
|
||||
|
||||
import static org.apache.hadoop.hdfs.DFSUtil.percent2String;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.lang.management.ManagementFactory;
|
||||
import java.lang.management.MemoryMXBean;
|
||||
|
|
@ -64,6 +66,14 @@ import org.znerd.xmlenc.XMLOutputter;
|
|||
import com.google.common.base.Preconditions;
|
||||
|
||||
class NamenodeJspHelper {
|
||||
static String fraction2String(double value) {
|
||||
return StringUtils.format("%.2f", value);
|
||||
}
|
||||
|
||||
static String fraction2String(long numerator, long denominator) {
|
||||
return fraction2String(numerator/(double)denominator);
|
||||
}
|
||||
|
||||
static String getSafeModeText(FSNamesystem fsn) {
|
||||
if (!fsn.isInSafeMode())
|
||||
return "";
|
||||
|
|
@ -361,20 +371,20 @@ class NamenodeJspHelper {
|
|||
+ "DFS Remaining" + colTxt() + ":" + colTxt()
|
||||
+ StringUtils.byteDesc(remaining) + rowTxt() + colTxt() + "DFS Used%"
|
||||
+ colTxt() + ":" + colTxt()
|
||||
+ StringUtils.limitDecimalTo2(percentUsed) + " %" + rowTxt()
|
||||
+ percent2String(percentUsed) + rowTxt()
|
||||
+ colTxt() + "DFS Remaining%" + colTxt() + ":" + colTxt()
|
||||
+ StringUtils.limitDecimalTo2(percentRemaining) + " %"
|
||||
+ percent2String(percentRemaining)
|
||||
+ rowTxt() + colTxt() + "Block Pool Used" + colTxt() + ":" + colTxt()
|
||||
+ StringUtils.byteDesc(bpUsed) + rowTxt()
|
||||
+ colTxt() + "Block Pool Used%"+ colTxt() + ":" + colTxt()
|
||||
+ StringUtils.limitDecimalTo2(percentBpUsed) + " %"
|
||||
+ percent2String(percentBpUsed)
|
||||
+ rowTxt() + colTxt() + "DataNodes usages" + colTxt() + ":" + colTxt()
|
||||
+ "Min %" + colTxt() + "Median %" + colTxt() + "Max %" + colTxt()
|
||||
+ "stdev %" + rowTxt() + colTxt() + colTxt() + colTxt()
|
||||
+ StringUtils.limitDecimalTo2(min) + " %"
|
||||
+ colTxt() + StringUtils.limitDecimalTo2(median) + " %"
|
||||
+ colTxt() + StringUtils.limitDecimalTo2(max) + " %"
|
||||
+ colTxt() + StringUtils.limitDecimalTo2(dev) + " %"
|
||||
+ percent2String(min)
|
||||
+ colTxt() + percent2String(median)
|
||||
+ colTxt() + percent2String(max)
|
||||
+ colTxt() + percent2String(dev)
|
||||
+ rowTxt() + colTxt()
|
||||
+ "<a href=\"dfsnodelist.jsp?whatNodes=LIVE\">Live Nodes</a> "
|
||||
+ colTxt() + ":" + colTxt() + live.size()
|
||||
|
|
@ -562,9 +572,9 @@ class NamenodeJspHelper {
|
|||
long u = d.getDfsUsed();
|
||||
long nu = d.getNonDfsUsed();
|
||||
long r = d.getRemaining();
|
||||
String percentUsed = StringUtils.limitDecimalTo2(d.getDfsUsedPercent());
|
||||
String percentRemaining = StringUtils.limitDecimalTo2(d
|
||||
.getRemainingPercent());
|
||||
final double percentUsedValue = d.getDfsUsedPercent();
|
||||
String percentUsed = fraction2String(percentUsedValue);
|
||||
String percentRemaining = fraction2String(d.getRemainingPercent());
|
||||
|
||||
String adminState = d.getAdminState().toString();
|
||||
|
||||
|
|
@ -572,32 +582,30 @@ class NamenodeJspHelper {
|
|||
long currentTime = Time.now();
|
||||
|
||||
long bpUsed = d.getBlockPoolUsed();
|
||||
String percentBpUsed = StringUtils.limitDecimalTo2(d
|
||||
.getBlockPoolUsedPercent());
|
||||
String percentBpUsed = fraction2String(d.getBlockPoolUsedPercent());
|
||||
|
||||
out.print("<td class=\"lastcontact\"> "
|
||||
+ ((currentTime - timestamp) / 1000)
|
||||
+ "<td class=\"adminstate\">"
|
||||
+ adminState
|
||||
+ "<td align=\"right\" class=\"capacity\">"
|
||||
+ StringUtils.limitDecimalTo2(c * 1.0 / diskBytes)
|
||||
+ fraction2String(c, diskBytes)
|
||||
+ "<td align=\"right\" class=\"used\">"
|
||||
+ StringUtils.limitDecimalTo2(u * 1.0 / diskBytes)
|
||||
+ fraction2String(u, diskBytes)
|
||||
+ "<td align=\"right\" class=\"nondfsused\">"
|
||||
+ StringUtils.limitDecimalTo2(nu * 1.0 / diskBytes)
|
||||
+ fraction2String(nu, diskBytes)
|
||||
+ "<td align=\"right\" class=\"remaining\">"
|
||||
+ StringUtils.limitDecimalTo2(r * 1.0 / diskBytes)
|
||||
+ fraction2String(r, diskBytes)
|
||||
+ "<td align=\"right\" class=\"pcused\">"
|
||||
+ percentUsed
|
||||
+ "<td class=\"pcused\">"
|
||||
+ ServletUtil.percentageGraph((int) Double.parseDouble(percentUsed),
|
||||
100)
|
||||
+ ServletUtil.percentageGraph((int)percentUsedValue, 100)
|
||||
+ "<td align=\"right\" class=\"pcremaining\">"
|
||||
+ percentRemaining
|
||||
+ "<td title=" + "\"blocks scheduled : "
|
||||
+ d.getBlocksScheduled() + "\" class=\"blocks\">" + d.numBlocks()+"\n"
|
||||
+ "<td align=\"right\" class=\"bpused\">"
|
||||
+ StringUtils.limitDecimalTo2(bpUsed * 1.0 / diskBytes)
|
||||
+ fraction2String(bpUsed, diskBytes)
|
||||
+ "<td align=\"right\" class=\"pcbpused\">"
|
||||
+ percentBpUsed
|
||||
+ "<td align=\"right\" class=\"volfails\">"
|
||||
|
|
|
|||
|
|
@ -316,8 +316,7 @@ public class DFSAdmin extends FsShell {
|
|||
System.out.println("DFS Used: " + used
|
||||
+ " (" + StringUtils.byteDesc(used) + ")");
|
||||
System.out.println("DFS Used%: "
|
||||
+ StringUtils.limitDecimalTo2(((1.0 * used) / presentCapacity) * 100)
|
||||
+ "%");
|
||||
+ StringUtils.formatPercent(used/(double)presentCapacity, 2));
|
||||
|
||||
/* These counts are not always upto date. They are updated after
|
||||
* iteration of an internal list. Should be updated in a few seconds to
|
||||
|
|
|
|||
|
|
@ -68,8 +68,8 @@ public class TestQuota {
|
|||
throw new DSQuotaExceededException(bytes, bytes);
|
||||
} catch(DSQuotaExceededException e) {
|
||||
|
||||
assertEquals("The DiskSpace quota is exceeded: quota=1.0k " +
|
||||
"diskspace consumed=1.0k", e.getMessage());
|
||||
assertEquals("The DiskSpace quota is exceeded: quota = 1024 B = 1 KB"
|
||||
+ " but diskspace consumed = 1024 B = 1 KB", e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1182,7 +1182,7 @@
|
|||
</comparator>
|
||||
<comparator>
|
||||
<type>RegexpComparator</type>
|
||||
<expected-output>^1\.0k\s+hdfs:///dir0/data1k</expected-output>
|
||||
<expected-output>^1\.0 K\s+hdfs:///dir0/data1k</expected-output>
|
||||
</comparator>
|
||||
</comparators>
|
||||
</test>
|
||||
|
|
@ -15590,7 +15590,7 @@
|
|||
<comparators>
|
||||
<comparator>
|
||||
<type>RegexpComparator</type>
|
||||
<expected-output>put: The DiskSpace quota of /dir1 is exceeded: quota=1.0k diskspace consumed=[0-9.]+[kmg]*</expected-output>
|
||||
<expected-output>put: The DiskSpace quota of /dir1 is exceeded: quota = 1024 B = 1 KB but diskspace consumed = [0-9]+ B = [0-9.]+ [KMG]B*</expected-output>
|
||||
</comparator>
|
||||
</comparators>
|
||||
</test>
|
||||
|
|
|
|||
Loading…
Reference in New Issue