[Orca-users] fix for multiple disk run percent graphs

[David Michaels]

Here's my 'diff -c' for orca-0.27/lib/Orca/SourceFile.pm --

dmichael at npd-snow <lib/Orca><37> !diff
diff -c SourceFile.pm ~/orca/lib/Orca/SourceFile.pm
*** SourceFile.pm       Fri Nov  8 23:10:59 2002
--- /npd/dmichael/orca/lib/Orca/SourceFile.pm   Mon Apr  5 11:13:32 2004
***************
*** 710,718 ****

      # Generate a new plot for these data.
      my $image;
!     my $all_names_with_subgroup = join(',', @name_with_subgroup);
      if (defined ($image = 
$image_files_ref->{hash}{$all_names_with_subgroup})){
!       $image->add_rrds(@my_rrds);
      } else {
        $image = Orca::ImageFile->new($group_index,
                                      $subgroup_name,
--- 710,731 ----

      # Generate a new plot for these data.
      my $image;
!     my $plot_volatile="";
!     my $all_names_with_subgroup = join(',', sort @name_with_subgroup);
!
!     unless( "$plot->{volatile}" eq "" ) {
!        $all_names_with_subgroup = "${group_name}_${subgroup_name}_" . 
lc($plot->{data_type}[0]) . "_" . $plot->{volatile};
!        $plot_volatile=$all_names_with_subgroup;
!     }
!
      if (defined ($image = 
$image_files_ref->{hash}{$all_names_with_subgroup})){
!       # we have a volatile plot, so we should sync the two before we
!       # update the rrds (chances are that we made mods to a copy above.
!       # Or we didnt get the right one since the columns changed on us )
!       unless( "$plot->{volatile}" eq "" ) {
!           $image->update_plot($plot);
!         }
!       $image->add_rrds(@my_rrds);
      } else {
        $image = Orca::ImageFile->new($group_index,
                                      $subgroup_name,
***************
*** 720,726 ****
                                      join(',', @name_without_subgroup),
                                      $plot,
                                      $rrd_data_files_ref,
!                                     \@my_rrds);
        $image_files_ref->{hash}{$all_names_with_subgroup} = $image;
        push(@{$image_files_ref->{list}}, $image);
        push(@{$config_plots[$old_i]{creates}}, $image);
--- 733,740 ----
                                      join(',', @name_without_subgroup),
                                      $plot,
                                      $rrd_data_files_ref,
!                                     \@my_rrds,
!                                   $plot_volatile);
        $image_files_ref->{hash}{$all_names_with_subgroup} = $image;
        push(@{$image_files_ref->{list}}, $image);
        push(@{$config_plots[$old_i]{creates}}, $image);


Blair Zajac wrote:

> Dan Urist wrote:
>
>> I'm running orca-0.27b3, and I'm having the well-known problem of 
>> getting multiple disk run percent graphs for one server that has had 
>> its disks reconfigured a couple of times. From perusing the mailing 
>> list archives, apparently there's a fix for this in the development 
>> version of orca. I'd rather not reinstall all of orca right now (at 
>> least until there's a new stable version)-- what files would I need 
>> to update from the development version to fix this?
>
>
> Hello,
>
> The revision this fixed this bug is at
>
> http://www.orcaware.com/pipermail/orca-checkins/2004-June/000237.html
>
> I just tried applying it to a fresh orca-0.27b3 tree and got this:
>
> % wget 
> http://www.orcaware.com/pipermail/orca-checkins/2004-June/000237.html
> % zcat orca-0.27b3.tar.gz | tar xf -
> % cd orca-0.27b3
> % patch -s -p2 < ../000237.html
> 2 out of 3 hunks FAILED -- saving rejects to file 
> lib/Orca/SourceFile.pm.rej
>
> So the patch doesn't apply cleanly.
>
> I don't have the cycles to do this, but if you apply the two failed 
> hunks by hand and get it working, please send a patch out so that 
> other people can use it.
>
> Best,
> Blair
>

-- 

	Raytheon 	

	*David P. Michaels*
Senior Multi-Disciplined Engineer II W.H.
NPOESS IS
Platform OS Unix
303.344.6840
720.858.5952 fax
720.521.0561 pager
dragon at raytheon.com <mailto:dragon at raytheon.com> 	*aka "Dragon"*

"I wonder what news is doing..."

 news at newshost <29> ps -fu news      
 news 18624 12367 2 0:00 makehistory 

"News is making history."
      

-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/orca-users/attachments/20040712/f0f76e09/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Raytheon.gif
Type: image/gif
Size: 481 bytes
Desc: not available
URL: </pipermail/orca-users/attachments/20040712/f0f76e09/attachment.gif>