Changeset 17077

Timestamp:

Mar 20, 2008, 3:25:21 PM (18 years ago)

Author:

jhoblitt

Message:

add Nebulous::Server::mounts()

Location:

trunk/Nebulous-Server

Files:

• Changes (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• lib/Nebulous/Server.pm (modified) (2 diffs)
• lib/Nebulous/Server.pod (modified) (3 diffs)
• lib/Nebulous/Server/SQL.pm (modified) (2 diffs)
• t/15_mounts.t (added)

trunk/Nebulous-Server/Changes

@@ -2 +2 @@
 
 0.07
+    - add Nebulous::Server::mounts()
     - server/client split into Nebulous::Server and Nebulous::Client packages
     - add support for storing instances in multi-tier 'hashed' directories 

trunk/Nebulous-Server/MANIFEST

@@ -48 +48 @@
 t/13_server_rename_object.t
 t/14_server_xattr.t
+t/15_mounts.t
 t/75_parse_neb_key.t

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

@@ -1 @@
-# Copyright (c) 2004  Joshua Hoblitt
+# Copyright (c) 2004-2008  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.56 2008-03-20 23:29:56 jhoblitt Exp $
+# $Id: Server.pm,v 1.57 2008-03-21 01:24:36 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -1105 +1105 @@
 
 
+sub mounts
+{
+    my $self = shift;
+
+    validate_pos(@_); 
+
+    my $log = $self->log;
+    my $sql = $self->sql;
+    my $db  =$self->db;
+
+    $log->debug("entered - @_");
+
+    my $stats;
+    my $query;
+    eval {
+        # ask the db to generate the table of mounted Nebulous volume 
+        $db->do("call getmountedvol()");
+
+        $query = $db->prepare_cached( $sql->get_mounted_volumes );
+        $query->execute();
+
+        # suck that table into an AoA
+        $stats = $query->fetchall_arrayref;
+
+        $query->finish;
+    };
+    $log->logdie("database error: $@") if $@;
+
+    $log->logdie("no mounted volumes found") unless (scalar @$stats);
+
+    $log->debug("leaving");
+
+    return $stats;
+}
+
+
 sub _get_storage_volume
 {

trunk/Nebulous-Server/lib/Nebulous/Server.pod

@@ -27 +27 @@
     Nebulous::Server->delete_instance( $uri );
     Nebulous::Server->stat_object( $key );
+    Nebulous::Server->mounts();
 
 =head1 DESCRIPTION
@@ -97 +98 @@
     number of instances
 
+=item * mounts( $key );
+
+Accepts no parameters and returns an AoA of:
+
+    [
+        [
+            mountpoint,
+            total,
+            used,
+            vol_id,
+            name,
+            path,
+            allocate,
+            available,
+            xattr,
+        ],
+        [ ... ],
+        ...
+    ]
+
 =back
 
@@ -117 +138 @@
 =head1 COPYRIGHT
 
-Copyright (C) 2004-2005  Joshua Hoblitt.  All rights reserved.
+Copyright (C) 2004-2008  Joshua Hoblitt.  All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.49 2008-03-20 21:10:57 jhoblitt Exp $
+# $Id: SQL.pm,v 1.50 2008-03-21 01:24:36 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -265 +265 @@
         GROUP BY so_id
         HAVING need_recovery = 1
+    },
+    get_mounted_volumes => qq{
+        SELECT * FROM mountedvol ORDER BY vol_id
     },
 );