Changeset 219


Ignore:
Timestamp:
03/08/06 13:09:30 (16 years ago)
Author:
bastiaans
Message:

TODO:

  • updated

AUTHORS:

  • updated

jobmond/jobmond.py,
web/addons/job_monarch/libtoga.php:

  • renamed metric internals from TOGA to MONARCH

web/addons/job_monarch/conf.php:

  • renamed comment from Toga to Job Monarch
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/AUTHORS

    r195 r219  
    1 Design, code and implementation
    2 -------------------------------
     1MAIN DEVELOPER(S)
     2=================
    33
    4 - jobarchived, jobmond, jobfrontend
     4        * Design, code and implementation
    55
    6         * Ramon Bastiaans <bastiaans@sara.nl>
     6        -       Ramon Bastiaans
     7                <bastiaans@sara.nl>
    78
    8 Original concept
    9 ----------------
     9ORIGINAL CONCEPT(S)
     10===================
    1011
    11 - pbs_monitor
     12        * PBS Monitor
    1213
    13         * Bas van der Vlies <basv@sara.nl>
     14        -       Bas van der Vlies
     15                <basv@sara.nl>
    1416
    15 Original based on
    16 -----------------
     17        * PBS web software
    1718
    18 - PBS web software
     19        -       ROCKS Cluster group,
     20                San Diego
    1921
    20         * ROCKS Cluster group, San Diego
     22CONTRIBUTOR(S)
     23==============
     24
     25        -       Walter de Jong
     26                <walter@sara.nl>
     27
     28        -       Jaap Dijkshoorn
     29                <jaap@sara.nl>
  • trunk/TODO

    r195 r219  
    1 Features on the horizon:
    2 ------------------------
     1Functionality TODO (wish) list
     2==============================
    33
    4 * Config file and arguments usage for daemons
    5   (also --help and possibly a man page)
     4        *       Improved config file and arguments usage for daemons
     5                (also --help and possibly a man page)
    66
    7 * Actual version reporting by daemons
     7        *       Actual version reporting by daemons
    88
    9 * 'queued since' reporting of jobs
     9        *       'queued since' reporting of jobs
    1010
    11 * Clickable nodes in the "big" cluster image,
    12   filtering all jobs on that particular node.
     11        *       Usage of a node's (Ganglia) location in the ClusterImage
     12                construction (placement by x,y,z coordinates)
     13 
     14        *       More advanced and detailed graph's, etc
    1315
    14 * Mouse hints on the "big" cluster image,
    15   showing node information detail when holding
    16   over a node. Information such as jobid(s),
    17   queues, users, etc
     16        *       Clickable nodes in the "big" cluster image,
     17                filtering all jobs on that particular node.
    1818
    19 * Usage of a node's location in the ClusterImage
    20   construction (placement by x,y,z coordinates)
     19        *       Mouse hints on the "big" cluster image,
     20                showing node information detail when holding
     21                over a node. Information such as jobid(s),
     22                queues, users, etc
    2123
    22 * Usage of regexp's or wildcards at jobsearch
    23   i.e. for job name/user/queue
     24        *       Usage of regexp's or wildcards at jobsearch
     25                i.e. for job name/user/queue
    2426
    25 * Ability to search by certain node properties
    26   instead of job properties. I.e.: a certain node
    27   hostname and/or number of nodes/cpus
     27        *       Ability to search by certain node properties
     28                instead of job properties. I.e.: a certain node
     29                hostname and/or number of nodes/cpus
  • trunk/jobmond/jobmond.py

    r217 r219  
    384384                """Submit job info list"""
    385385
    386                 self.dp.multicastGmetric( 'TOGA-HEARTBEAT', str( int( int( self.cur_time ) + int( self.timeoffset ) ) ) )
     386                self.dp.multicastGmetric( 'MONARCH-HEARTBEAT', str( int( int( self.cur_time ) + int( self.timeoffset ) ) ) )
    387387
    388388                # Now let's spread the knowledge
     
    393393
    394394                        for val in gmetric_val:
    395                                 self.dp.multicastGmetric( 'TOGA-JOB-' + jobid, val )
     395                                self.dp.multicastGmetric( 'MONARCH-JOB-' + jobid, val )
    396396
    397397        def makeNodeString( self, nodelist ):
  • trunk/web/addons/job_monarch/conf.php

    r207 r219  
    2121$JOB_NODE_MARKING = "J";
    2222
    23 // XML Datasource for Toga
     23// XML Datasource for Job Monarch
    2424// by default localhost's gmetad
    2525// [syntax: <ip>:<port>]
  • trunk/web/addons/job_monarch/libtoga.php

    r207 r219  
    528528                                $nodes[$hostname] = new NodeImage( $hostname );
    529529
    530                 } else if( $name == 'METRIC' and strstr( $attrs[NAME], 'TOGA' ) and $this->proc_cluster == $this->clustername ) {
    531 
    532                         if( strstr( $attrs[NAME], 'TOGA-HEARTBEAT' ) ) {
     530                } else if( $name == 'METRIC' and strstr( $attrs[NAME], 'MONARCH' ) and $this->proc_cluster == $this->clustername ) {
     531
     532                        if( strstr( $attrs[NAME], 'MONARCH-HEARTBEAT' ) ) {
    533533
    534534                                $this->heartbeat['time'] = $attrs[VAL];
    535535                                //printf( "heartbeat %s\n", $heartbeat['time'] );
    536536
    537                         } else if( strstr( $attrs[NAME], 'TOGA-JOB' ) ) {
    538 
    539                                 sscanf( $attrs[NAME], 'TOGA-JOB-%d', $jobid );
     537                        } else if( strstr( $attrs[NAME], 'MONARCH-JOB' ) ) {
     538
     539                                sscanf( $attrs[NAME], 'MONARCH-JOB-%d', $jobid );
    540540
    541541                                //printf( "jobid %s\n", $jobid );
Note: See TracChangeset for help on using the changeset viewer.