IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 16179


Ignore:
Timestamp:
Jan 22, 2008, 11:14:55 AM (18 years ago)
Author:
jhoblitt
Message:

be consistent about referring to volumes by "volume name"

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Nebulous-Server/bin/neb-addvol

    r13074 r16179  
    11#!/usr/bin/env perl
    22
    3 # Copyright (C) 2005-2007  Joshua Hoblitt
     3# Copyright (C) 2005-2008  Joshua Hoblitt
    44#
    5 # $Id: neb-addvol,v 1.5 2007-04-28 01:19:59 jhoblitt Exp $
     5# $Id: neb-addvol,v 1.6 2008-01-22 21:14:55 jhoblitt Exp $
    66
    77use strict;
    … …  
    1818use Pod::Usage qw( pod2usage );
    1919
    20 my ($db, $dbuser, $dbpass, $name, $uri);
     20my ($db, $dbuser, $dbpass, $volume, $uri);
    2121
    2222$db     = $ENV{'NEB_DB'} unless $db;
    … …  
    2828    'user=s'    => \$dbuser,
    2929    'pass=s'    => \$dbpass,
    30     'name=s'    => \$name,
     30    'volume=s'  => \$volume,
    3131    'uri=s'     => \$uri,
    3232) || pod2usage( 2 );
    … …  
    3434pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
    3535pod2usage( -msg => "Required options: --db --user --pass", -exitval => 2 )
    36     unless $db && $dbuser && $dbpass && $name && $uri;
     36    unless $db && $dbuser && $dbpass && $volume && $uri;
    3737
    3838my $dbh = DBI->connect(
    … …  
    6161
    6262my $query = $dbh->prepare( $sql->new_volume );
    63 $query->execute( $name, $path );
     63$query->execute( $volume, $path );
    6464
    6565print " OK\n";
    … …  
    7575=head1 SYNOPSIS
    7676
    77     neb-addvol --name <volume name> --uri <volume uri> [--db <database>] [--user <username>] [--pass <password>]
     77    neb-addvol --volume <volume name> --uri <volume uri>
     78        [--db <database>] [--user <username>] [--pass <password>]
    7879
    7980=head1 DESCRIPTION
    … …  
    8788=over 4
    8889
    89 =item * --name|-n <volume name>
     90=item * --volume|-n <volume name>
    9091
    9192Symbolic name of volume being added.
    … …  
    151152=head1 COPYRIGHT
    152153
    153 Copyright (C) 2005-2007  Joshua Hoblitt.  All rights reserved.
     154Copyright (C) 2005-2008  Joshua Hoblitt.  All rights reserved.
    154155
    155156This program is free software; you can redistribute it and/or modify it under

  • trunk/Nebulous/bin/neb-addvol

    r13074 r16179  
    11#!/usr/bin/env perl
    22
    3 # Copyright (C) 2005-2007  Joshua Hoblitt
     3# Copyright (C) 2005-2008  Joshua Hoblitt
    44#
    5 # $Id: neb-addvol,v 1.5 2007-04-28 01:19:59 jhoblitt Exp $
     5# $Id: neb-addvol,v 1.6 2008-01-22 21:14:55 jhoblitt Exp $
    66
    77use strict;
    … …  
    1818use Pod::Usage qw( pod2usage );
    1919
    20 my ($db, $dbuser, $dbpass, $name, $uri);
     20my ($db, $dbuser, $dbpass, $volume, $uri);
    2121
    2222$db     = $ENV{'NEB_DB'} unless $db;
    … …  
    2828    'user=s'    => \$dbuser,
    2929    'pass=s'    => \$dbpass,
    30     'name=s'    => \$name,
     30    'volume=s'  => \$volume,
    3131    'uri=s'     => \$uri,
    3232) || pod2usage( 2 );
    … …  
    3434pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
    3535pod2usage( -msg => "Required options: --db --user --pass", -exitval => 2 )
    36     unless $db && $dbuser && $dbpass && $name && $uri;
     36    unless $db && $dbuser && $dbpass && $volume && $uri;
    3737
    3838my $dbh = DBI->connect(
    … …  
    6161
    6262my $query = $dbh->prepare( $sql->new_volume );
    63 $query->execute( $name, $path );
     63$query->execute( $volume, $path );
    6464
    6565print " OK\n";
    … …  
    7575=head1 SYNOPSIS
    7676
    77     neb-addvol --name <volume name> --uri <volume uri> [--db <database>] [--user <username>] [--pass <password>]
     77    neb-addvol --volume <volume name> --uri <volume uri>
     78        [--db <database>] [--user <username>] [--pass <password>]
    7879
    7980=head1 DESCRIPTION
    … …  
    8788=over 4
    8889
    89 =item * --name|-n <volume name>
     90=item * --volume|-n <volume name>
    9091
    9192Symbolic name of volume being added.
    … …  
    151152=head1 COPYRIGHT
    152153
    153 Copyright (C) 2005-2007  Joshua Hoblitt.  All rights reserved.
     154Copyright (C) 2005-2008  Joshua Hoblitt.  All rights reserved.
    154155
    155156This program is free software; you can redistribute it and/or modify it under

  • trunk/Nebulous/bin/neb-cp

    r13075 r16179  
    11#!/usr/bin/env perl
    22
    3 # Copyright (C) 2007  Joshua Hoblitt
     3# Copyright (C) 2007-2008  Joshua Hoblitt
    44#
    5 # $Id: neb-cp,v 1.3 2007-04-28 01:24:26 jhoblitt Exp $
     5# $Id: neb-cp,v 1.4 2008-01-22 21:14:55 jhoblitt Exp $
    66
    77use strict;
    … …  
    1616use Pod::Usage qw( pod2usage );
    1717
    18 my ($node, $server);
     18my ($volume, $server);
    1919
    2020$server = $ENV{'NEB_SERVER'} unless $server;
    2121
    2222GetOptions(
    23     'node|n=s'      => \$node,
     23    'volume|v=s'    => \$volume,
    2424    'server|s=s'    => \$server,
    2525) || pod2usage( 2 );
    … …  
    4141
    4242my $status;
    43 if ($node) {
    44     $status = $neb->copy( $src, $dst, $node);
     43if ($volume) {
     44    $status = $neb->copy( $src, $dst, $volume);
    4545} else {
    4646    $status = $neb->copy( $src, $dst);
    … …  
    5959=head1 SYNOPSIS
    6060
    61     neb-cp [--server <URL>] [--node <dst volume>] <src key> <dst key>
     61    neb-cp [--server <URL>] [--volume <dst volume name>] <src key> <dst key>
    6262
    6363=head1 DESCRIPTION
    6464
    65 This program list Nebulous keys matched by C<<pattern>>.  Call it with no
    66 arguments is equivalanet to searching with the pattern C<.*>.  Where
    67 C<<pattern>> is a POSIX 1003.2 compatable regular repression.
     65Copy a Nebulous storage key
    6866
    6967=head1 OPTIONS
    … …  
    7674
    7775Optional if the appropriate environment variable is set.
     76
     77=item * -volume|-v <volume name>
     78
     79The volume to place the new key's first storage instance on.
     80
     81Optional.
    7882
    7983=back
    … …  
    107111=head1 COPYRIGHT
    108112
    109 Copyright (C) 2007  Joshua Hoblitt.  All rights reserved.
     113Copyright (C) 2007-2008  Joshua Hoblitt.  All rights reserved.
    110114
    111115This program is free software; you can redistribute it and/or modify it under

  • trunk/Nebulous/bin/neb-locate

    r13258 r16179  
    11#!/usr/bin/env perl
    22
    3 # Copyright (C) 2007  Joshua Hoblitt
     3# Copyright (C) 2007-2008  Joshua Hoblitt
    44#
    5 # $Id: neb-locate,v 1.2 2007-05-05 00:29:43 jhoblitt Exp $
     5# $Id: neb-locate,v 1.3 2008-01-22 21:14:55 jhoblitt Exp $
    66
    77use strict;
    … …  
    8282=head1 SYNOPSIS
    8383
    84     neb-locate [--server <URL>] [--volume <name>] [--all] [--path] <key>
     84    neb-locate [--server <URL>] [--volume <volume name>] [--all] [--path] <key>
    8585
    8686=head1 DESCRIPTION
    … …  
    111111Optional if the appropriate environment variable is set.
    112112
    113 =item * --volume <name>
     113=item * --volume <volume name>
    114114
    115115Restrict search for instances to this Nebulous volume.
    … …  
    147147=head1 COPYRIGHT
    148148
    149 Copyright (C) 2007  Joshua Hoblitt.  All rights reserved.
     149Copyright (C) 2007-2008  Joshua Hoblitt.  All rights reserved.
    150150
    151151This program is free software; you can redistribute it and/or modify it under

  • trunk/Nebulous/bin/neb-touch

    r13074 r16179  
    11#!/usr/bin/env perl
    22
    3 # Copyright (C) 2007  Joshua Hoblitt
     3# Copyright (C) 2007-2008  Joshua Hoblitt
    44#
    5 # $Id: neb-touch,v 1.2 2007-04-28 01:19:59 jhoblitt Exp $
     5# $Id: neb-touch,v 1.3 2008-01-22 21:14:55 jhoblitt Exp $
    66
    77use strict;
    … …  
    1616use Pod::Usage qw( pod2usage );
    1717
    18 my ($server);
     18my ($server, $volume);
    1919
    2020$server = $ENV{'NEB_SERVER'} unless $server;
    2121
    2222GetOptions(
    23     'server|s=s'     => \$server,
     23    'server|s=s'    => \$server,
     24    'volume=s'      => \$volume,
    2425) || pod2usage( 2 );
    2526
    … …  
    4041
    4142unless ($neb->find($file)) {
    42     $neb->create($file) or die "failed to create Nebulous key $file";
     43    $neb->create($file, 0, $volume)
     44        or die "failed to create Nebulous key $file";
    4345}
    4446
    … …  
    5355=head1 SYNOPSIS
    5456
    55     neb-touch [--server <URL>] <key>
     57    neb-touch [--server <URL>] [--volume <volume name>] <key>
    5658
    5759=head1 DESCRIPTION
    5860
    59 This program creates an empty file with the Nebulous key of C<<key>>.  At some point in the future it almost be used to adjust the timestamp of storage instances assosiated with a Nebulous key similar to C<touch(1)>.
     61This program creates an empty file with the Nebulous key of C<<key>>.  At some
     62point in the future it will be able to adjust the timestamp of storage
     63instances assosiated with a Nebulous key similar to C<touch(1)>.
    6064
    6165=head1 OPTIONS
    … …  
    6872
    6973Optional if the appropriate environment variable is set.
     74
     75=item * --volume|-n <volume name>
     76
     77Symbolic name of the volume to create the first instance on.
     78
     79Optional.
    7080
    7181=back
    … …  
    99109=head1 COPYRIGHT
    100110
    101 Copyright (C) 2007  Joshua Hoblitt.  All rights reserved.
     111Copyright (C) 2007-2008  Joshua Hoblitt.  All rights reserved.
    102112
    103113This program is free software; you can redistribute it and/or modify it under
Note: See TracChangeset for help on using the changeset viewer.