Index: /trunk/Nebulous-Server/Changes =================================================================== --- /trunk/Nebulous-Server/Changes (revision 13022) +++ /trunk/Nebulous-Server/Changes (revision 13023) @@ -1,4 +1,6 @@ Revision history for Perl module Poi::PixelData +0.05 + - add neb-df - change neb-addvol to properly mangle URIs into paths Index: /trunk/Nebulous-Server/MANIFEST =================================================================== --- /trunk/Nebulous-Server/MANIFEST (revision 13022) +++ /trunk/Nebulous-Server/MANIFEST (revision 13023) @@ -9,4 +9,5 @@ autogen.sh bin/neb-addvol +bin/neb-df bin/neb-initdb bin/nebdiskd Index: /trunk/Nebulous-Server/bin/neb-addvol =================================================================== --- /trunk/Nebulous-Server/bin/neb-addvol (revision 13022) +++ /trunk/Nebulous-Server/bin/neb-addvol (revision 13023) @@ -3,5 +3,5 @@ # Copyright (C) 2005 Joshua Hoblitt # -# $Id: neb-addvol,v 1.3 2007-04-24 01:04:55 jhoblitt Exp $ +# $Id: neb-addvol,v 1.4 2007-04-25 19:52:49 jhoblitt Exp $ use strict; @@ -171,5 +171,5 @@ =head1 SEE ALSO -L, L +L, L, L, L =cut Index: /trunk/Nebulous-Server/bin/neb-initdb =================================================================== --- /trunk/Nebulous-Server/bin/neb-initdb (revision 13022) +++ /trunk/Nebulous-Server/bin/neb-initdb (revision 13023) @@ -3,5 +3,5 @@ # Copyright (C) 2005 Joshua Hoblitt # -# $Id: neb-initdb,v 1.5 2005-08-31 00:29:46 jhoblitt Exp $ +# $Id: neb-initdb,v 1.6 2007-04-25 19:52:49 jhoblitt Exp $ use strict; @@ -158,5 +158,5 @@ =head1 SEE ALSO -L, L +L, L, L, L =cut Index: unk/Nebulous-Server/bin/neb-volstat =================================================================== --- /trunk/Nebulous-Server/bin/neb-volstat (revision 13022) +++ (revision ) @@ -1,205 +1,0 @@ -#!/usr/bin/env perl - -# Copyright (C) 2005 Joshua Hoblitt -# -# $Id: neb-volstat,v 1.1 2007-04-24 04:26:17 jhoblitt Exp $ - -use strict; -use warnings FATAL => qw( all ); - -use vars qw( $VERSION ); -$VERSION = '0.01'; - -use DBI; -use Nebulous::Server::SQL; -use URI; - -use Getopt::Long qw( GetOptions :config auto_help auto_version ); -use Pod::Usage qw( pod2usage ); - -my ($db, $dbuser, $dbpass, $name, $uri); - -$db = $ENV{'NEB_DB'} unless $db; -$dbuser = $ENV{'NEB_USER'} unless $dbuser; -$dbpass = $ENV{'NEB_PASS'} unless $dbpass; - -GetOptions( - 'db=s' => \$db, - 'user=s' => \$dbuser, - 'pass=s' => \$dbpass, -) || pod2usage( 2 ); - -pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV; -pod2usage( -msg => "Required options: --db --user --pass", -exitval => 2 ) - unless $db && $dbuser && $dbpass; - -my $dbh = DBI->connect( - "DBI:mysql:database=$db:host=localhost", - $dbuser, - $dbpass, - { - RaiseError => 1, - PrintError => 0, - AutoCommit => 1, - }, -); - -my $sql = Nebulous::Server::SQL->new(); - -#my $query = $dbh->prepare( $sql->get_storage_status ); - -my $query = $dbh->prepare("select * from volume"); -$query->execute(); - -my $mount_query = $dbh->prepare("select *, instr(?, mountpoint) = 1 as substring from mount order by substring desc, length(mountpoint) desc limit 1"); - -my @stats; - -while (my $volume_row = $query->fetchrow_hashref) { - $mount_query->execute($volume_row->{path}); - my $mount_row = $mount_query->fetchrow_hashref; - - my $vol = {%{$volume_row}, %{$mount_row}}; - push @stats, $vol; - -# use Data::Dumper; -# print Dumper($vol); -} - -print "Filesystem 1K-blocks Used Available Use% Mounted on\n"; - -foreach my $vol (@stats) { - my $path = $vol->{path}; - my $total = $vol->{total}; - my $used = $vol->{used}; - my $available = $total - $used; - my $usedper = ($used / $total) * 100; - my $mountpoint = $vol->{mountpoint}; - - # indicated the part of the nebulous volume name that matches up with a - # local volume (mountpoint) - #$path =~ s/$mountpoint/[$mountpoint]/; - - # printf formats taken from df.c in coreutils-6.7 - # Copyright (C) 91, 1995-2006 Free Software Foundation, Inc. - - if (length $path > 20) { - printf ("%s\n%20s", $path, ""); - } else { - printf ("%-20s", $path); - } - - printf(" %*s %*s %*s %*.0f%% %s\n", - 9, - $total, - 9, - $used, - 9, - $available, - 3, - $usedper, - $mountpoint, - ); -} - -__END__ - -=pod - -=head1 NAME - -neb-volstat - provide `df` like summary of nebulous volumes - -=head1 SYNOPSIS - - neb-volstat [--db ] [--user ] [--pass ] - -=head1 DESCRIPTION - -This program outputs a list of Nebulous volumes and various metadata about -them. It attempts to conform to the format of data output by the GNU version -of C when passed the C<-k> flag. E.g. C - -=head1 OPTIONS - -=over 4 - -=item * --db|-d - -Name of database (C) to retreive metadata from. - -Optional if the appropriate environment variable is set. - -=item * --user|-u - -Username to authenticate with. - -Optional if the appropriate environment variable is set. - -=item * --pass|-p - -Password to authenticate with. - -Optional if the appropriate environment variable is set. - -=back - -=head1 ENVIRONMENT - -These environment variables may be used in place of the specified command line -options. All command line option will override the corresponding environment -value. - -=over 4 - -=item * C - -Equivalent to --db|-d - -=item * C - -Equivalent to --user|-u - -=item * C - -Equivalent to --pass|-p - -=back - -=head1 CREDITS - -Just me, myself, and I. - -=head1 SUPPORT - -Please contact the author directly via e-mail. - -=head1 AUTHOR - -Joshua Hoblitt - -=head1 COPYRIGHT - -Copyright (C) 2007 Joshua Hoblitt. All rights reserved. - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; either version 2 of the License, or (at your option) any later -version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place - Suite 330, Boston, MA 02111-1307, USA. - -The full text of the license can be found in the L Pod as supplied -with Perl 5.8.1 and later. - -=head1 SEE ALSO - -L, L, L, L - -=cut Index: /trunk/Nebulous-Server/bin/nebdiskd =================================================================== --- /trunk/Nebulous-Server/bin/nebdiskd (revision 13022) +++ /trunk/Nebulous-Server/bin/nebdiskd (revision 13023) @@ -3,5 +3,5 @@ # Copyright (C) 2007 Joshua Hoblitt # -# $Id: nebdiskd,v 1.2 2007-03-24 00:40:11 jhoblitt Exp $ +# $Id: nebdiskd,v 1.3 2007-04-25 19:52:49 jhoblitt Exp $ use strict; @@ -393,5 +393,5 @@ =head1 SEE ALSO -L, L +L, L, L, L, L =cut Index: /trunk/Nebulous/Changes =================================================================== --- /trunk/Nebulous/Changes (revision 13022) +++ /trunk/Nebulous/Changes (revision 13023) @@ -1,4 +1,6 @@ Revision history for Perl module Poi::PixelData +0.05 + - add neb-df - change neb-addvol to properly mangle URIs into paths Index: /trunk/Nebulous/MANIFEST =================================================================== --- /trunk/Nebulous/MANIFEST (revision 13022) +++ /trunk/Nebulous/MANIFEST (revision 13023) @@ -9,4 +9,5 @@ autogen.sh bin/neb-addvol +bin/neb-df bin/neb-initdb bin/nebdiskd Index: /trunk/Nebulous/bin/neb-addvol =================================================================== --- /trunk/Nebulous/bin/neb-addvol (revision 13022) +++ /trunk/Nebulous/bin/neb-addvol (revision 13023) @@ -3,5 +3,5 @@ # Copyright (C) 2005 Joshua Hoblitt # -# $Id: neb-addvol,v 1.3 2007-04-24 01:04:55 jhoblitt Exp $ +# $Id: neb-addvol,v 1.4 2007-04-25 19:52:49 jhoblitt Exp $ use strict; @@ -171,5 +171,5 @@ =head1 SEE ALSO -L, L +L, L, L, L =cut Index: /trunk/Nebulous/bin/neb-df =================================================================== --- /trunk/Nebulous/bin/neb-df (revision 13023) +++ /trunk/Nebulous/bin/neb-df (revision 13023) @@ -0,0 +1,206 @@ +#!/usr/bin/env perl + +# Copyright (C) 2005 Joshua Hoblitt +# +# $Id: neb-df,v 1.1 2007-04-25 19:52:49 jhoblitt Exp $ + +use strict; +use warnings FATAL => qw( all ); + +use vars qw( $VERSION ); +$VERSION = '0.01'; + +use DBI; +use Nebulous::Server::SQL; +use URI; + +use Getopt::Long qw( GetOptions :config auto_help auto_version ); +use Pod::Usage qw( pod2usage ); + +my ($db, $dbuser, $dbpass, $name, $uri); + +$db = $ENV{'NEB_DB'} unless $db; +$dbuser = $ENV{'NEB_USER'} unless $dbuser; +$dbpass = $ENV{'NEB_PASS'} unless $dbpass; + +GetOptions( + 'db=s' => \$db, + 'user=s' => \$dbuser, + 'pass=s' => \$dbpass, +) || pod2usage( 2 ); + +pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV; +pod2usage( -msg => "Required options: --db --user --pass", -exitval => 2 ) + unless $db && $dbuser && $dbpass; + +my $dbh = DBI->connect( + "DBI:mysql:database=$db:host=localhost", + $dbuser, + $dbpass, + { + RaiseError => 1, + PrintError => 0, + AutoCommit => 1, + }, +); + +my $sql = Nebulous::Server::SQL->new(); + +# get a list of Nebulous volume names +my $query = $dbh->prepare("SELECT * FROM volume"); +$query->execute(); + +my $mount_query = $dbh->prepare("SELECT *, INSTR(?, mountpoint) = 1 as substring FROM mount ORDER BY substring DESC, LENGTH(mountpoint) DESC LIMIT 1"); + +my @stats; + +# use the list of Nebulous volume names to look for the corresponding +# mountpoint +while (my $volume_row = $query->fetchrow_hashref) { + $mount_query->execute($volume_row->{path}); + my $mount_row = $mount_query->fetchrow_hashref; + + # assemble a hash that combines the neb volume info with the filesystem + # info + my $vol = {%{$volume_row}, %{$mount_row}}; + push @stats, $vol; +} + +# output a summary of the information in a vaguely POSIX df like format +print "Filesystem 1K-blocks Used Available Use% Mounted on\n"; + +foreach my $vol (@stats) { + my $path = $vol->{path}; + my $total = $vol->{total}; + my $used = $vol->{used}; + my $available = $total - $used; + my $usedper = ($used / $total) * 100; + my $mountpoint = $vol->{mountpoint}; + + # indicated the part of the nebulous volume name that matches up with a + # local volume (mountpoint) + #$path =~ s/$mountpoint/[$mountpoint]/; + + # printf formats taken from df.c in coreutils-6.7 + # Copyright (C) 91, 1995-2006 Free Software Foundation, Inc. + + if (length $path > 20) { + printf ("%s\n%20s", $path, ""); + } else { + printf ("%-20s", $path); + } + + printf(" %*s %*s %*s %*.0f%% %s\n", + 9, + $total, + 9, + $used, + 9, + $available, + 3, + $usedper, + $mountpoint, + ); +} + +__END__ + +=pod + +=head1 NAME + +neb-df - provide a `df` like summary of nebulous volumes + +=head1 SYNOPSIS + + neb-df [--db ] [--user ] [--pass ] + +=head1 DESCRIPTION + +This program outputs a list of Nebulous volumes and various metadata about +them. It attempts to conform to the format of data output by the GNU version +of C when passed the C<-k> flag. E.g. C + +=head1 OPTIONS + +=over 4 + +=item * --db|-d + +Name of database (C) to retreive metadata from. + +Optional if the appropriate environment variable is set. + +=item * --user|-u + +Username to authenticate with. + +Optional if the appropriate environment variable is set. + +=item * --pass|-p + +Password to authenticate with. + +Optional if the appropriate environment variable is set. + +=back + +=head1 ENVIRONMENT + +These environment variables may be used in place of the specified command line +options. All command line option will override the corresponding environment +value. + +=over 4 + +=item * C + +Equivalent to --db|-d + +=item * C + +Equivalent to --user|-u + +=item * C + +Equivalent to --pass|-p + +=back + +=head1 CREDITS + +Just me, myself, and I. + +=head1 SUPPORT + +Please contact the author directly via e-mail. + +=head1 AUTHOR + +Joshua Hoblitt + +=head1 COPYRIGHT + +Copyright (C) 2007 Joshua Hoblitt. All rights reserved. + +This program is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free Software +Foundation; either version 2 of the License, or (at your option) any later +version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., 59 Temple +Place - Suite 330, Boston, MA 02111-1307, USA. + +The full text of the license can be found in the L Pod as supplied +with Perl 5.8.1 and later. + +=head1 SEE ALSO + +L, L, L, L + +=cut Index: /trunk/Nebulous/bin/neb-initdb =================================================================== --- /trunk/Nebulous/bin/neb-initdb (revision 13022) +++ /trunk/Nebulous/bin/neb-initdb (revision 13023) @@ -3,5 +3,5 @@ # Copyright (C) 2005 Joshua Hoblitt # -# $Id: neb-initdb,v 1.5 2005-08-31 00:29:46 jhoblitt Exp $ +# $Id: neb-initdb,v 1.6 2007-04-25 19:52:49 jhoblitt Exp $ use strict; @@ -158,5 +158,5 @@ =head1 SEE ALSO -L, L +L, L, L, L =cut Index: unk/Nebulous/bin/neb-volstat =================================================================== --- /trunk/Nebulous/bin/neb-volstat (revision 13022) +++ (revision ) @@ -1,205 +1,0 @@ -#!/usr/bin/env perl - -# Copyright (C) 2005 Joshua Hoblitt -# -# $Id: neb-volstat,v 1.1 2007-04-24 04:26:17 jhoblitt Exp $ - -use strict; -use warnings FATAL => qw( all ); - -use vars qw( $VERSION ); -$VERSION = '0.01'; - -use DBI; -use Nebulous::Server::SQL; -use URI; - -use Getopt::Long qw( GetOptions :config auto_help auto_version ); -use Pod::Usage qw( pod2usage ); - -my ($db, $dbuser, $dbpass, $name, $uri); - -$db = $ENV{'NEB_DB'} unless $db; -$dbuser = $ENV{'NEB_USER'} unless $dbuser; -$dbpass = $ENV{'NEB_PASS'} unless $dbpass; - -GetOptions( - 'db=s' => \$db, - 'user=s' => \$dbuser, - 'pass=s' => \$dbpass, -) || pod2usage( 2 ); - -pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV; -pod2usage( -msg => "Required options: --db --user --pass", -exitval => 2 ) - unless $db && $dbuser && $dbpass; - -my $dbh = DBI->connect( - "DBI:mysql:database=$db:host=localhost", - $dbuser, - $dbpass, - { - RaiseError => 1, - PrintError => 0, - AutoCommit => 1, - }, -); - -my $sql = Nebulous::Server::SQL->new(); - -#my $query = $dbh->prepare( $sql->get_storage_status ); - -my $query = $dbh->prepare("select * from volume"); -$query->execute(); - -my $mount_query = $dbh->prepare("select *, instr(?, mountpoint) = 1 as substring from mount order by substring desc, length(mountpoint) desc limit 1"); - -my @stats; - -while (my $volume_row = $query->fetchrow_hashref) { - $mount_query->execute($volume_row->{path}); - my $mount_row = $mount_query->fetchrow_hashref; - - my $vol = {%{$volume_row}, %{$mount_row}}; - push @stats, $vol; - -# use Data::Dumper; -# print Dumper($vol); -} - -print "Filesystem 1K-blocks Used Available Use% Mounted on\n"; - -foreach my $vol (@stats) { - my $path = $vol->{path}; - my $total = $vol->{total}; - my $used = $vol->{used}; - my $available = $total - $used; - my $usedper = ($used / $total) * 100; - my $mountpoint = $vol->{mountpoint}; - - # indicated the part of the nebulous volume name that matches up with a - # local volume (mountpoint) - #$path =~ s/$mountpoint/[$mountpoint]/; - - # printf formats taken from df.c in coreutils-6.7 - # Copyright (C) 91, 1995-2006 Free Software Foundation, Inc. - - if (length $path > 20) { - printf ("%s\n%20s", $path, ""); - } else { - printf ("%-20s", $path); - } - - printf(" %*s %*s %*s %*.0f%% %s\n", - 9, - $total, - 9, - $used, - 9, - $available, - 3, - $usedper, - $mountpoint, - ); -} - -__END__ - -=pod - -=head1 NAME - -neb-volstat - provide `df` like summary of nebulous volumes - -=head1 SYNOPSIS - - neb-volstat [--db ] [--user ] [--pass ] - -=head1 DESCRIPTION - -This program outputs a list of Nebulous volumes and various metadata about -them. It attempts to conform to the format of data output by the GNU version -of C when passed the C<-k> flag. E.g. C - -=head1 OPTIONS - -=over 4 - -=item * --db|-d - -Name of database (C) to retreive metadata from. - -Optional if the appropriate environment variable is set. - -=item * --user|-u - -Username to authenticate with. - -Optional if the appropriate environment variable is set. - -=item * --pass|-p - -Password to authenticate with. - -Optional if the appropriate environment variable is set. - -=back - -=head1 ENVIRONMENT - -These environment variables may be used in place of the specified command line -options. All command line option will override the corresponding environment -value. - -=over 4 - -=item * C - -Equivalent to --db|-d - -=item * C - -Equivalent to --user|-u - -=item * C - -Equivalent to --pass|-p - -=back - -=head1 CREDITS - -Just me, myself, and I. - -=head1 SUPPORT - -Please contact the author directly via e-mail. - -=head1 AUTHOR - -Joshua Hoblitt - -=head1 COPYRIGHT - -Copyright (C) 2007 Joshua Hoblitt. All rights reserved. - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; either version 2 of the License, or (at your option) any later -version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place - Suite 330, Boston, MA 02111-1307, USA. - -The full text of the license can be found in the L Pod as supplied -with Perl 5.8.1 and later. - -=head1 SEE ALSO - -L, L, L, L - -=cut Index: /trunk/Nebulous/bin/nebdiskd =================================================================== --- /trunk/Nebulous/bin/nebdiskd (revision 13022) +++ /trunk/Nebulous/bin/nebdiskd (revision 13023) @@ -3,5 +3,5 @@ # Copyright (C) 2007 Joshua Hoblitt # -# $Id: nebdiskd,v 1.2 2007-03-24 00:40:11 jhoblitt Exp $ +# $Id: nebdiskd,v 1.3 2007-04-25 19:52:49 jhoblitt Exp $ use strict; @@ -393,5 +393,5 @@ =head1 SEE ALSO -L, L +L, L, L, L, L =cut