Selaa lähdekoodia

HADOOP-415. Replace some uses of DatanodeDescriptor in the DFS web ui code with DatanodeInfo, the preferred public class. Contributed by Devaraj.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@429851 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 19 vuotta sitten
vanhempi
commit
b85901efc8
3 muutettua tiedostoa jossa 13 lisäystä ja 6 poistoa
  1. 7 0
      CHANGES.txt
  2. 1 1
      src/java/org/apache/hadoop/dfs/JspHelper.java
  3. 5 5
      src/webapps/dfs/dfshealth.jsp

+ 7 - 0
CHANGES.txt

@@ -1,6 +1,13 @@
 Hadoop Change Log
 
 
+Trunk (unreleased changes)
+
+ 1. HADOOP-415.  Replace some uses of DatanodeDescriptor in the DFS
+    web UI code with DatanodeInfo, the preferred public class.
+    (Devaraj Das via cutting)
+
+
 Release 0.5.0 - 2006-08-04
 
  1. HADOOP-352.  Fix shell scripts to use /bin/sh instead of

+ 1 - 1
src/java/org/apache/hadoop/dfs/JspHelper.java

@@ -143,7 +143,7 @@ public class JspHelper {
       TreeMap nodesSortedByName = new TreeMap();
       fsn.DFSNodesStatus(live, dead);
       for (int num = 0; num < live.size(); num++) {
-        DatanodeDescriptor d = (DatanodeDescriptor)live.elementAt(num);
+        DatanodeInfo d = (DatanodeInfo)live.elementAt(num);
         nodesSortedByName.put(d.getName(), d);
       }
       live.clear();

+ 5 - 5
src/webapps/dfs/dfshealth.jsp

@@ -13,7 +13,7 @@
   long currentTime;
   JspHelper jspHelper = new JspHelper();
 
-  public void generateLiveNodeData(JspWriter out, DatanodeDescriptor d) 
+  public void generateLiveNodeData(JspWriter out, DatanodeInfo d) 
     throws IOException {
     long c = d.getCapacity();
     long r = d.getRemaining();
@@ -57,8 +57,8 @@
       int max = (live.size() > dead.size()) ? live.size() : dead.size();
       currentTime = System.currentTimeMillis();
       for (i = 0; i < min; i++) {
-        DatanodeDescriptor l = (DatanodeDescriptor)live.elementAt(i);
-        DatanodeDescriptor d = (DatanodeDescriptor)dead.elementAt(i);
+        DatanodeInfo l = (DatanodeInfo)live.elementAt(i);
+        DatanodeInfo d = (DatanodeInfo)dead.elementAt(i);
         out.print("<tr>");
         generateLiveNodeData(out, l);
         out.print("<td style=\"vertical-align: top;\">" + 
@@ -70,12 +70,12 @@
       for (i = min; i < max; i++) {
         out.print("<tr>");
         if (type == 1) {
-          DatanodeDescriptor l = (DatanodeDescriptor)live.elementAt(i);
+          DatanodeInfo l = (DatanodeInfo)live.elementAt(i);
           generateLiveNodeData(out, l);
           out.print("<td style=\"vertical-align: top;\"><br></td>");
         }
         else if (type == 0) {
-          DatanodeDescriptor d = (DatanodeDescriptor)dead.elementAt(i);
+          DatanodeInfo d = (DatanodeInfo)dead.elementAt(i);
           out.print("<td style=\"vertical-align: top;\"><br></td>");
           out.print("<td style=\"vertical-align: top;\">" + 
                     d.getName() +