Changeset 33415 for branches/meh_branches/ppstack_test/Nebulous-Server/bin/neb-admin

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• Nebulous-Server/bin/neb-admin (modified) (9 diffs)

branches/meh_branches/ppstack_test/Nebulous-Server/bin/neb-admin

@@ -29 +29 @@
     $pending,
     $balance,
+    $retarget,
     $balance_N_sources,
     $balance_M_destinations,
@@ -49 +50 @@
     'pendingreplicate|r'    => \$pending,
     'pendingbalance|b'      => \$balance,
+    'pendingtarget|t'       => \$retarget,
     'balancesources|N=s'      => \$balance_N_sources,
     'balancedestinations|M=s' => \$balance_M_destinations,
@@ -64 +66 @@
 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 +83 @@
 elsif (defined $balance) {
     $pidfile = '/var/tmp/neb-admin.balance';
+}
+elsif (defined $retarget) {
+    $pidfile = '/var/tmp/neb-admin.retarget';
 }
 else {
@@ -107 +112 @@
 } elsif ($balance) {
     balance();
+} elsif ($retarget) {
+    retarget();
 } else {
     die "THIS SHOULD NOT HAPPEN";
@@ -306 +313 @@
     SELECT S.*,vol_id FROM (
       -- Select objects that are in our so_id range, with two copies (and two requested copies)
-      SELECT MAX(ins_id) AS MAXins_id,MIN(ins_id) AS MINins_id,so_id,ext_id,value AS user_copies FROM
+      SELECT MAX(ins_id) AS MAXins_id,MIN(ins_id) AS MINins_id,so_id,ext_id FROM
        storage_object JOIN storage_object_xattr USING(so_id) RIGHT JOIN instance USING(so_id)
        WHERE name = 'user.copies' AND value >= 2
@@ -462 +469 @@
         my $so_id = $obj->{so_id};
         my $key   = $obj->{ext_id};
-        my $copies = $obj->{user_copies};
+#       my $copies = $obj->{user_copies};
 
         my $source_vol_id = $obj->{vol_id};
@@ -480 +487 @@
         my %md = (
             key           => $key,
-            copies        => $copies,
+#           copies        => $copies,
             so_id         => $so_id,
             source_vol_id => $source_vol_id,
@@ -524 +531 @@
 }
 
+sub retarget
+{
+    my %destination;
+    my %vol_id_list = ('ipp004.0' => 1,'ipp005.0' => 2, 'ipp006.0' => 3, 'ipp007.0' => 4,'ipp008.0' => 50,'ipp009.0' => 6,'ipp010.0' => 7,
+                       'ipp011.0' => 8,'ipp012.0' => 15,'ipp013.0' => 16, 'ipp014.0' => 18,'ipp015.0' => 17,'ipp016.0' => 9,'ipp017.0' => 10,'ipp018.0' => 11,'ipp019.0' => 12,
+                       'ipp020.0' => 52,'ipp021.0' => 14,'ipp023.0' => 19,'ipp024.0' => 20,'ipp025.0' => 32,'ipp026.0' => 21, 'ipp027.0' => 49,
+                       'ipp028.0' => 23,'ipp029.0' => 24,'ipp030.0' => 25,'ipp031.0' => 26,'ipp032.0' => 27,'ipp033.0' => 28,'ipp034.0' => 29,
+                       'ipp035.0' => 30,'ipp036.0' => 31,'ipp037.0' => 51,'ipp038.0' => 33,'ipp039.0' => 34,'ipp040.0' => 35,'ipp041.0' => 36,
+                       'ipp042.0' => 37,'ipp043.0' => 38,'ipp044.0' => 39,'ipp045.0' => 40,'ipp046.0' => 41,'ipp047.0' => 42,'ipp048.0' => 43,
+                       'ipp049.0' => 44,'ipp050.0' => 45,'ipp051.0' => 46,'ipp052.0' => 47,'ipp053.0' => 48,'ipp054.0' => 62,'ipp055.0' => 63,
+                       'ipp056.0' => 64,'ipp057.0' => 65,'ipp058.0' => 66,'ipp059.0' => 67,'ipp060.0' => 68,'ipp061.0' => 69,'ipp062.0' => 70,
+                       'ipp063.0' => 71,'ipp064.0' => 72,'ipp065.0' => 73,'ipp066.0' => 74);
+    %{ $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' => 48);
+    %{ $destination{HOST} } = ('ota01' => 'ipp010','ota02' => 'ipp011','ota03' => 'ipp006','ota04' => 'ipp054','ota05' => 'ipp007','ota06' => 'ipp055',
+                               'ota10' => 'ipp008','ota11' => 'ipp056','ota12' => 'ipp009','ota13' => 'ipp057','ota14' => 'ipp058','ota15' => 'ipp059','ota16' => 'ipp012','ota17' => 'ipp060',
+                               'ota20' => 'ipp013','ota21' => 'ipp014','ota22' => 'ipp061','ota23' => 'ipp015','ota24' => 'ipp016','ota25' => 'ipp062','ota26' => 'ipp064','ota27' => 'ipp065',
+                               'ota30' => 'ipp066','ota31' => 'ipp020','ota32' => 'ipp063','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' => 'ipp054.0','ota05' => 'ipp007.0','ota06' => 'ipp055.0',
+                               'ota10' => 'ipp008.0','ota11' => 'ipp056.0','ota12' => 'ipp009.0','ota13' => 'ipp057.0','ota14' => 'ipp058.0','ota15' => 'ipp059.0','ota16' => 'ipp012.0','ota17' => 'ipp060.0',
+                               'ota20' => 'ipp013.0','ota21' => 'ipp014.0','ota22' => 'ipp061.0','ota23' => 'ipp015.0','ota24' => 'ipp016.0','ota25' => 'ipp062.0','ota26' => 'ipp064.0','ota27' => 'ipp065.0',
+                               'ota30' => 'ipp066.0','ota31' => 'ipp020.0','ota32' => 'ipp063.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');
+    foreach my $k (keys %{ $destination{NAME} }) {
+        $destination{VOL}{$k} = $vol_id_list{$destination{NAME}{$k}};
+    }
+    my %blocked_volume = ('ipp027' => 1,
+                          'ipp037' => 1,
+                          'ipp043' => 1,
+                          'ipp044' => 1,
+                          'ipp053' => 1,
+                          'ipp023' => 1,'ipp024' => 1,'ipp025' => 1,'ipp026' => 1,'ipp028' => 1,'ipp029' => 1,'ipp030' => 1,'ipp031' => 1,'ipp032' => 1,'ipp033' => 1,
+                          'ipp034' => 1,'ipp035' => 1,'ipp036' => 1,'ipp038' => 1,'ipp039' => 1,'ipp040' => 1,'ipp041' => 1,'ipp042' => 1,'ipp045' => 1,'ipp046' => 1,
+                          'ipp047' => 1,'ipp048' => 1,'ipp049' => 1,'ipp050' => 1,'ipp051' => 1,'ipp052' => 1,
+                          # These hosts are blocked due to concern about their RAID arrays.
+#                         'ipp054' => 1,'ipp055' => 1,'ipp056' => 1,'ipp057' => 1,'ipp058' => 1,'ipp059' => 1,
+#                         'ipp060' => 1,'ipp061' => 1,'ipp062' => 1,'ipp063' => 1,'ipp064' => 1,'ipp065' => 1, 'ipp066' => 1
+                          'ipp064' => 1, 'ipp066' => 1
+        );
+    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
+# ");
+    my $query = $dbh->prepare(
+        "
+SELECT Z.so_id,ext_id,Z.ins_id,Z.uri,substr(Z.uri,-10,5) AS class_id,Z.vol_id,vol_name,vol_host,
+       instance.vol_id AS  second_vol_id,volume.name AS second_name,volume.host AS second_host FROM (
+  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,MAXins_id FROM (
+    select * FROM (
+      select MAX(ins_id) AS MAXins_id, MIN(ins_id) AS MINins_id, so_id,ext_id 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
+  ) AS Z
+JOIN instance ON (MAXins_id = instance.ins_id AND Z.so_id = instance.so_id)
+JOIN volume ON(instance.vol_id = volume.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 $second_vol_id   = $obj->{second_vol_id};
+        my $second_vol_name = $obj->{second_name};
+        my $second_vol_host = $obj->{second_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;
+        unless ((defined($destination_uri))&&
+                (defined($source_name))&&
+                (defined($destination_name))) {
+            next;
+        }
+        
+        $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,
+            second_host        => $second_vol_host,
+            second_vol_id      => $second_vol_id
+#           blocked_host_bool  => defined($blocked_volume{$destination_host})
+        );
+        
+        if ((defined($blocked_volume{$destination_host}))||
+            ($source_vol_id == $destination_vol_id)||
+            ($second_vol_id == $destination_vol_id)||
+            ($source_name   eq $destination_name)||
+            ($second_vol_name eq $destination_name)) {
+#           print_metadata("targetFailed", \%md);
+            next;
+        }
+
+        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
 {