Index: trunk/Nebulous-Server/bin/neb-admin =================================================================== --- trunk/Nebulous-Server/bin/neb-admin (revision 31943) +++ trunk/Nebulous-Server/bin/neb-admin (revision 32380) @@ -29,4 +29,5 @@ $pending, $balance, + $retarget, $balance_N_sources, $balance_M_destinations, @@ -49,4 +50,5 @@ 'pendingreplicate|r' => \$pending, 'pendingbalance|b' => \$balance, + 'pendingtarget|t' => \$retarget, 'balancesources|N=s' => \$balance_N_sources, 'balancedestinations|M=s' => \$balance_M_destinations, @@ -64,7 +66,7 @@ pod2usage( -msg => "--limit is meaningless without --pendingreplicate", -exitval => 2 ) - if defined $limit and not (defined $pending or defined $balance); + if defined $limit and not (defined $pending or defined $balance or defined $retarget); pod2usage( -msg => "no operation specified", -exitval => 2 ) - unless defined $pending or defined $balance; + unless defined $pending or defined $balance or defined $retarget; pod2usage( -msg => "--pendingbalance needs --balancesources and --balancedestinations options", -exitval => 2) @@ -81,4 +83,7 @@ elsif (defined $balance) { $pidfile = '/var/tmp/neb-admin.balance'; +} +elsif (defined $retarget) { + $pidfile = '/var/tmp/neb-admin.retarget'; } else { @@ -107,4 +112,6 @@ } elsif ($balance) { balance(); +} elsif ($retarget) { + retarget(); } else { die "THIS SHOULD NOT HAPPEN"; @@ -524,4 +531,144 @@ } +sub retarget +{ + my %destination; + %{ $destination{VOL} } = ('ota01' => 7, 'ota02' => 8, 'ota03' => 3, 'ota04' => 3, 'ota05' => 4, 'ota06' => 4, + 'ota10' => 50, 'ota11' => 50, 'ota12' => 6, 'ota13' => 6, 'ota14' => 7, 'ota15' => 8, 'ota16' => 15, 'ota17' => 15, + 'ota20' => 16, 'ota21' => 18, 'ota22' => 18, 'ota23' => 17, 'ota24' => 9, 'ota25' => 9, 'ota26' => 10, 'ota27' => 11, + 'ota30' => 12, 'ota31' => 52, 'ota32' => 14, 'ota33' => 14, 'ota34' => 19, 'ota35' => 16, 'ota36' => 20, 'ota37' => 12, + 'ota40' => 32, 'ota41' => 11, 'ota42' => 10, 'ota43' => 17, 'ota44' => 49, 'ota45' => 23, 'ota46' => 24, 'ota47' => 25, + 'ota50' => 26, 'ota51' => 27, 'ota52' => 28, 'ota53' => 29, 'ota54' => 30, 'ota55' => 31, 'ota56' => 51, 'ota57' => 33, + 'ota60' => 34, 'ota61' => 35, 'ota62' => 36, 'ota63' => 37, 'ota64' => 38, 'ota65' => 39, 'ota66' => 41, 'ota67' => 42, + 'ota71' => 43, 'ota72' => 44, 'ota73' => 45, 'ota74' => 46, 'ota75' => 47, 'ota76' => 53); + %{ $destination{HOST} } = ('ota01' => 'ipp010','ota02' => 'ipp011','ota03' => 'ipp006','ota04' => 'ipp006','ota05' => 'ipp007','ota06' => 'ipp007', + 'ota10' => 'ipp008','ota11' => 'ipp008','ota12' => 'ipp009','ota13' => 'ipp009','ota14' => 'ipp010','ota15' => 'ipp011','ota16' => 'ipp012','ota17' => 'ipp012', + 'ota20' => 'ipp013','ota21' => 'ipp014','ota22' => 'ipp014','ota23' => 'ipp015','ota24' => 'ipp016','ota25' => 'ipp016','ota26' => 'ipp017','ota27' => 'ipp018', + 'ota30' => 'ipp019','ota31' => 'ipp020','ota32' => 'ipp021','ota33' => 'ipp021','ota34' => 'ipp023','ota35' => 'ipp013','ota36' => 'ipp024','ota37' => 'ipp019', + 'ota40' => 'ipp025','ota41' => 'ipp018','ota42' => 'ipp017','ota43' => 'ipp015','ota44' => 'ipp027','ota45' => 'ipp028','ota46' => 'ipp029','ota47' => 'ipp030', + 'ota50' => 'ipp031','ota51' => 'ipp032','ota52' => 'ipp033','ota53' => 'ipp034','ota54' => 'ipp035','ota55' => 'ipp036','ota56' => 'ipp037','ota57' => 'ipp038', + 'ota60' => 'ipp039','ota61' => 'ipp040','ota62' => 'ipp041','ota63' => 'ipp042','ota64' => 'ipp043','ota65' => 'ipp044','ota66' => 'ipp046','ota67' => 'ipp047', + 'ota71' => 'ipp048','ota72' => 'ipp049','ota73' => 'ipp050','ota74' => 'ipp051','ota75' => 'ipp052','ota76' => 'ipp053'); + %{ $destination{NAME} } = ('ota01' => 'ipp010.0','ota02' => 'ipp011.0','ota03' => 'ipp006.0','ota04' => 'ipp006.0','ota05' => 'ipp007.0','ota06' => 'ipp007.0', + 'ota10' => 'ipp008.0','ota11' => 'ipp008.0','ota12' => 'ipp009.0','ota13' => 'ipp009.0','ota14' => 'ipp010.0','ota15' => 'ipp011.0','ota16' => 'ipp012.0','ota17' => 'ipp012.0', + 'ota20' => 'ipp013.0','ota21' => 'ipp014.0','ota22' => 'ipp014.0','ota23' => 'ipp015.0','ota24' => 'ipp016.0','ota25' => 'ipp016.0','ota26' => 'ipp017.0','ota27' => 'ipp018.0', + 'ota30' => 'ipp019.0','ota31' => 'ipp020.0','ota32' => 'ipp021.0','ota33' => 'ipp021.0','ota34' => 'ipp023.0','ota35' => 'ipp013.0','ota36' => 'ipp024.0','ota37' => 'ipp019.0', + 'ota40' => 'ipp025.0','ota41' => 'ipp018.0','ota42' => 'ipp017.0','ota43' => 'ipp015.0','ota44' => 'ipp027.0','ota45' => 'ipp028.0','ota46' => 'ipp029.0','ota47' => 'ipp030.0', + 'ota50' => 'ipp031.0','ota51' => 'ipp032.0','ota52' => 'ipp033.0','ota53' => 'ipp034.0','ota54' => 'ipp035.0','ota55' => 'ipp036.0','ota56' => 'ipp037.0','ota57' => 'ipp038.0', + 'ota60' => 'ipp039.0','ota61' => 'ipp040.0','ota62' => 'ipp041.0','ota63' => 'ipp042.0','ota64' => 'ipp043.0','ota65' => 'ipp044.0','ota66' => 'ipp046.0','ota67' => 'ipp047.0', + 'ota71' => 'ipp048.0','ota72' => 'ipp049.0','ota73' => 'ipp050.0','ota74' => 'ipp051.0','ota75' => 'ipp052.0','ota76' => 'ipp053.0'); + + if (not defined $so_id_start) { $so_id_start = 0; } + if (not defined $so_id_range) { $so_id_range = 100000; } + my $so_id_end = $so_id_start + $so_id_range; + + # XXX check if so_id_start is beyond MAX(so_id): if so, exit with exit status 10 + { + my $query = $dbh->prepare("SELECT MAX(so_id) from storage_object"); + $query->execute; + my $answer = $query->fetchrow_arrayref; + my $max_so_id = $$answer[0]; + $query->finish; + + if ($so_id_start > $max_so_id) { + print STDERR "at end of so_id range, reset please\n"; + exit 10; + } + } + + # Determine a list of first instances + my $query = $dbh->prepare( + " +SELECT S.so_id,ext_id,ins_id,uri,substr(uri,-10,5) AS class_id,vol_id,name AS vol_name,host AS vol_host FROM ( + select * FROM ( + select MAX(ins_id) AS MAXins_id, MIN(ins_id) AS MINins_id, so_id,ext_id,value AS user_copies FROM storage_object + JOIN storage_object_xattr USING(so_id) + RIGHT JOIN instance USING(so_id) + WHERE name = 'user.copies' + AND value >= 2 + AND ext_id LIKE '%ota%fits' + AND so_id >= $so_id_start + AND so_id < $so_id_end + GROUP BY so_id + ) AS V + WHERE MAXins_id != MINins_id + ) AS S + JOIN instance ON (S.MINins_id = instance.ins_id AND S.so_id = instance.so_id) JOIN volume USING(vol_id) WHERE volume.available = 1 + LIMIT $limit + OFFSET $offset +"); + $query->execute(); + + my @rows; + while (my $row = $query->fetchrow_hashref) { + push @rows, $row; + } + $query->finish; + + print STDERR "No rows found\n" unless scalar @rows; + exit unless scalar @rows; + + # compare number of responses to limit below + my $Npending = @rows; + + print "targetPending MULTI\n\n"; + + foreach my $obj (@rows) { + if (defined $verbose) { + require Data::Dumper; + print Data::Dumper::Dumper($obj); + } + + my $so_id = $obj->{so_id}; + my $key = $obj->{ext_id}; + + my $ins_id = $obj->{ins_id}; + my $uri = $obj->{uri}; + my $class_id = $obj->{class_id}; + + my $source_vol_id = $obj->{vol_id}; + my $source_name = $obj->{vol_name}; + my $source_host = $obj->{vol_host}; + + + my $destination_vol_id = $destination{VOL}{$class_id}; + my $destination_name = $destination{NAME}{$class_id}; + my $destination_host = $destination{HOST}{$class_id}; + my $destination_uri = $uri; + $destination_uri =~ s/$source_name/$destination_name/; + + my %md = ( + so_id => $so_id, + key => $key, + ins_id => $ins_id, + uri => $uri, + class_id => $class_id, + + source_vol_id => $source_vol_id, + source_name => $source_name, + source_host => $source_host, + + destination_vol_id => $destination_vol_id, + destination_name => $destination_name, + destination_host => $destination_host, + destination_uri => $destination_uri, + ); + if ($source_vol_id != $destination_vol_id) { + print_metadata("targetPending", \%md); + print "\n"; + } + } + + # use a different exit status if we hit the limit (likely more files pending) + print STDERR "Which exit: $Npending $limit\n"; + # This is a better way to do this. This should be even better-er. + if ($Npending < $limit) { + exit 0; + } + else { + exit 1; + } +} + sub removal {