[Bigdata-commit] SF.net SVN: bigdata:[7987] branches/RDR

[<tho...@us...>]

Revision: 7987
          http://sourceforge.net/p/bigdata/code/7987
Author:   thompsonbry
Date:     2014-03-16 22:59:51 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
Exposed the GagliaService when running in the Journal.

Exposed the set of metrics that are being reported by default for the GangliaService.

Pretty print of metrics.

See #624.

Modified Paths:
--------------
    branches/RDR/bigdata/src/java/com/bigdata/journal/Journal.java
    branches/RDR/bigdata-ganglia/src/java/com/bigdata/ganglia/GangliaService.java
    branches/RDR/bigdata-ganglia/src/java/com/bigdata/ganglia/HostReport.java

Modified: branches/RDR/bigdata/src/java/com/bigdata/journal/Journal.java
===================================================================
--- branches/RDR/bigdata/src/java/com/bigdata/journal/Journal.java	2014-03-16 22:56:48 UTC (rev 7986)
+++ branches/RDR/bigdata/src/java/com/bigdata/journal/Journal.java	2014-03-16 22:59:51 UTC (rev 7987)
@@ -3716,7 +3716,7 @@
      * 
      * @see PlatformStatsPlugIn
      */
-    protected AbstractStatisticsCollector getPlatformStatisticsCollector() {
+    public AbstractStatisticsCollector getPlatformStatisticsCollector() {
 
         final IPlugIn<Journal, AbstractStatisticsCollector> plugin = pluginPlatformStats
                 .get();
@@ -3729,6 +3729,17 @@
         return t;
 
     }
+
+    public Object getGangliaService() {
+
+        final IPlugIn<Journal, ?> plugin = pluginGanglia.get();
+
+        if (plugin == null)
+            return null;
+
+        return plugin.getService();
+        
+    }
     
     /**
      * An executor service used to read on the local disk.

Modified: branches/RDR/bigdata-ganglia/src/java/com/bigdata/ganglia/GangliaService.java
===================================================================
--- branches/RDR/bigdata-ganglia/src/java/com/bigdata/ganglia/GangliaService.java	2014-03-16 22:56:48 UTC (rev 7986)
+++ branches/RDR/bigdata-ganglia/src/java/com/bigdata/ganglia/GangliaService.java	2014-03-16 22:59:51 UTC (rev 7987)
@@ -260,6 +260,18 @@
 			"gexec"//
 	};
 
+    /**
+     * Return a copy of the default metrics used to generate {@link IHostReport}
+     * s.
+     * 
+     * @see #getHostReport()
+     */
+    public String[] getDefaultHostReportOn() {
+
+        return Arrays.copyOf(defaultHostReportOn, defaultHostReportOn.length);
+        
+	}
+	
 	/** Place into descending order by load_one. */
 	private static final Comparator<IHostReport> defaultHostReportComparator = new HostReportComparator(
 			"load_one", false/* asc */);

Modified: branches/RDR/bigdata-ganglia/src/java/com/bigdata/ganglia/HostReport.java
===================================================================
--- branches/RDR/bigdata-ganglia/src/java/com/bigdata/ganglia/HostReport.java	2014-03-16 22:56:48 UTC (rev 7986)
+++ branches/RDR/bigdata-ganglia/src/java/com/bigdata/ganglia/HostReport.java	2014-03-16 22:59:51 UTC (rev 7987)
@@ -25,7 +25,8 @@
 	private final String hostName;
 	private final Map<String, IGangliaMetricMessage> metrics;
 
-	public HostReport(final String hostName, final Map<String,IGangliaMetricMessage> metrics) {
+    public HostReport(final String hostName,
+            final Map<String, IGangliaMetricMessage> metrics) {
 
 		if(hostName == null)
 			throw new IllegalArgumentException();
@@ -52,5 +53,12 @@
 		return metrics;
 		
 	}
-	
+
+	@Override
+	public String toString() {
+	    
+        return getClass().getName() + "{hostName=" + hostName + ", metrics="
+                + metrics + "}";
+
+	}
 }
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.