Index: src/core/org/apache/hadoop/metrics/ganglia/GangliaContext.java =================================================================== --- src/core/org/apache/hadoop/metrics/ganglia/GangliaContext.java (revision 720107) +++ src/core/org/apache/hadoop/metrics/ganglia/GangliaContext.java (working copy) @@ -29,6 +29,9 @@ import java.util.List; import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.apache.hadoop.metrics.ContextFactory; import org.apache.hadoop.metrics.MetricsException; import org.apache.hadoop.metrics.spi.AbstractMetricsContext; @@ -54,7 +57,10 @@ private static final int DEFAULT_DMAX = 0; private static final int DEFAULT_PORT = 8649; private static final int BUFFER_SIZE = 1500; // as per libgmond.c - + + private static final Log LOG = + LogFactory.getLog("org.apache.hadoop.util.GangliaContext"); + private static final Map typeTable = new HashMap(5); static { @@ -62,19 +68,20 @@ typeTable.put(Byte.class, "int8"); typeTable.put(Short.class, "int16"); typeTable.put(Integer.class, "int32"); + typeTable.put(Long.class, "float"); typeTable.put(Float.class, "float"); } - private byte[] buffer = new byte[BUFFER_SIZE]; - private int offset; + protected byte[] buffer = new byte[BUFFER_SIZE]; + protected int offset; - private List metricsServers; + protected List metricsServers; private Map unitsTable; private Map slopeTable; private Map tmaxTable; private Map dmaxTable; - private DatagramSocket datagramSocket; + protected DatagramSocket datagramSocket; /** Creates a new instance of GangliaContext */ public GangliaContext() { @@ -112,20 +119,36 @@ se.printStackTrace(); } } - + public void emitRecord(String contextName, String recordName, OutputRecord outRec) throws IOException { + + // Setup so that the records have the proper leader names so they are unambiguous at the ganglia level, and this prevents a lot of rework + StringBuffer sb = new StringBuffer(); + sb.setLength(0); + sb.append(contextName); + sb.append('.'); + sb.append(recordName); + sb.append('.'); + int sbBaseLen = sb.length(); + // emit each metric in turn for (String metricName : outRec.getMetricNames()) { Object metric = outRec.getMetric(metricName); String type = typeTable.get(metric.getClass()); - emitMetric(metricName, type, metric.toString()); + if (type != null) { + sb.append(metricName); + emitMetric(sb.toString(), type, metric.toString()); + sb.setLength(sbBaseLen); + } else { + LOG.warn("Unknown metrics type: " + metric.getClass()); + } } } - private void emitMetric(String name, String type, String value) + protected void emitMetric(String name, String type, String value) throws IOException { String units = getUnits(name); @@ -150,7 +173,7 @@ } } - private String getUnits(String metricName) { + protected String getUnits(String metricName) { String result = unitsTable.get(metricName); if (result == null) { result = DEFAULT_UNITS; @@ -158,7 +181,7 @@ return result; } - private int getSlope(String metricName) { + protected int getSlope(String metricName) { String slopeString = slopeTable.get(metricName); if (slopeString == null) { slopeString = DEFAULT_SLOPE; @@ -166,7 +189,10 @@ return ("zero".equals(slopeString) ? 0 : 3); // see gmetric.c } - private int getTmax(String metricName) { + protected int getTmax(String metricName) { + if (tmaxTable == null) { + return DEFAULT_TMAX; + } String tmaxString = tmaxTable.get(metricName); if (tmaxString == null) { return DEFAULT_TMAX; @@ -176,7 +202,7 @@ } } - private int getDmax(String metricName) { + protected int getDmax(String metricName) { String dmaxString = dmaxTable.get(metricName); if (dmaxString == null) { return DEFAULT_DMAX; @@ -191,7 +217,7 @@ * as an int, followed by the bytes of the string, padded if necessary to * a multiple of 4. */ - private void xdr_string(String s) { + protected void xdr_string(String s) { byte[] bytes = s.getBytes(); int len = bytes.length; xdr_int(len); @@ -213,7 +239,7 @@ /** * Puts an integer into the buffer as 4 bytes, big-endian. */ - private void xdr_int(int i) { + protected void xdr_int(int i) { buffer[offset++] = (byte)((i >> 24) & 0xff); buffer[offset++] = (byte)((i >> 16) & 0xff); buffer[offset++] = (byte)((i >> 8) & 0xff); Index: src/core/org/apache/hadoop/metrics/ganglia/GangliaContext31.java =================================================================== --- src/core/org/apache/hadoop/metrics/ganglia/GangliaContext31.java (revision 714217) +++ src/core/org/apache/hadoop/metrics/ganglia/GangliaContext31.java (working copy) @@ -23,12 +23,17 @@ import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; +import java.net.InetAddress; import java.net.SocketAddress; import java.net.SocketException; +import java.net.UnknownHostException; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.apache.hadoop.metrics.ContextFactory; import org.apache.hadoop.metrics.MetricsException; import org.apache.hadoop.metrics.spi.AbstractMetricsContext; @@ -36,112 +41,88 @@ import org.apache.hadoop.metrics.spi.Util; /** - * Context for sending metrics to Ganglia. + * Context for sending metrics to Ganglia version 3.1.x. * + * 3.1.1 has a slightly different wire portal compared to 3.0.x. */ -public class GangliaContext extends AbstractMetricsContext { - - private static final String PERIOD_PROPERTY = "period"; - private static final String SERVERS_PROPERTY = "servers"; - private static final String UNITS_PROPERTY = "units"; - private static final String SLOPE_PROPERTY = "slope"; - private static final String TMAX_PROPERTY = "tmax"; - private static final String DMAX_PROPERTY = "dmax"; - - private static final String DEFAULT_UNITS = ""; - private static final String DEFAULT_SLOPE = "both"; - private static final int DEFAULT_TMAX = 60; - private static final int DEFAULT_DMAX = 0; - private static final int DEFAULT_PORT = 8649; - private static final int BUFFER_SIZE = 1500; // as per libgmond.c - - private static final Map typeTable = new HashMap(5); - - static { - typeTable.put(String.class, "string"); - typeTable.put(Byte.class, "int8"); - typeTable.put(Short.class, "int16"); - typeTable.put(Integer.class, "int32"); - typeTable.put(Float.class, "float"); - } - - private byte[] buffer = new byte[BUFFER_SIZE]; - private int offset; - - private List metricsServers; - private Map unitsTable; - private Map slopeTable; - private Map tmaxTable; - private Map dmaxTable; - - private DatagramSocket datagramSocket; - - /** Creates a new instance of GangliaContext */ - public GangliaContext() { - } - - public void init(String contextName, ContextFactory factory) - { +public class GangliaContext31 extends GangliaContext { + + String hostName = "UNKNOWN.example.com"; + + private static final Log LOG = + LogFactory.getLog("org.apache.hadoop.util.GangliaContext31"); + + public void init(String contextName, ContextFactory factory) { super.init(contextName, factory); - - String periodStr = getAttribute(PERIOD_PROPERTY); - if (periodStr != null) { - int period = 0; - try { - period = Integer.parseInt(periodStr); - } catch (NumberFormatException nfe) { - } - if (period <= 0) { - throw new MetricsException("Invalid period: " + periodStr); - } - setPeriod(period); - } - - metricsServers = - Util.parse(getAttribute(SERVERS_PROPERTY), DEFAULT_PORT); - - unitsTable = getAttributeTable(UNITS_PROPERTY); - slopeTable = getAttributeTable(SLOPE_PROPERTY); - tmaxTable = getAttributeTable(TMAX_PROPERTY); - dmaxTable = getAttributeTable(DMAX_PROPERTY); - + + LOG.debug("Initializing the GangliaContext31 for Ganglia 3.1 metrics."); + try { - datagramSocket = new DatagramSocket(); - } - catch (SocketException se) { - se.printStackTrace(); - } + InetAddress localMachine = InetAddress.getLocalHost(); + hostName = localMachine.getHostName(); + } catch (UnknownHostException uhe) { + LOG.error(uhe); + } } - - public void emitRecord(String contextName, String recordName, OutputRecord outRec) + + protected void emitMetric(String name, String type, String value) throws IOException { - // emit each metric in turn - for (String metricName : outRec.getMetricNames()) { - Object metric = outRec.getMetric(metricName); - String type = typeTable.get(metric.getClass()); - emitMetric(metricName, type, metric.toString()); + if (name == null) { + LOG.warn("Metric was emitted with no name."); + return; + } else if (value == null) { + LOG.warn("Metric name " + name +" was emitted with a null value."); + } else if (type == null) { + LOG.warn("Metric name " + name + ", value " + value + " has no type."); } - - } - - private void emitMetric(String name, String type, String value) - throws IOException - { + + LOG.debug("Emitting metric " + name + ", type " + type + ", value " + value + " from hostname" + hostName); + String units = getUnits(name); + if (units == null) { + LOG.warn("Metric name " + name + ", value " + value + + " had 'null' units"); + units = ""; + } int slope = getSlope(name); int tmax = getTmax(name); int dmax = getDmax(name); - offset = 0; - xdr_int(0); // metric_user_defined - xdr_string(type); - xdr_string(name); - xdr_string(value); - xdr_string(units); - xdr_int(slope); - xdr_int(tmax); - xdr_int(dmax); + + // The following XDR recipe was done through a careful reading of + // gm_protocol.x in Ganglia 3.1 and carefully examining the output of + // the gmetric utility with strace. + + // First we send out a metadata message + xdr_int(128); // metric_id = metadata_msg + xdr_string(hostName); // hostname + xdr_string(name); // metric name + xdr_int(0); // spoof = False + xdr_string(type); // metric type + xdr_string(name); // metric name + xdr_string(units); // units + xdr_int(slope); // slope + xdr_int(tmax); // tmax, the maximum time between metrics + xdr_int(dmax); // dmax, the maximum data value + xdr_string(""); // Empty extra_value field for Ganglia 3.1. + for (SocketAddress socketAddress : metricsServers) { + DatagramPacket packet = + new DatagramPacket(buffer, offset, socketAddress); + datagramSocket.send(packet); + } + + // Now we send out a message with the actual value. + // Technically, we only need to send out the metadata message once for + // each metric, but I don't want to have to record which metrics we did and + // did not send. + offset = 0; + xdr_int(133); // we are sending a string value + xdr_string(hostName); // hostName + xdr_string(name); // metric name + xdr_int(0); // spoof = False + xdr_string("%s"); // format field + xdr_string(value); // metric value for (SocketAddress socketAddress : metricsServers) { DatagramPacket packet = @@ -149,75 +130,5 @@ datagramSocket.send(packet); } } - - private String getUnits(String metricName) { - String result = unitsTable.get(metricName); - if (result == null) { - result = DEFAULT_UNITS; - } - return result; - } - - private int getSlope(String metricName) { - String slopeString = slopeTable.get(metricName); - if (slopeString == null) { - slopeString = DEFAULT_SLOPE; - } - return ("zero".equals(slopeString) ? 0 : 3); // see gmetric.c - } - - private int getTmax(String metricName) { - String tmaxString = tmaxTable.get(metricName); - if (tmaxString == null) { - return DEFAULT_TMAX; - } - else { - return Integer.parseInt(tmaxString); - } - } - - private int getDmax(String metricName) { - String dmaxString = dmaxTable.get(metricName); - if (dmaxString == null) { - return DEFAULT_DMAX; - } - else { - return Integer.parseInt(dmaxString); - } - } - - /** - * Puts a string into the buffer by first writing the size of the string - * as an int, followed by the bytes of the string, padded if necessary to - * a multiple of 4. - */ - private void xdr_string(String s) { - byte[] bytes = s.getBytes(); - int len = bytes.length; - xdr_int(len); - System.arraycopy(bytes, 0, buffer, offset, len); - offset += len; - pad(); - } - /** - * Pads the buffer with zero bytes up to the nearest multiple of 4. - */ - private void pad() { - int newOffset = ((offset + 3) / 4) * 4; - while (offset < newOffset) { - buffer[offset++] = 0; - } - } - - /** - * Puts an integer into the buffer as 4 bytes, big-endian. - */ - private void xdr_int(int i) { - buffer[offset++] = (byte)((i >> 24) & 0xff); - buffer[offset++] = (byte)((i >> 16) & 0xff); - buffer[offset++] = (byte)((i >> 8) & 0xff); - buffer[offset++] = (byte)(i & 0xff); - } - }