Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A99847011 for ; Mon, 18 Jul 2011 16:45:53 +0000 (UTC) Received: (qmail 57897 invoked by uid 500); 18 Jul 2011 16:45:53 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 57808 invoked by uid 500); 18 Jul 2011 16:45:52 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 57796 invoked by uid 99); 18 Jul 2011 16:45:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jul 2011 16:45:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jul 2011 16:45:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A932F2388894; Mon, 18 Jul 2011 16:45:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1147964 - in /hadoop/common/trunk/hdfs: CHANGES.txt src/java/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java Date: Mon, 18 Jul 2011 16:45:30 -0000 To: hdfs-commits@hadoop.apache.org From: suresh@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110718164530.A932F2388894@eris.apache.org> Author: suresh Date: Mon Jul 18 16:45:28 2011 New Revision: 1147964 URL: http://svn.apache.org/viewvc?rev=1147964&view=rev Log: HDFS-2143. Federation: In cluster web console, add link to namenode page that displays live and dead datanodes. Contributed by Ravi Prakash. Modified: hadoop/common/trunk/hdfs/CHANGES.txt hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java Modified: hadoop/common/trunk/hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hdfs/CHANGES.txt?rev=1147964&r1=1147963&r2=1147964&view=diff ============================================================================== --- hadoop/common/trunk/hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hdfs/CHANGES.txt Mon Jul 18 16:45:28 2011 @@ -317,6 +317,9 @@ Trunk (unreleased changes) HDFS-1547. Improve decommission mechanism. (suresh) + HDFS-2143. Federation: In cluster web console, add link to namenode page + that displays live and dead datanodes. (Ravi Prakash via suresh) + HDFS-1588. Remove hardcoded strings for configuration keys, "dfs.hosts" and "dfs.hosts.exlude". (Erik Steffl via suresh) Modified: hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java?rev=1147964&r1=1147963&r2=1147964&view=diff ============================================================================== --- hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java (original) +++ hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/ClusterJspHelper.java Mon Jul 18 16:45:28 2011 @@ -584,12 +584,12 @@ class ClusterJspHelper { toXmlItemBlock(doc, "Blocks", Long.toString(nn.blocksCount)); toXmlItemBlock(doc, "Missing Blocks", Long.toString(nn.missingBlocksCount)); - toXmlItemBlock(doc, "Live Datanode (Decommissioned)", - Integer.toString(nn.liveDatanodeCount) + " (" - + Integer.toString(nn.liveDecomCount) + ")"); - toXmlItemBlock(doc, "Dead Datanode (Decommissioned)", - Integer.toString(nn.deadDatanodeCount) + " (" - + Integer.toString(nn.deadDecomCount) + ")"); + toXmlItemBlockWithLink(doc, nn.liveDatanodeCount + " (" + + nn.liveDecomCount + ")", nn.httpAddress+"/dfsnodelist.jsp?whatNodes=LIVE", + "Live Datanode (Decommissioned)"); + toXmlItemBlockWithLink(doc, nn.deadDatanodeCount + " (" + + nn.deadDecomCount + ")", nn.httpAddress+"/dfsnodelist.jsp?whatNodes=DEAD" + , "Dead Datanode (Decommissioned)"); doc.endTag(); // node } doc.endTag(); // namenodes @@ -812,11 +812,11 @@ class ClusterJspHelper { * Generate a XML block as such, */ - private static void toXmlItemBlockWithLink(XMLOutputter doc, String host, - String url, String nodetag) throws IOException { + private static void toXmlItemBlockWithLink(XMLOutputter doc, String value, + String url, String label) throws IOException { doc.startTag("item"); - doc.attribute("label", nodetag); - doc.attribute("value", host); + doc.attribute("label", label); + doc.attribute("value", value); doc.attribute("link", "http://" + url); doc.endTag(); // item }