Changeset 349

Show
Ignore:
Timestamp:
08/14/06 23:23:17 (2 years ago)
Author:
bradfitz
Message:

for jr

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/server-newrepl/lib/MogileFS/ReplicationPolicy/MultipleHosts.pm

    r334 r349  
    88sub replicate_to { 
    99    my ($class, %args) = @_; 
     10#    use Data::Dumper; 
     11 
    1012    my $fid      = delete $args{fid};      # fid scalar to copy 
    1113    my $on_devs  = delete $args{on_devs};  # arrayref of device objects 
    …… 
    2628 
    2729    # see which and how many unique hosts we're already on. 
     30    my %on_dev; 
    2831    my %on_host; 
    2932    foreach my $dev (@$on_devs) { 
    3033        $on_host{$dev->{hostid}} = 1; 
     34        $on_dev{$dev->{devid}} = 1; 
    3135    } 
    3236    my $uniq_hosts_on    = scalar keys %on_host; 
    …… 
    4044    } 
    4145 
    42     my @good_devids = grep { ! $failed->{$_} } 
     46    my @good_devids = grep { ! $failed->{$_} && ! $on_dev{$_} } 
    4347            Mgd::find_deviceid( 
    4448                               random         => 1, 

  • branches/server-newrepl/lib/MogileFS/Worker/Replicate.pm

    r346 r349  
    244244    } 
    245245 
    246     my $lock;  # bool: whether we got the0 lock or not 
     246    my $lock;  # bool: whether we got the lock or not 
    247247    my $lockname = "mgfs:fid:$fid:replicate"; 
    248248    my $unlock = sub { 

  • branches/server-newrepl/t/00-startup.t

    r345 r349  
    119119} 
    120120 
     121# enable fsck (job already running, but waiting for config update) 
     122 
     123# do get_paths again and wait for it to go to 2, reliably.  or, wait for 1st path to be $dead_url, which is now not dead. 
     124 
    121125 
    122126#$dbh->do("INSERT INTO file_to_replicate SET fid=7");