hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r429851 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/dfs/JspHelper.java src/webapps/dfs/dfshealth.jsp
Date Tue, 08 Aug 2006 22:14:05 GMT
Author: cutting
Date: Tue Aug  8 15:14:04 2006
New Revision: 429851

URL: http://svn.apache.org/viewvc?rev=429851&view=rev
Log:
HADOOP-415.  Replace some uses of DatanodeDescriptor in the DFS web ui code with DatanodeInfo,
the preferred public class.  Contributed by Devaraj.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/JspHelper.java
    lucene/hadoop/trunk/src/webapps/dfs/dfshealth.jsp

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=429851&r1=429850&r2=429851&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Tue Aug  8 15:14:04 2006
@@ -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

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/JspHelper.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/JspHelper.java?rev=429851&r1=429850&r2=429851&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/JspHelper.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/JspHelper.java Tue Aug  8 15:14:04
2006
@@ -143,7 +143,7 @@
       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();

Modified: lucene/hadoop/trunk/src/webapps/dfs/dfshealth.jsp
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/webapps/dfs/dfshealth.jsp?rev=429851&r1=429850&r2=429851&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/webapps/dfs/dfshealth.jsp (original)
+++ lucene/hadoop/trunk/src/webapps/dfs/dfshealth.jsp Tue Aug  8 15:14:04 2006
@@ -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() +



Mime
View raw message