Changeset 657 for branches/0.3

Timestamp:

02/21/11 11:01:24 (12 years ago)

Author:

ramonb

Message:

jobmond/jobmond.py:

• detect ganglia 3.1 and fall back to gmetric binary

File:

• branches/0.3/jobmond/jobmond.py (modified) (3 diffs)

branches/0.3/jobmond/jobmond.py

@@ -391 +391 @@
                 """Remember alternate binary location if supplied"""
 
-                global GMETRIC_BINARY
+                global GMETRIC_BINARY, GMOND_CONF
 
                 if binary:
@@ -424 +424 @@
                 """
 
-                global METRIC_MAX_VAL_LEN
+                global METRIC_MAX_VAL_LEN, GMETRIC_TARGET
 
                 incompatible    = 0
@@ -468 +468 @@
 
                                                         METRIC_MAX_VAL_LEN = 1400
+
+                                        elif version_minor == 1:
+
+                                                debug_msg( 0, 'Gmetric 3.1 detected, internal gmetric handling disabled. Failing back to gmetric binary' )
+
+                                                METRIC_MAX_VAL_LEN = 1400
+
+                                                # We don't speak 3.1 gmetric so use binary
+                                                #
+                                                GMETRIC_TARGET = None
 
                 return incompatible