Changeset 253 for trunk/web/addons

Timestamp:

04/26/06 17:02:12 (17 years ago)

Author:

bastiaans

Message:

CHANGELOG:

• lost commit

jobmond/jobmond.py:

• changed job metric fragmenting. jobinfo fragmented over multiple metrics is now actually WORKING. and there are no more bugs on very big jobs (with lots of nodes)

web/addons/job_monarch/libtoga.php:

• also read metric increment now
• changed node assignment to job for new metric fragmentation

File:

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

trunk/web/addons/job_monarch/libtoga.php

@@ -576 +576 @@
                         } else if( strstr( $attrs[NAME], 'MONARCH-JOB' ) ) {
 
-                                sscanf( $attrs[NAME], 'MONARCH-JOB-%d', $jobid );
+                                sscanf( $attrs[NAME], 'MONARCH-JOB-%d-%d', $jobid, $monincr );
 
                                 //printf( "jobid %s\n", $jobid );
@@ -604 +604 @@
                                                         foreach( $mynodes as $node )
 
-                                                                $jobs[$jobid][$toganame][] = $node;
+                                                                if( !in_array( $node, $jobs[$jobid][$toganame] ) )
+                                                                        $jobs[$jobid][$toganame][] = $node;
 
                                                 } else if( $jobs[$jobid][status] == 'Q' ) {