IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 23718


Ignore:
Timestamp:
Apr 6, 2009, 5:18:58 PM (17 years ago)
Author:
jhoblitt
Message:

pass Nebulous::Key objects around internally

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/neb_distrib_20081210/Nebulous-Server/lib/Nebulous/Server.pm

    r23715 r23718  
    185185    );
    186186
    187     my $log = $self->log;
    188     my $sql = $self->sql;
    189     my $db  = $self->db($key);
    190 
    191     $log->debug( "entered - @_" );
    192 
    193187    # vol_name overrides the key implied volume
    194188    $key = parse_neb_key($key, $vol_name);
    195189    $vol_name = $key->volume;
     190
     191    my $log = $self->log;
     192    my $sql = $self->sql;
     193    my $db  = $self->db($key);
     194
     195    $log->debug( "entered - @_" );
    196196
    197197    # the key's volume can't be validiated on input for this method so we have
    … …  
    262262
    263263            # TODO add some stuff here to retry if unsucessful
    264             $uri = $self->_create_empty_instance_file($key->path, $so_id, $ins_id, $vol_path, $vol_xattr);
     264            $uri = $self->_create_empty_instance_file($key, $so_id, $ins_id, $vol_path, $vol_xattr);
    265265            $log->debug("created $uri on volume ID: $vol_id");
    266266
    … …  
    314314    );
    315315
    316     my $log = $self->log;
    317     my $sql = $self->sql;
    318     my $db  = $self->db($key);
    319 
    320     $log->debug("entered - @_");
     316    # XXX this may require database migration!
    321317
    322318    # ignore volumes
    323319    $key    = parse_neb_key($key);
    324320    $newkey = parse_neb_key($newkey);
     321
     322    my $log = $self->log;
     323    my $sql = $self->sql;
     324    my $db  = $self->db($key);
     325
     326    $log->debug("entered - @_");
    325327
    326328TRANS: while (1) {
    … …  
    376378    );
    377379
     380    # ignore volumes
     381    $key1 = parse_neb_key($key1);
     382    $key2 = parse_neb_key($key2);
     383
    378384    my $log = $self->log;
    379385    my $sql = $self->sql;
    … …  
    388394
    389395    $log->debug("entered - @_");
    390 
    391     # ignore volumes
    392     $key1 = parse_neb_key($key1);
    393     $key2 = parse_neb_key($key2);
    394396
    395397    # order of operations for the swap with a single db is:
    … …  
    508510    # then we should throw an error
    509511
    510     my $log = $self->log;
    511     my $sql = $self->sql;
    512     my $db  = $self->db($key);
    513 
    514     $log->debug("entered - @_");
    515 
    516512    # vol_name overrides the key implied volume
    517513    $key = parse_neb_key($key, $vol_name);
    518514    $vol_name = $key->volume;
     515
     516    my $log = $self->log;
     517    my $sql = $self->sql;
     518    my $db  = $self->db($key);
     519
     520    $log->debug("entered - @_");
    519521
    520522    if (defined $vol_name
    … …  
    578580            # XXX if this fails, it should try to generate the
    579581            # instance on another volume (unless !$soft_volume)
    580             $uri = $self->_create_empty_instance_file($key->path, $so_id, $ins_id, $vol_path, $vol_xattr);
     582            $uri = $self->_create_empty_instance_file($key, $so_id, $ins_id, $vol_path, $vol_xattr);
    581583
    582584            {
    … …  
    631633    );
    632634
    633     my $log = $self->log;
    634     my $sql = $self->sql;
    635     my $db  = $self->db($key);
    636 
    637     $log->debug( "entered - @_" );
    638 
    639635    # ignore volume
    640636    $key = parse_neb_key($key);
     637
     638    my $log = $self->log;
     639    my $sql = $self->sql;
     640    my $db  = $self->db($key);
     641
     642    $log->debug( "entered - @_" );
    641643
    642644    my $so_id;
    … …  
    741743    );
    742744
    743     my $log = $self->log;
    744     my $sql = $self->sql;
    745     my $db  = $self->db($key);
    746 
    747     $log->debug( "entered - @_" );
    748 
    749745    # ignore volume
    750746    $key = parse_neb_key($key);
     747
     748    my $log = $self->log;
     749    my $sql = $self->sql;
     750    my $db  = $self->db($key);
     751
     752    $log->debug( "entered - @_" );
    751753
    752754    my $so_id;
    … …  
    860862    );
    861863
    862     my $log = $self->log;
    863     my $sql = $self->sql;
    864     my $db  = $self->db($key);
    865 
    866     $log->debug("entered - @_");
    867 
    868864    # ignore volume
    869865    $key = parse_neb_key($key);
     866
     867    my $log = $self->log;
     868    my $sql = $self->sql;
     869    my $db  = $self->db($key);
     870
     871    $log->debug("entered - @_");
    870872
    871873TRANS: while (1) {
    … …  
    934936    );
    935937
    936     my $log = $self->log;
    937     my $sql = $self->sql;
    938     my $db  = $self->db($key);
    939 
    940     $log->debug("entered - @_");
    941 
    942938    # ignore volume
    943939    $key = parse_neb_key($key);
     940
     941    my $log = $self->log;
     942    my $sql = $self->sql;
     943    my $db  = $self->db($key);
     944
     945    $log->debug("entered - @_");
    944946
    945947    my $value;
    … …  
    987989    );
    988990
    989     my $log = $self->log;
    990     my $sql = $self->sql;
    991     my $db  = $self->db($key);
    992 
    993     $log->debug("entered - @_");
    994 
    995991    # ignore volume
    996992    $key = parse_neb_key($key);
     993
     994    my $log = $self->log;
     995    my $sql = $self->sql;
     996    my $db  = $self->db($key);
     997
     998    $log->debug("entered - @_");
    997999
    9981000    my @xattrs;
    … …  
    10301032    );
    10311033
    1032     my $log = $self->log;
    1033     my $sql = $self->sql;
    1034     my $db  = $self->db($key);
    1035 
    1036     $log->debug("entered - @_");
    1037 
    10381034    # ignore volume
    10391035    $key = parse_neb_key($key);
     1036
     1037    my $log = $self->log;
     1038    my $sql = $self->sql;
     1039    my $db  = $self->db($key);
     1040
     1041    $log->debug("entered - @_");
    10401042
    10411043TRANS: while (1) {
    … …  
    11601162    );
    11611163
    1162     my $log = $self->log;
    1163     my $sql = $self->sql;
    1164     my $db  = $self->db($key);
    1165 
    1166     $log->debug("entered - @_");
    1167 
    11681164    # vol_name overrides the key implied volume
    11691165    $key = parse_neb_key($key, $vol_name);
    11701166    $vol_name = $key->volume;
     1167
     1168    my $log = $self->log;
     1169    my $sql = $self->sql;
     1170    my $db  = $self->db($key);
     1171
     1172    $log->debug("entered - @_");
    11711173
    11721174    # the key's volume can't be validiated on input for this method so we have
    … …  
    12451247    );
    12461248
     1249    # ignore volume
     1250    $key = parse_neb_key($key);
     1251
    12471252    my $log = $self->log;
    12481253    my $sql = $self->sql;
    … …  
    13391344    );
    13401345
    1341     my $log = $self->log;
    1342     my $sql = $self->sql;
    1343     my $db  = $self->db($key);
    1344 
    1345     $log->debug("entered - @_");
    1346 
    13471346    # ignore volume
    13481347    $key = parse_neb_key($key);
     1348
     1349    my $log = $self->log;
     1350    my $sql = $self->sql;
     1351    my $db  = $self->db($key);
     1352
     1353    $log->debug("entered - @_");
    13491354
    13501355    my $stat;
    … …  
    14831488    use warnings;
    14841489
    1485 
    1486     $key = parse_neb_key($key);
    1487 
    14881490    my ($vol_id, $vol_host, $vol_path, $xattr);
    14891491    eval {
    … …  
    15221524    my ($self, $key) = @_;
    15231525
     1526    $key = parse_neb_key($key);
     1527
    15241528    my $log = $self->log;
    15251529    my $sql = $self->sql;
    15261530    my $db  = $self->db($key);
    1527 
    1528     $key = parse_neb_key($key);
    15291531
    15301532    my $ext_id;
    … …  
    15531555    my ($self, $key, $vol_name) = @_;
    15541556
     1557    $key = parse_neb_key($key);
     1558    my $volume_info = parse_neb_volume($vol_name);
     1559
    15551560    my $log = $self->log;
    15561561    my $sql = $self->sql;
    15571562    my $db  = $self->db($key);
    1558 
    1559     my $volume_info = parse_neb_volume($vol_name);
    15601563
    15611564    $vol_name = $volume_info->{volume};
    … …  
    15961599    my $uri;
    15971600    eval {
    1598         my $storage_path = $self->_generate_storage_path($key, $vol_path);
    1599         my $storage_filename = $self->_generate_storage_filename($key, $ins_id);
     1601        my $storage_path = $self->_generate_storage_path($key->path, $vol_path);
     1602        my $storage_filename = $self->_generate_storage_filename($key->path, $ins_id);
    16001603        unless (-d $storage_path) {
    16011604            _retry(sub { mkpath(@_) }, $storage_path, 0, 0775)
    … …  
    16221625        my $path = $uri->file;
    16231626        die "can not set xattr on $path: $!"
    1624             unless (setfattr($path, 'user.nebulous_key', $key));
     1627            unless (setfattr($path, 'user.nebulous_key', $key->path));
    16251628    }
    16261629
Note: See TracChangeset for help on using the changeset viewer.