Changeset 459 for trunk/web/addons/job_monarch/libtoga.php

Timestamp:

02/06/08 09:23:34 (15 years ago)

Author:

bastiaans

Message:

libtoga.php:

• try to detect if Ganglia or PBS uses FQDN's and whether Job Monarch should too

File:

• trunk/web/addons/job_monarch/libtoga.php (modified) (6 diffs)

trunk/web/addons/job_monarch/libtoga.php

@@ -605 +605 @@
 
         function TorqueXMLHandler( $clustername ) {
-                $jobs = array();
-                $clusters = array();
-                $this->nodes = array();
-                $heartbeat = array();
-                $this->clustername = $clustername;
-                //printf(" cluster set to %s \n", $this->clustername );
+                $jobs                   = array();
+                $clusters               = array();
+                $this->nodes            = array();
+                $heartbeat              = array();
+                $this->clustername      = $clustername;
+                $this->fqdn             = 1;
         }
 
@@ -668 +668 @@
 
                         $hostname = $attrs[NAME];
+
+
                         $location = $attrs[LOCATION];
                         //printf( "Found node %s\n", $hostname );
@@ -685 +687 @@
                                 sscanf( $attrs[NAME], 'MONARCH-JOB-%d-%d', $jobid, $monincr );
 
-                                //printf( "jobid %s\n", $jobid );
-
                                 if( !isset( $jobs[$jobid] ) )
                                         $jobs[$jobid] = array();
@@ -697 +697 @@
                                         $toganame = $togavalues[0];
                                         $togavalue = $togavalues[1];
-
-                                        //printf( "\t%s\t= %s\n", $toganame, $togavalue );
 
                                         if( $toganame == 'nodes' ) {
@@ -735 +733 @@
                                         if( $jobs[$jobid][status] == 'R' ) {
 
+                                                // Let's see if Ganglia use's FQDN or short hostnames
+                                                //
+                                                foreach( $nodes as $hostname => $nimage ) {
+                                        
+                                                        if( substr( $hostname, $domain_len ) != $domain )
+                                                        {
+                                                                $this->fqdn     = 0;
+                                                        }
+                                                }
+
                                                 foreach( $jobs[$jobid][nodes] as $node ) {
 
@@ -740 +748 @@
                                                         $domain_len = 0 - strlen( $domain );
 
-                                                        if( substr( $node, $domain_len ) != $domain ) {
-                                                                $host = $node. '.'.$domain;
-                                                        } else {
-                                                                $host = $node;
+                                                        if( $this->fqdn )
+                                                        {
+                                                                if( substr( $node, $domain_len ) != $domain ) {
+                                                                        $host = $node. '.'.$domain;
+                                                                } else {
+                                                                        $host = $node;
+                                                                }
+                                                        }
+                                                        else
+                                                        {
+                                                                $host   = $node;
                                                         }