You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:35:14 UTC
svn commit: r1077605 - in
/hadoop/common/branches/branch-0.20-security-patches:
conf/hadoop-metrics2.properties conf/hadoop-metrics2.properties.example
src/core/org/apache/hadoop/metrics2/util/Servers.java
Author: omalley
Date: Fri Mar 4 04:35:13 2011
New Revision: 1077605
URL: http://svn.apache.org/viewvc?rev=1077605&view=rev
Log:
commit 1fbf3d3ece076ca041ae99e84dedbc97bdaf7600
Author: Luke Lu <ll...@yahoo-inc.com>
Date: Tue Jul 27 15:50:42 2010 -0700
Fix unit test failure caused by an example config file.
The last minute added file was causing MetricsConfig.testMissingFiles to fail.
Also add back a util class that's need for Simon and Ganglia.
Added:
hadoop/common/branches/branch-0.20-security-patches/conf/hadoop-metrics2.properties.example
hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/metrics2/util/Servers.java
Removed:
hadoop/common/branches/branch-0.20-security-patches/conf/hadoop-metrics2.properties
Added: hadoop/common/branches/branch-0.20-security-patches/conf/hadoop-metrics2.properties.example
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/conf/hadoop-metrics2.properties.example?rev=1077605&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/conf/hadoop-metrics2.properties.example (added)
+++ hadoop/common/branches/branch-0.20-security-patches/conf/hadoop-metrics2.properties.example Fri Mar 4 04:35:13 2011
@@ -0,0 +1,3 @@
+#[prefix].[source|sink|jmx].[instance].[options]
+#namenode.sink.file0.class=org.apache.hadoop.metrics2.sink.FileSink
+#namenode.sink.file0.filename=nn.out
Added: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/metrics2/util/Servers.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/metrics2/util/Servers.java?rev=1077605&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/metrics2/util/Servers.java (added)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/metrics2/util/Servers.java Fri Mar 4 04:35:13 2011
@@ -0,0 +1,68 @@
+/*
+ * Util.java
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.hadoop.metrics2.util;
+
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Helpers to handle server addresses
+ */
+public class Servers {
+
+ /**
+ * This class is not intended to be instantiated
+ */
+ private Servers() {}
+
+ /**
+ * Parses a space and/or comma separated sequence of server specifications
+ * of the form <i>hostname</i> or <i>hostname:port</i>. If
+ * the specs string is null, defaults to localhost:defaultPort.
+ *
+ * @param specs server specs (see description)
+ * @param defaultPort the default port if not specified
+ * @return a list of InetSocketAddress objects.
+ */
+ public static List<InetSocketAddress> parse(String specs, int defaultPort) {
+ List<InetSocketAddress> result = new ArrayList<InetSocketAddress>(1);
+ if (specs == null) {
+ result.add(new InetSocketAddress("localhost", defaultPort));
+ }
+ else {
+ String[] specStrings = specs.split("[ ,]+");
+ for (String specString : specStrings) {
+ int colon = specString.indexOf(':');
+ if (colon < 0 || colon == specString.length() - 1) {
+ result.add(new InetSocketAddress(specString, defaultPort));
+ } else {
+ String hostname = specString.substring(0, colon);
+ int port = Integer.parseInt(specString.substring(colon+1));
+ result.add(new InetSocketAddress(hostname, port));
+ }
+ }
+ }
+ return result;
+ }
+
+}