Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 21985 invoked from network); 4 Apr 2007 19:01:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Apr 2007 19:01:12 -0000 Received: (qmail 98929 invoked by uid 500); 4 Apr 2007 19:01:19 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 98903 invoked by uid 500); 4 Apr 2007 19:01:19 -0000 Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hadoop-dev@lucene.apache.org Delivered-To: mailing list hadoop-commits@lucene.apache.org Received: (qmail 98894 invoked by uid 99); 4 Apr 2007 19:01:19 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Apr 2007 12:01:19 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Apr 2007 12:01:11 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 48E171A9838; Wed, 4 Apr 2007 12:00:51 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r525577 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java Date: Wed, 04 Apr 2007 19:00:51 -0000 To: hadoop-commits@lucene.apache.org From: tomwhite@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070404190051.48E171A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tomwhite Date: Wed Apr 4 12:00:50 2007 New Revision: 525577 URL: http://svn.apache.org/viewvc?view=rev&rev=525577 Log: HADOOP-1163. Fix ganglia metrics to aggregate metrics from different hosts properly. Contributed by Michael Bieniosek. Modified: lucene/hadoop/trunk/CHANGES.txt lucene/hadoop/trunk/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java Modified: lucene/hadoop/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=525577&r1=525576&r2=525577 ============================================================================== --- lucene/hadoop/trunk/CHANGES.txt (original) +++ lucene/hadoop/trunk/CHANGES.txt Wed Apr 4 12:00:50 2007 @@ -97,6 +97,9 @@ 30. HADOOP-702. Add tools to help automate HDFS upgrades. (Konstantin Shvachko via cutting) +31. HADOOP-1163. Fix ganglia metrics to aggregate metrics from different + hosts properly. (Michael Bieniosek via tomwhite) + Release 0.12.3 (not yet released) Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java?view=diff&rev=525577&r1=525576&r2=525577 ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java Wed Apr 4 12:00:50 2007 @@ -116,21 +116,11 @@ public void emitRecord(String contextName, String recordName, OutputRecord outRec) throws IOException { - - // metric name formed from record name and tag values - StringBuffer nameBuf = new StringBuffer(recordName); - for (String tagName : outRec.getTagNames()) { - nameBuf.append('.'); - nameBuf.append(outRec.getTag(tagName)); - } - nameBuf.append('.'); - String namePrefix = new String(nameBuf); - // emit each metric in turn for (String metricName : outRec.getMetricNames()) { Object metric = outRec.getMetric(metricName); String type = (String) typeTable.get(metric.getClass()); - emitMetric(namePrefix + metricName, type, metric.toString()); + emitMetric(metricName, type, metric.toString()); } }