Changeset 28446

Timestamp:

Jun 23, 2010, 5:51:46 PM (16 years ago)

Author:

watersc1

Message:

Updates to add neb-migrate code, and to fix repeated "can't find device info" bug in nebdiskd.

Location:

trunk

Files:

• Nebulous-Server/bin/nebdiskd (modified) (2 diffs)
• Nebulous-Server/lib/Nebulous/Server.pm (modified) (1 diff)
• Nebulous-Server/lib/Nebulous/Server/SQL.pm (modified) (1 diff)
• Nebulous/Build.PL (modified) (1 diff)
• Nebulous/MANIFEST (modified) (1 diff)
• Nebulous/bin/neb-migrate (added)
• Nebulous/bin/neb-shift (added)
• Nebulous/lib/Nebulous/Client.pm (modified) (1 diff)

trunk/Nebulous-Server/bin/nebdiskd

@@ -224 +224 @@
                 }
             };
+
+            # fetch stats on the mounted device.  this has to be done AFTER
+            # we determine if it's a valid mountpoint incase
+            # is_mountpoint() invokes the automounter
+            my $dev_info = df($mountpoint, 1024);
+            unless (defined $dev_info) {
+                $valid_mountpoint = 0;
+            }
+
             if (!$valid_mountpoint) {
                 # try is_mountpoint() again if $retry > 1
@@ -254 +263 @@
             # we determine if it's a valid mountpoint incase
             # is_mountpoint() invokes the automounter
-            my $dev_info = df($mountpoint, 1024);
+            $dev_info = df($mountpoint, 1024);
             unless (defined $dev_info) {
                 $log->error("can't find device info for $mountpoint");

trunk/Nebulous-Server/lib/Nebulous/Server.pm

@@ -1598 +1598 @@
 }
 
+sub find_ext_id_by_volume
+{
+    my $self = shift;
+    my $log = $self->log;
+    $log->debug("entered - @_");
+    my ($vol_name,$limit) = validate_pos(@_,
+                                        {
+                                            type      => SCALAR,
+# #                                         callbacks => {
+# #                                             'is valid volume name' => sub {
+# #                                                 return 1 if not defined $_[0];
+# #                                                 $self->_is_valid_volume_name($_[0])
+# #                                             },
+#                                           },
+                                        },
+                                        {
+                                            type      => SCALAR|UNDEF,
+                                            optional => 1,
+                                        },
+        );
+    unless (defined($limit)) {
+        $limit = 50000;
+    }
+
+    my $sql = $self->sql;
+    my @ext_ids;
+    my $db = $self->_db_for_index(0);
+    eval {
+        my $query;
+        $query = $db->prepare_cached( $sql->get_ext_id_by_vol_name );
+        my $rows = $query->execute($vol_name, 1,$limit);
+        unless ($rows > 0) {
+            $query->finish;
+            $log->logdie("no instances on storage volume or volume is not avaiable for volume: $vol_name");
+        }
+        while (my $row = $query->fetchrow_hashref) {
+            my $ext_id = $row->{ 'ext_id' };
+            push @ext_ids, $ext_id if $ext_id;
+        }
+    };
+    if ($@) {
+        $db->rollback;
+        $log->logdie("database error: $@");
+    }
+
+    # XXX remove this?
+    $log->logdie("no ext_ids found") unless (scalar @ext_ids);
+
+    $log->debug("found: \@ext_ids");
+
+    $log->debug("leaving");
+
+    return \@ext_ids;
+}
 
 sub find_instances

trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm

@@ -266 +266 @@
             AND mountedvol.name = ?
             AND mountedvol.available = ?
+    },
+    get_ext_id_by_vol_name => qq{
+        SELECT
+            ext_id
+        FROM instance
+        JOIN storage_object
+            USING (so_id)
+        JOIN mountedvol
+            USING(vol_id)
+        JOIN volume
+            USING(vol_id)
+        WHERE volume.name = ?
+            AND mountedvol.available = ?
+        LIMIT ?
     },
     # volume handler

trunk/Nebulous/Build.PL

@@ -113 +113 @@
         bin/neb-locate
         bin/neb-ls
+        bin/neb-migrate
         bin/neb-mv
         bin/neb-replicate
         bin/neb-rm
+        bin/neb-shift
         bin/neb-stat
         bin/neb-swap

trunk/Nebulous/MANIFEST

@@ -14 +14 @@
 bin/neb-insert
 bin/neb-ls
+bin/neb-migrate
 bin/neb-mv
 bin/neb-replicate
 bin/neb-rm
+bin/neb-shift
 bin/neb-stat
 bin/neb-swap

trunk/Nebulous/lib/Nebulous/Client.pm

@@ -790 +790 @@
 }
 
+sub find_ext_id_by_volume
+{
+    my $self = shift;
+    my ($vol_name, $limit) = validate_pos( @_,
+                                           { 
+                                               type => SCALAR,
+                                           },
+                                           {
+                                               type => SCALAR|UNDEF,
+                                               optional => 1,
+                                           },
+        );
+    
+    $log->debug( "entered - @_" );
+
+    my $response = $self->{ 'server' }->find_ext_id_by_volume( $vol_name, $limit);
+    if ( $response->fault ) {
+        $self->set_err($response->faultstring);
+        if ($response->faultstring =~ /no instances on storage volume/) {
+            $log->debug( "leaving" );
+            return;
+        }
+
+        $log->logdie("unhandled fault - ", $self->err);
+    }
+
+    my $ext_ids = $response->result;
+    
+    $log->debug( "server found @$ext_ids" );
+    $log->debug( "leaving" );
+    
+    return($ext_ids);
+}
+
 sub find_instances_for_cull
 {