Changeset 874 for branches/1.0/web/addons/job_monarch/overview.php

Timestamp:

05/16/13 21:47:03 (11 years ago)

Author:

ramonb

Message:

libtoga.php:

• modified XML processor to try and tackle DNS/hostname/FQDN inconsistency issue
• each individual gangliahost can have different hostname style: short or FQDN
• determine for each gangliahost if it is FQDN or short hostname during XML HOST processing
• moved job/node/gangliahost association to finishUp(): first all ganglia hosts must be processed and FQDN detection completed
• during job/node/gangliahost association use FQDN/short detected hostname as determined during XML processing

overview.php:

• let XML processor (via data gatherer) decide if to use use FQDN or short hostname

File:

• branches/1.0/web/addons/job_monarch/overview.php (modified) (4 diffs)

branches/1.0/web/addons/job_monarch/overview.php

@@ -55 +55 @@
 $gnodes    = $data_gatherer->getNodes();
 $cpus      = $data_gatherer->getCpus();
-$use_fqdn  = $data_gatherer->getUsingFQDN();
 
 //print_r( $gnodes );
@@ -467 +466 @@
                     $running_name_nodes[] = $tempnode;
 
+                    $hostnode = $data_gatherer->makeHostname( $tempnode, $jobs[$jobid]['domain'] );
+
                     if( isset( $hostname ) && $hostname != '' ) 
                     {
-                        $domain_len     = 0 - strlen( $jobs[$jobid]['domain'] );
-                        $hostnode     = $tempnode;
-
-                        if( $use_fqdn == 1)
-                        {
-                            if( substr( $hostnode, $domain_len ) != $jobs[$jobid]['domain'] ) 
-                            {
-                                $hostnode = $hostnode. '.'. $jobs[$jobid]['domain'];
-                            }
-                        }
-
                         if( $hostname == $hostnode ) 
                         {
@@ -648 +638 @@
                         foreach( $jobs[$jobid]['nodes'] as $shortnode ) 
                         {
-                            if( $use_fqdn == 1)
-                            {
-                                $mynode     = $shortnode.".".$jobs[$jobid]['domain'];
-                            }
+                            $domain         = $jobs[$jobid]['domain'];
+                            $mynode         = $data_gatherer->makeHostname( $shortnode, $domain );
                             $myhost_href    = "./?c=".$clustername."&h=".$mynode;
                             $mynodehosts[]  = "<A HREF=\"".$myhost_href."\">".$shortnode."</A>";
@@ -837 +825 @@
             foreach ( $hosts_up as $host ) 
             {
-                $domain_len         = 0 - strlen( $domain );
-
-                if( $use_fqdn )
-                {
-                    if( substr( $host, $domain_len ) != $domain ) 
-                    {
-                        $host         = $host . '.' . $domain;
-                    }
-                }
+                $host             = $data_gatherer->makeHostname( $host, $domain );
+
                 $cpus             = 0;