Changeset 16264

Timestamp:

Jan 29, 2008, 2:19:34 PM (18 years ago)

Author:

jhoblitt

Message:

add neb-fsck

Location:

trunk

Files:

• Nebulous-Server/Build.PL (modified) (1 diff)
• Nebulous-Server/MANIFEST (modified) (1 diff)
• Nebulous-Server/bin/neb-fsck (added)
• Nebulous-Server/lib/Nebulous/Server/SQL.pm (modified) (3 diffs)
• Nebulous/Build.PL (modified) (1 diff)
• Nebulous/MANIFEST (modified) (1 diff)
• Nebulous/bin/neb-fsck (added)
• Nebulous/lib/Nebulous/Server/SQL.pm (modified) (3 diffs)

trunk/Nebulous-Server/Build.PL

@@ -111 +111 @@
         bin/neb-cull
         bin/neb-df
+        bin/neb-fsck
         bin/neb-initdb
         bin/neb-locate
         bin/neb-ls
         bin/neb-mv
+        bin/neb-replicate
         bin/neb-rm
         bin/neb-stat
         bin/neb-touch
         bin/nebdiskd
-        bin/neb-replicate
     )],
 )->create_build_script;

trunk/Nebulous-Server/MANIFEST

@@ -13 +13 @@
 bin/neb-cull
 bin/neb-df
+bin/neb-fsck
 bin/neb-initdb
 bin/neb-locate

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.45 2008-01-28 19:48:08 jhoblitt Exp $
+# $Id: SQL.pm,v 1.46 2008-01-30 00:19:06 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -172 +172 @@
             storage_object.so_id,
             uri,
-            assigned_vol_id
+            assigned_vol_id,
+            available
         FROM storage_object
         JOIN instance
@@ -242 +243 @@
         SET ext_id = ?
         WHERE ext_id = ?
+    },
+    find_objects_with_unavailable_instances => qq{
+        SELECT
+            so_id,
+            ext_id,
+            count(ins_id) as instances,
+            count(mountedvol.vol_id) as available_instances,
+            count(mountedvol.vol_id) < count(ins_id) as need_recovery,
+            count(mountedvol.vol_id) > 0 as recoverable
+        FROM storage_object
+        JOIN instance
+            USING(so_id)
+        LEFT JOIN mountedvol
+            USING(vol_id)
+        GROUP BY so_id
+        HAVING need_recovery = 1
     },
 );

trunk/Nebulous/Build.PL

@@ -111 +111 @@
         bin/neb-cull
         bin/neb-df
+        bin/neb-fsck
         bin/neb-initdb
         bin/neb-locate
         bin/neb-ls
         bin/neb-mv
+        bin/neb-replicate
         bin/neb-rm
         bin/neb-stat
         bin/neb-touch
         bin/nebdiskd
-        bin/neb-replicate
     )],
 )->create_build_script;

trunk/Nebulous/MANIFEST

@@ -13 +13 @@
 bin/neb-cull
 bin/neb-df
+bin/neb-fsck
 bin/neb-initdb
 bin/neb-locate

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.45 2008-01-28 19:48:08 jhoblitt Exp $
+# $Id: SQL.pm,v 1.46 2008-01-30 00:19:06 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -172 +172 @@
             storage_object.so_id,
             uri,
-            assigned_vol_id
+            assigned_vol_id,
+            available
         FROM storage_object
         JOIN instance
@@ -242 +243 @@
         SET ext_id = ?
         WHERE ext_id = ?
+    },
+    find_objects_with_unavailable_instances => qq{
+        SELECT
+            so_id,
+            ext_id,
+            count(ins_id) as instances,
+            count(mountedvol.vol_id) as available_instances,
+            count(mountedvol.vol_id) < count(ins_id) as need_recovery,
+            count(mountedvol.vol_id) > 0 as recoverable
+        FROM storage_object
+        JOIN instance
+            USING(so_id)
+        LEFT JOIN mountedvol
+            USING(vol_id)
+        GROUP BY so_id
+        HAVING need_recovery = 1
     },
 );