Changeset 652 for branches/0.3
- Timestamp:
- 02/04/10 13:58:41 (13 years ago)
- Location:
- branches/0.3/web/addons/job_monarch
- Files:
-
- 2 edited
-
libtoga.php (modified) (4 diffs)
-
overview.php (modified) (27 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/0.3/web/addons/job_monarch/libtoga.php
r650 r652 34 34 $this->restvars = array(); 35 35 36 $this->clustername = $httpvars["c"]? $httpvars["c"] : $getvars["c"];37 $this->metricname = $httpvars["m"]? $httpvars["m"] : $getvars["m"];36 $this->clustername = isset( $httpvars["c"] ) ? $httpvars["c"] : $getvars["c"]; 37 $this->metricname = isset( $httpvars["m"] ) ? $httpvars["m"] : $getvars["m"]; 38 38 39 39 if( count( $httpvars ) > 0 ) … … 84 84 85 85 $CLUSTER_CONFS = array(); 86 87 ini_set("memory_limit","1024000000"); 88 set_time_limit(0); 86 89 87 90 // Monarch's conf … … 475 478 function getData() 476 479 { 477 $errstr ;478 $errno 479 $timeout 480 $errstr = ''; 481 $errno = 0; 482 $timeout = 3; 480 483 481 484 $fp = fsockopen( $this->ip, $this->port, $errno, $errstr, $timeout ); … … 679 682 $nodes = $this->nodes; 680 683 681 if ( $attrs['TN'] ) 682 { 683 // Ignore dead metrics. Detect and mask failures. 684 if ( $attrs['TN'] > $attrs['TMAX'] * 4 ) 685 { 686 return; 684 if( isset( $attrs['TN'] ) ) 685 { 686 if ( $attrs['TN'] ) 687 { 688 // Ignore dead metrics. Detect and mask failures. 689 if ( $attrs['TN'] > $attrs['TMAX'] * 4 ) 690 { 691 return; 692 } 687 693 } 688 694 } -
branches/0.3/web/addons/job_monarch/overview.php
r614 r652 255 255 $myjobs = $node->getJobs(); 256 256 $myhost = $node->getHostname(); 257 $node_cpus = $metrics[$myhost]["cpu_num"][ VAL];257 $node_cpus = $metrics[$myhost]["cpu_num"]['VAL']; 258 258 $job_cpu = 0; 259 259 260 260 foreach( $myjobs as $myjob ) 261 261 { 262 $job_cpu += (int) $jobs[$myjob][ ppn] ? $jobs[$myjob][ppn] : 1;262 $job_cpu += (int) $jobs[$myjob]['ppn'] ? $jobs[$myjob]['ppn'] : 1; 263 263 } 264 264 … … 289 289 $nr_node_jobs = count( $node_jobs ); 290 290 $myhost = $node->getHostname(); 291 $node_cpus = $metrics[$myhost]["cpu_num"][ VAL];291 $node_cpus = $metrics[$myhost]["cpu_num"]['VAL']; 292 292 293 293 foreach( $node_jobs as $myjob ) 294 294 { 295 $job_cpu = (int) $jobs[$myjob][ ppn] ? $jobs[$myjob][ppn] : 1;295 $job_cpu = (int) $jobs[$myjob]['ppn'] ? $jobs[$myjob]['ppn'] : 1; 296 296 297 297 // Determine the weight of this job … … 314 314 else if( $piefilter == 'user' ) 315 315 { 316 if( $jobs[$myjob][ owner] != $filter[$piefilter] )316 if( $jobs[$myjob]['owner'] != $filter[$piefilter] ) 317 317 { 318 318 $countjob = 0; … … 357 357 { 358 358 359 $qname = $jobs[$myjob][ queue];359 $qname = $jobs[$myjob]['queue']; 360 360 361 361 if( !isset( $queues[$qname] ) ) … … 426 426 foreach( $jobs as $jobid => $jobattrs ) 427 427 { 428 $state = $jobattrs[ status];429 $user = $jobattrs[ owner];430 $queue = $jobattrs[ queue];431 $name = $jobattrs[ name];432 $req_cpu = $jobattrs[ requested_time];433 $req_memory = $jobattrs[ requested_memory];428 $state = $jobattrs['status']; 429 $user = $jobattrs['owner']; 430 $queue = $jobattrs['queue']; 431 $name = $jobattrs['name']; 432 $req_cpu = $jobattrs['requested_time']; 433 $req_memory = $jobattrs['requested_memory']; 434 434 435 435 if( $state == 'R' ) 436 436 { 437 $nodes = count( $jobattrs[ nodes] );437 $nodes = count( $jobattrs['nodes'] ); 438 438 } 439 439 else 440 440 { 441 $nodes = $jobattrs[ nodes];442 } 443 444 $ppn = (int) $jobattrs[ ppn] ? $jobattrs[ppn] : 1;441 $nodes = $jobattrs['nodes']; 442 } 443 444 $ppn = (int) $jobattrs['ppn'] ? $jobattrs['ppn'] : 1; 445 445 $cpus = $nodes * $ppn; 446 $queued_time = (int) $jobattrs[ queued_timestamp];447 $start_time = (int) $jobattrs[ start_timestamp];446 $queued_time = (int) $jobattrs['queued_timestamp']; 447 $start_time = (int) $jobattrs['start_timestamp']; 448 448 $runningtime = $report_time - $start_time; 449 449 … … 634 634 $report_time = $jobs[$jobid][reported]; 635 635 636 if( $jobs[$jobid][ status] == 'R' )636 if( $jobs[$jobid]['status'] == 'R' ) 637 637 { 638 $nodes = count( $jobs[$jobid][ nodes] );638 $nodes = count( $jobs[$jobid]['nodes'] ); 639 639 } 640 else if( $jobs[$jobid][ status] == 'Q' )640 else if( $jobs[$jobid]['status'] == 'Q' ) 641 641 { 642 $nodes = $jobs[$jobid][ nodes];642 $nodes = $jobs[$jobid]['nodes']; 643 643 } 644 644 645 $ppn = (int) $jobs[$jobid][ ppn] ? $jobs[$jobid][ppn] : 1;645 $ppn = (int) $jobs[$jobid]['ppn'] ? $jobs[$jobid]['ppn'] : 1; 646 646 $cpus = $nodes * $ppn; 647 647 … … 650 650 $display_job = 1; 651 651 652 if( $jobs[$jobid][ status] == 'R' )653 { 654 foreach( $jobs[$jobid][ nodes] as $tempnode )652 if( $jobs[$jobid]['status'] == 'R' ) 653 { 654 foreach( $jobs[$jobid]['nodes'] as $tempnode ) 655 655 { 656 656 $all_used_nodes[] = $tempnode; … … 660 660 $used_cpus += $cpus; 661 661 662 if( $jobs[$jobid][ status] == 'R' )662 if( $jobs[$jobid]['status'] == 'R' ) 663 663 { 664 664 $running_cpus += $cpus; … … 668 668 $found_node_job = 0; 669 669 670 foreach( $jobs[$jobid][ nodes] as $tempnode )670 foreach( $jobs[$jobid]['nodes'] as $tempnode ) 671 671 { 672 672 $running_name_nodes[] = $tempnode; … … 676 676 //$filter[host] = $hostname; 677 677 678 $domain_len = 0 - strlen( $jobs[$jobid][ domain] );678 $domain_len = 0 - strlen( $jobs[$jobid]['domain'] ); 679 679 $hostnode = $tempnode; 680 680 681 681 if( $use_fqdn == 1) 682 682 { 683 if( substr( $hostnode, $domain_len ) != $jobs[$jobid][ domain] )683 if( substr( $hostnode, $domain_len ) != $jobs[$jobid]['domain'] ) 684 684 { 685 $hostnode = $hostnode. '.'. $jobs[$jobid][ domain];685 $hostnode = $hostnode. '.'. $jobs[$jobid]['domain']; 686 686 } 687 687 } … … 700 700 } 701 701 702 if( $jobs[$jobid][ status] == 'Q' )702 if( $jobs[$jobid]['status'] == 'Q' ) 703 703 { 704 704 if( isset( $hostname ) && $hostname != '' ) … … 719 719 $display_job = 0; 720 720 } 721 else if( $filtername == 'state' && $jobs[$jobid][ status] != $filtervalue )721 else if( $filtername == 'state' && $jobs[$jobid]['status'] != $filtervalue ) 722 722 { 723 723 $display_job = 0; 724 724 } 725 else if( $filtername == 'queue' && $jobs[$jobid][ queue] != $filtervalue )725 else if( $filtername == 'queue' && $jobs[$jobid]['queue'] != $filtervalue ) 726 726 { 727 727 $display_job = 0; 728 728 } 729 else if( $filtername == 'user' && $jobs[$jobid][ owner] != $filtervalue )729 else if( $filtername == 'user' && $jobs[$jobid]['owner'] != $filtervalue ) 730 730 { 731 731 $display_job = 0; … … 741 741 $last_displayed_job = $jobid; 742 742 743 $tpl->assign( "state", $jobs[$jobid][ status] );743 $tpl->assign( "state", $jobs[$jobid]['status'] ); 744 744 745 745 $fullstate = ''; 746 746 747 if( $jobs[$jobid][ status] == 'R' )747 if( $jobs[$jobid]['status'] == 'R' ) 748 748 { 749 749 $fullstate = "Running"; 750 750 } 751 else if( $jobs[$jobid][ status] == 'Q' )751 else if( $jobs[$jobid]['status'] == 'Q' ) 752 752 { 753 753 $fullstate = "Queued"; … … 756 756 $tpl->assign( "fullstate", $fullstate ); 757 757 758 $tpl->assign( "user", $jobs[$jobid][ owner] );759 $tpl->assign( "queue", $jobs[$jobid][ queue] );760 761 $fulljobname = $jobs[$jobid][ name];758 $tpl->assign( "user", $jobs[$jobid]['owner'] ); 759 $tpl->assign( "queue", $jobs[$jobid]['queue'] ); 760 761 $fulljobname = $jobs[$jobid]['name']; 762 762 $shortjobname = ''; 763 763 … … 793 793 } 794 794 795 $domain = $jobs[$jobid][ domain];796 797 $tpl->assign( "req_cpu", makeTime( timeToEpoch( $jobs[$jobid][ requested_time] ) ) );795 $domain = $jobs[$jobid]['domain']; 796 797 $tpl->assign( "req_cpu", makeTime( timeToEpoch( $jobs[$jobid]['requested_time'] ) ) ); 798 798 799 799 if( $COLUMN_REQUESTED_MEMORY ) 800 800 { 801 801 $tpl->newBlock( "column_req_mem" ); 802 $tpl->assign( "req_memory", $jobs[$jobid][ requested_memory] );802 $tpl->assign( "req_memory", $jobs[$jobid]['requested_memory'] ); 803 803 $tpl->gotoBlock( "node" ); 804 804 } … … 808 808 { 809 809 $tpl->newBlock( "column_queued" ); 810 $tpl->assign( "queued", makeDate( $jobs[$jobid][ queued_timestamp] ) );810 $tpl->assign( "queued", makeDate( $jobs[$jobid]['queued_timestamp'] ) ); 811 811 $tpl->gotoBlock( "node" ); 812 812 } … … 817 817 } 818 818 819 $ppn = (int) $jobs[$jobid][ ppn] ? $jobs[$jobid][ppn] : 1;819 $ppn = (int) $jobs[$jobid]['ppn'] ? $jobs[$jobid]['ppn'] : 1; 820 820 $cpus = $nodes * $ppn; 821 821 … … 823 823 $tpl->assign( "cpus", $cpus ); 824 824 825 $start_time = (int) $jobs[$jobid][ start_timestamp];825 $start_time = (int) $jobs[$jobid]['start_timestamp']; 826 826 $job_start = $start_time; 827 827 … … 830 830 $view_jobs++; 831 831 832 if( $jobs[$jobid][ status] == 'R' )833 { 834 foreach( $jobs[$jobid][ nodes] as $tempnode )832 if( $jobs[$jobid]['status'] == 'R' ) 833 { 834 foreach( $jobs[$jobid]['nodes'] as $tempnode ) 835 835 { 836 836 $view_name_nodes[] = $tempnode; … … 843 843 $mynodehosts = array(); 844 844 845 foreach( $jobs[$jobid][ nodes] as $mynode )845 foreach( $jobs[$jobid]['nodes'] as $mynode ) 846 846 { 847 847 if( $use_fqdn == 1) 848 848 { 849 $mynode = $mynode.".".$jobs[$jobid][ domain];849 $mynode = $mynode.".".$jobs[$jobid]['domain']; 850 850 } 851 851 $myhost_href = "./?c=".$clustername."&h=".$mynode; … … 859 859 } 860 860 } 861 else if( $jobs[$jobid][ status] == 'Q' )862 { 863 $view_nodes += (int) $jobs[$jobid][ nodes];861 else if( $jobs[$jobid]['status'] == 'Q' ) 862 { 863 $view_nodes += (int) $jobs[$jobid]['nodes']; 864 864 } 865 865 … … 951 951 if( $last_displayed_job != null ) 952 952 { 953 $filter[ id] = $last_displayed_job;953 $filter['id'] = $last_displayed_job; 954 954 } 955 955 } … … 988 988 989 989 $tpl->assign( "metric","$metricname $units" ); 990 $tpl->assign( "id", $filter[ id] );990 $tpl->assign( "id", $filter['id'] ); 991 991 992 992 # Host columns menu defined in header.php … … 1009 1009 1010 1010 $sorted_hosts = array(); 1011 $hosts_up = $jobs[$filter[ id]][nodes];1011 $hosts_up = $jobs[$filter['id']]['nodes']; 1012 1012 1013 1013 //printf( "r %s\n", $job_runningtime ); … … 1051 1051 } 1052 1052 1053 $load_one = $metrics[$host]["load_one"][ VAL];1053 $load_one = $metrics[$host]["load_one"]['VAL']; 1054 1054 $load = ((float) $load_one) / $cpus; 1055 1055 $host_load[$host] = $load; … … 1063 1063 else 1064 1064 { 1065 $sorted_hosts[$host] = $metrics[$host][$metricname][ VAL];1065 $sorted_hosts[$host] = $metrics[$host][$metricname]['VAL']; 1066 1066 } 1067 1067 } … … 1119 1119 $load_color = load_color($host_load[$host]); 1120 1120 $graphargs = ($reports[$metricname]) ? "g=$metricname&" : "m=$metricname&"; 1121 $graphargs .= "z=small&c=$cluster_url&h=$host_url&l=$load_color" . "&v=$val[ VAL]&r=job&jr=$jobrange&js=$jobstart";1121 $graphargs .= "z=small&c=$cluster_url&h=$host_url&l=$load_color" . "&v=$val['VAL']&r=job&jr=$jobrange&js=$jobstart"; 1122 1122 if( $max > 0 ) 1123 1123 {
Note: See TracChangeset
for help on using the changeset viewer.
