Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/Nebulous

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• Nebulous (modified) (1 prop)
• Nebulous/Build.PL (modified) (1 diff)
• Nebulous/MANIFEST (modified) (1 diff)
• Nebulous/bin (modified) (1 prop)
• Nebulous/bin/neb-ls (modified) (7 diffs)
• Nebulous/bin/neb-replicate (modified) (4 diffs)
• Nebulous/examples (modified) (1 prop)
• Nebulous/lib (modified) (1 prop)
• Nebulous/lib/Nebulous/Client.pm (modified) (7 diffs)
• Nebulous/lib/Nebulous/Server (deleted)
• Nebulous/lib/Nebulous/Util.pm (modified) (1 diff)
• Nebulous/nebclient (modified) (1 prop)
• Nebulous/nebclient/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/.cvsignore )
• Nebulous/nebclient/nebulous.wsdl (modified) (1 diff)
• Nebulous/nebclient/src/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/src/.cvsignore )
• Nebulous/nebclient/src/nebclient.c (modified) (4 diffs)
• Nebulous/nebclient/src/nebclient.h (modified) (1 diff)
• Nebulous/nebclient/src/nebulous.h (modified) (4 diffs)
• Nebulous/nebclient/src/soapC.c (modified) (6 diffs)
• Nebulous/nebclient/src/soapClient.c (modified) (3 diffs)
• Nebulous/nebclient/src/soapServer.c (modified) (2 diffs)
• Nebulous/nebclient/src/soapStub.h (modified) (3 diffs)
• Nebulous/nebclient/tests/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/.cvsignore )
• Nebulous/nebclient/tests/tap/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/.cvsignore )
• Nebulous/nebclient/tests/tap/src/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/src/.cvsignore )
• Nebulous/nebclient/tests/tap/tests (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/diag (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/diag/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/diag/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/fail (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/fail/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/fail/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/ok (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/ok/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/ok/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/ok/ok (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/ok/ok-hash (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/ok/ok-hash/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/ok/ok-hash/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/ok/ok-numeric (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/ok/ok-numeric/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/ok/ok-numeric/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/ok/ok/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/ok/ok/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/pass (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/pass/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/pass/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/plan (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/plan/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/plan/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/plan/no-tests (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/plan/no-tests/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/plan/no-tests/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/plan/no_plan (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/plan/no_plan/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/plan/no_plan/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/plan/not-enough-tests (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/plan/not-enough-tests/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/plan/not-enough-tests/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/plan/sane (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/plan/sane/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/plan/sane/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/plan/skip_all (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/plan/skip_all/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/plan/skip_all/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/plan/too-many-plans (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/plan/too-many-plans/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/plan/too-many-plans/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/plan/too-many-tests (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/plan/too-many-tests/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/plan/too-many-tests/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/skip (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/skip/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/skip/.cvsignore )
• Nebulous/nebclient/tests/tap/tests/todo (modified) (1 prop)
• Nebulous/nebclient/tests/tap/tests/todo/.cvsignore (copied) (copied from trunk/Nebulous/nebclient/tests/tap/tests/todo/.cvsignore )
• Nebulous/scripts/ptest.pl (modified) (2 diffs)
• Nebulous/scripts/stats.pl (modified) (1 diff)
• Nebulous/scripts/test_prog_simple.pl (copied) (copied from trunk/Nebulous/scripts/test_prog_simple.pl )
• Nebulous/t (modified) (1 prop)
• Nebulous/t/62_client_delete_instance.t (modified) (8 diffs)
• Nebulous/t/70_neb-ls.t (copied) (copied from trunk/Nebulous/t/70_neb-ls.t )
• Nebulous/t/Test (deleted)
• Nebulous/t/conf/startup.pl.in (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/Nebulous/Build.PL

@@ -95 +95 @@
         'Nebulous::Server::SOAP'    => 0,
         'Test::Nebulous'            => 0,
+        'Test::Cmd'                 => '1.05',
         'Apache2::SOAP'             => 0,
         'Apache::DBI'               => '1.05',

branches/cnb_branches/cnb_branch_20090301/Nebulous/MANIFEST

@@ -98 +98 @@
 t/66_client_xattr.t
 t/67_client_swap.t
+t/70_neb-ls.t
 t/90_nebclient.t
 t/TEST.PL

branches/cnb_branches/cnb_branch_20090301/Nebulous/bin/neb-ls

@@ -1 +1 @@
 #!/usr/bin/env perl
 
-# Copyright (C) 2007-2008  Joshua Hoblitt
-#
-# $Id: neb-ls,v 1.7 2008-06-12 20:03:37 jhoblitt Exp $
+# Copyright (C) 2007-2009  Joshua Hoblitt
 
 use strict;
@@ -9 +7 @@
 
 use vars qw( $VERSION );
-$VERSION = '0.02';
+$VERSION = '0.03';
 
 use Nebulous::Client;
@@ -16 +14 @@
 use Pod::Usage qw( pod2usage );
 
-my ($server, $long, $recursive);
+my (
+    $server,
+    $long,
+#    $recursive,
+);
 
 $server = $ENV{'NEB_SERVER'} unless $server;
@@ -22 +24 @@
 GetOptions(
     'server|s=s'    => \$server,
-    'recursive|r'   => \$recursive,
+#    'recursive|r'   => \$recursive,
     'l|1'           => \$long,
 ) || pod2usage( 2 );
@@ -39 +41 @@
     unless defined $neb;
 
-# default to listing everything (bad idea?)
-$pattern ||= ".*";
+# default to listing root
+$pattern ||= "/";
 
-if ($recursive) {
-    $pattern = "^" . $pattern . ".*";
-} else {
-    $pattern = "^" . $pattern . "\$";
-}
+#if ($recursive) {
+#    $pattern = "^" . $pattern . ".*";
+#} else {
+#    $pattern = "^" . $pattern . "\$";
+#}
 
 my $keys = $neb->find_objects($pattern);
@@ -86 +88 @@
 Optional
 
-=item * --recursive|-r
-
-By default C<neb-ls> will only try to match the exact string provided to it.
-With this option set all keys which match C<<pattern>> as a REGEX or substring
-will be returned.
-
-Optional
-
+=cut
+#=item * --recursive|-r
+#
+#By default C<neb-ls> will only try to match the exact string provided to it.
+#With this option set all keys which match C<<pattern>> as a REGEX or substring
+#will be returned.
+#
+#Optional
+#
 =item * --server|-s <URL>
 
@@ -130 +133 @@
 =head1 COPYRIGHT
 
-Copyright (C) 2007-2008  Joshua Hoblitt.  All rights reserved.
+Copyright (C) 2007-2009  Joshua Hoblitt.  All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under

branches/cnb_branches/cnb_branch_20090301/Nebulous/bin/neb-replicate

@@ -25 +25 @@
     'volume|v=s'    => \$volume,
     'copies|c=i'    => \$copies,
+    'set_copies=i'  => \$set_copies,
 ) || pod2usage( 2 );
 
@@ -44 +45 @@
     unless defined $neb;
 
-for (my $i = 0; $i < $copies; $i++) {
-    if (defined $volume) {
-        $neb->replicate($key, $volume)
-            or die "failed to replicate Nebulous key: $key";
-    } else {
-        $neb->replicate($key)
-            or die "failed to replicate Nebulous key: $key";
+# if replicate fails, we should still set user.copies (if requested)
+my $replication_problem;
+eval {
+    for (my $i = 0; $i < $copies; $i++) {
+        if (defined $volume) {
+            $neb->replicate($key, $volume)
+                or die "failed to replicate Nebulous key: $key";
+        } else {
+            $neb->replicate($key)
+                or die "failed to replicate Nebulous key: $key";
+        }
     }
+};
+if ($@) {
+    warn $@;
+    $replication_problem = 1;
 }
 
+if ($set_copies) {
+    $neb->setxattr($key, "user.copies", $copies, "replace")
+        or die $neb->err;
+}
+
+exit(32) if defined $replication_problem;
 
 __END__
@@ -66 +81 @@
 
     neb-replicate [--server <URL>] [--volume <volume name>]
-                  [--copies <n>] <key>
+                  [--copies <n>] [--set_copies <n>] <key>
 
 =head1 DESCRIPTION
@@ -93 +108 @@
 The number of new replications to create.
 
-Optional.  Defaults to 0.
+Optional.  Defaults to 1.
+
+=item * --set_copies|c <n>
+
+Set the C<user.copies> xattr for this storage object to C<<n>>.
+
+Optional.
 
 =back

branches/cnb_branches/cnb_branch_20090301/Nebulous/lib/Nebulous/Client.pm

@@ -243 +243 @@
         # if the copy failed we now have a zero length instances floating
         # around that must be removed
-        unless ($self->delete_instance("$uri")) {
+        unless ($self->delete_instance($key, "$uri")) {
             $log->logdie( "can not copy instance $uri AND FAILED TO CLEANUP EMPTY INSTANCE" );
         }
@@ -256 +256 @@
 
     unless ($src_md5 eq $dst_md5) {
-        $self->delete_instance("$uri");
+        $self->delete_instance($key, "$uri");
         $log->logdie( "md5sum mismatch" );
     }
@@ -327 +327 @@
     }
 
-    my $uri = $self->delete_instance( @$locations[0] );
+    my $uri = $self->delete_instance($key, @$locations[0]);
 
     $log->debug("leaving");
@@ -615 +615 @@
             return;
         }
+        if ($response->faultstring =~ /does not match any key or directory/) {
+            $log->debug( "leaving" );
+            return;
+        }
 
         $log->logdie("unhandled fault - ", $self->err);
@@ -813 +817 @@
     # a lock is implicitly removed when the last storage object is deleted
     foreach my $uri ( @$locations ) {
-        $self->delete_instance( $uri ) or return undef;
+        $self->delete_instance($key, $uri) or return undef;
     }
 
@@ -944 +948 @@
     my $self = shift;
 
-    my ($uri) = validate_pos(@_,
+    my ($key, $uri) = validate_pos(@_,
+        {
+            type => SCALAR,
+        },
         {
             type => SCALAR,
@@ -961 +968 @@
     $log->logdie( $@ ) if $@;
 
-    my $response = $self->{ 'server' }->delete_instance( $uri );
+    my $response = $self->{ 'server' }->delete_instance($key, $uri);
     if ( $response->fault ) {
         $self->set_err($response->faultstring);

branches/cnb_branches/cnb_branch_20090301/Nebulous/lib/Nebulous/Util.pm

@@ -45 +45 @@
 
 
+# XXX replace the unlink with a 'move to trash' operation
+# empty the trash with a daemon on the NSF server
 sub _nuke_file {
     my $path = shift;

branches/cnb_branches/cnb_branch_20090301/Nebulous/nebclient/nebulous.wsdl

@@ -125 +125 @@
 
     <message name="delete_instanceRequest">
+        <part name="key" type="xsd:string" />
         <part name="uri" type="xsd:string" />
     </message>

branches/cnb_branches/cnb_branch_20090301/Nebulous/nebclient/src/nebclient.c

@@ -253 +253 @@
     }
 
-    if (!nebDeleteInstance(server, locations->URI[0])) {
+    if (!nebDeleteInstance(server, key, locations->URI[0])) {
         nebObjectInstancesFree(locations);
 
@@ -633 +633 @@
 
     for (int i = 0; i < locations->n; i++) {
-        if (!nebDeleteInstance(server, locations->URI[i])) {
+      if (!nebDeleteInstance(server, key, locations->URI[i])) {
             nebSetErr(server, "can not delete instance");
             nebObjectInstancesFree(locations);
@@ -749 +749 @@
 }
 
-bool nebDeleteInstance(nebServer *server, const char *URI)
+bool nebDeleteInstance(nebServer *server, const char *key, const char *URI)
 {
     int             response;
@@ -770 +770 @@
 
     if (soap_call_ns1__delete_USCOREinstance(server->soap, server->endpoint,
-            NULL, (char *)URI, &response) != SOAP_OK) {
+        NULL, (char *)key, (char *)URI, &response) != SOAP_OK) {
         nebFree(filename);
 

branches/cnb_branches/cnb_branch_20090301/Nebulous/nebclient/src/nebclient.h

@@ -282 +282 @@
 bool nebDeleteInstance(
     nebServer *server,                  ///< nebServer object
+    const char *key,                    ///< storage object key (name)
     const char *URI                     ///< URL of instance to remove
 );

branches/cnb_branches/cnb_branch_20090301/Nebulous/nebclient/src/nebulous.h

@@ -1 +1 @@
 /* src/nebulous.h
    Generated by wsdl2h 1.2.12 from nebulous.wsdl and typemap.dat
-   2009-03-05 21:11:05 GMT
+   2009-04-20 22:15:21 GMT
    Copyright (C) 2001-2008 Robert van Engelen, Genivia Inc. All Rights Reserved.
    This part of the software is released under one of the following licenses:
@@ -808 +808 @@
     NULL, // char *action = NULL selects default action for this operation
     // request parameters:
+    char*                               key,
     char*                               uri,
     // response parameters:
@@ -819 +820 @@
     struct soap *soap,
     // request parameters:
+    char*                               key,
     char*                               uri,
     // response parameters:
@@ -831 +833 @@
 //gsoap ns1  service method-action:     delete_USCOREinstance urn:Nebulous/Server/SOAP#delete_instance
 int ns1__delete_USCOREinstance(
+    char*                               key,    ///< Request parameter
     char*                               uri,    ///< Request parameter
     int                                *result  ///< Response parameter

branches/cnb_branches/cnb_branch_20090301/Nebulous/nebclient/src/soapC.c

@@ -12 +12 @@
 #endif
 
-SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.12 2009-03-05 21:11:05 GMT")
+SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.12 2009-04-20 22:15:22 GMT")
 
 
@@ -1344 +1344 @@
 {
         (void)soap; (void)a; /* appease -Wall -Werror */
+        soap_default_string(soap, &a->key);
         soap_default_string(soap, &a->uri);
 }
@@ -1350 +1351 @@
 {
         (void)soap; (void)a; /* appease -Wall -Werror */
+        soap_serialize_string(soap, &a->key);
         soap_serialize_string(soap, &a->uri);
 }
@@ -1365 +1367 @@
         if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__delete_USCOREinstance), type))
                 return soap->error;
+        if (soap_out_string(soap, "key", -1, &a->key, ""))
+                return soap->error;
         if (soap_out_string(soap, "uri", -1, &a->uri, ""))
                 return soap->error;
@@ -1380 +1384 @@
 SOAP_FMAC3 struct ns1__delete_USCOREinstance * SOAP_FMAC4 soap_in_ns1__delete_USCOREinstance(struct soap *soap, const char *tag, struct ns1__delete_USCOREinstance *a, const char *type)
 {
+        size_t soap_flag_key = 1;
         size_t soap_flag_uri = 1;
         if (soap_element_begin_in(soap, tag, 0, type))
@@ -1391 +1396 @@
                 for (;;)
                 {       soap->error = SOAP_TAG_MISMATCH;
+                        if (soap_flag_key && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+                                if (soap_in_string(soap, "key", &a->key, "xsd:string"))
+                                {       soap_flag_key--;
+                                        continue;
+                                }
                         if (soap_flag_uri && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
                                 if (soap_in_string(soap, "uri", &a->uri, "xsd:string"))

branches/cnb_branches/cnb_branch_20090301/Nebulous/nebclient/src/soapClient.c

@@ -10 +10 @@
 #endif
 
-SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.12 2009-03-05 21:11:05 GMT")
+SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.12 2009-04-20 22:15:21 GMT")
 
 
@@ -700 +700 @@
 }
 
-SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *uri, int *result)
+SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *uri, int *result)
 {       struct ns1__delete_USCOREinstance soap_tmp_ns1__delete_USCOREinstance;
         struct ns1__delete_USCOREinstanceResponse *soap_tmp_ns1__delete_USCOREinstanceResponse;
@@ -708 +708 @@
                 soap_action = "urn:Nebulous/Server/SOAP#delete_instance";
         soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/";
+        soap_tmp_ns1__delete_USCOREinstance.key = key;
         soap_tmp_ns1__delete_USCOREinstance.uri = uri;
         soap_begin(soap);

branches/cnb_branches/cnb_branch_20090301/Nebulous/nebclient/src/soapServer.c

@@ -10 +10 @@
 #endif
 
-SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.12 2009-03-05 21:11:05 GMT")
+SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.12 2009-04-20 22:15:21 GMT")
 
 
@@ -643 +643 @@
          || soap_end_recv(soap))
                 return soap->error;
-        soap->error = ns1__delete_USCOREinstance(soap, soap_tmp_ns1__delete_USCOREinstance.uri, &soap_tmp_int);
+        soap->error = ns1__delete_USCOREinstance(soap, soap_tmp_ns1__delete_USCOREinstance.key, soap_tmp_ns1__delete_USCOREinstance.uri, &soap_tmp_int);
         if (soap->error)
                 return soap->error;

branches/cnb_branches/cnb_branch_20090301/Nebulous/nebclient/src/soapStub.h

@@ -283 +283 @@
 struct ns1__delete_USCOREinstance
 {
+        char *key;      /* optional element of type xsd:string */
         char *uri;      /* optional element of type xsd:string */
 };
@@ -432 +433 @@
 SOAP_FMAC5 int SOAP_FMAC6 ns1__find_USCOREinstances(struct soap*, char *key, char *volume, struct ns1__find_USCOREinstancesResponse *_param_3);
 
-SOAP_FMAC5 int SOAP_FMAC6 ns1__delete_USCOREinstance(struct soap*, char *uri, int *result);
+SOAP_FMAC5 int SOAP_FMAC6 ns1__delete_USCOREinstance(struct soap*, char *key, char *uri, int *result);
 
 SOAP_FMAC5 int SOAP_FMAC6 ns1__stat_USCOREobject(struct soap*, char *key, struct ns1__stat_USCOREobjectResponse *_param_4);
@@ -467 +468 @@
 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__find_USCOREinstances(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *volume, struct ns1__find_USCOREinstancesResponse *_param_3);
 
-SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *uri, int *result);
+SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *uri, int *result);
 
 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__stat_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, struct ns1__stat_USCOREobjectResponse *_param_4);

branches/cnb_branches/cnb_branch_20090301/Nebulous/scripts/ptest.pl

@@ -18 +18 @@
 $| = 1;
 
+my $prog_file = shift;
 my $key = shift || 'foobar';
 my $kids = shift || 1;
 
+require $prog_file;
 $key = "/tmp/" . $key;
 
@@ -72 +74 @@
     }
 
-#    select $sock;
-#    $| = 1;
-
-    # child
     my $fname = "${key}_$id";
 
     my $neb = Nebulous::Client::Bench->new(
 #    proxy   => 'http://localhost:80/nebulous'
-        proxy   => 'http://alala:80/nebulous',
-#        sock    => \*STDOUT,
+        proxy   => 'http://ipp008:80/nebulous'
+#        proxy   => 'http://alala:80/nebulous',
     );
 
-
-    while (1) {
-#    print $sock "$$ : i'm a little tea pot using key: $fname\n";
-        my $fh = $neb->open_create( $fname )
-            or child_die($sock, "can't create file $fname");
-        close $fh;
-
-        $fh = $neb->open( $fname, 'read' )
-            or child_die("can't open file");
-        close $fh;
-
-        $neb->lock( $fname, 'read' );
-        $neb->unlock( $fname, 'read' );
-        $neb->replicate( $fname );
-        $neb->cull( $fname );
-        $neb->find( $fname );
-        $neb->copy( $fname, $fname . "_copy" );
-        $neb->move( $fname, $fname . "_move" );
-        $neb->delete( $fname . "_copy" );
-        $neb->delete( $fname . "_move" );
-
-#    print $sock "$$ : all done!\n";
-    }
-
-    return 1;
+    test_prog($neb, $fname);
 }
 

branches/cnb_branches/cnb_branch_20090301/Nebulous/scripts/stats.pl

@@ -17 +17 @@
 foreach my $line (split(/\n/, $data)) {
     my ($time, $method, $duration) = split(/\s+/, $line);
+
+    unless (defined $time and defined $method and defined $duration) {
+        warn "bad line: $line\n";
+        next;
+    }
 
     push @{$methods{$method}->{time}}, $time;

branches/cnb_branches/cnb_branch_20090301/Nebulous/t/62_client_delete_instance.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 62_client_delete_instance.t,v 1.3 2008-12-14 22:48:35 eugene Exp $
+# $Id: 62_client_delete_instance.t,v 1.1.38.1 2008-12-14 22:03:08 eugene Exp $
 
 use strict;
@@ -10 +10 @@
 use Apache::Test qw( -withtestmore );
 
-plan tests => 9;
+plan tests => 11;
 
 use lib qw( ./t ./lib );
@@ -26 +26 @@
         proxy => "http://$hostport/nebulous",
     );
-    $neb->create( "foo" );
 
-    my $locations = $neb->find_instances( "foo" );
+    my $key = "foo";
+    $neb->create($key);
 
-    my $uri = $neb->delete_instance( @$locations[0] );
+    my $locations = $neb->find_instances($key);
+
+    my $uri = $neb->delete_instance($key, @$locations[0]);
 
     is( $uri, @$locations[0], "delete instance" );
@@ -43 +45 @@
         proxy => "http://$hostport/nebulous",
     );
-    $neb->create( "foo" );
-    $neb->replicate( "foo" );
+    my $key = "foo";
+    $neb->create($key);
+    $neb->replicate($key);
 
     my $uri1 = $neb->find_instances( "foo" )->[0];
 
-    ok( $neb->delete_instance( $uri1 ), "delete instance" );
+    ok( $neb->delete_instance($key, $uri1), "delete instance" );
 
     my $uri2 = $neb->find_instances( "foo" )->[0];
@@ -54 +57 @@
     isnt( $uri1, $uri2, "other instance remains" );
 
-    ok( $neb->delete_instance( $uri2 ), "delete instance" );
+    ok( $neb->delete_instance($key, $uri2), "delete instance" );
 
     my $locations = $neb->find_instances( "foo" );
 
-    is( $locations, undef, "no remaning instances" );
+    is( $locations, undef, "no remaining instances" );
 }
+
+Test::Nebulous->setup;
 
 {
@@ -65 +70 @@
         proxy => "http://$hostport/nebulous",
     );
-    my $uri = $neb->delete_instance( "file:/foo" );
+    my $key = "foo";
+    $neb->create($key);
+    my $uri = $neb->delete_instance($key, "file:/foo" );
 
     is( $uri, undef, "uri does not exist" );
@@ -76 +83 @@
         proxy => "http://$hostport/nebulous",
     );
-    $neb->delete_instance();
+    my $uri = $neb->delete_instance("foo", "file:/foo" );
 };
-like( $@, qr/1 was expected/, "no params" );
+like( $@, qr/is valid object key/, "bad object key" );
 
 Test::Nebulous->setup;
@@ -86 +93 @@
         proxy => "http://$hostport/nebulous",
     );
-    $neb->delete_instance( "foo", 2 );
+    my $uri = $neb->delete_instance("foo");
 };
-like( $@, qr/1 was expected/, "too many params" );
+like( $@, qr/2 were expected/, "missing second param" );
+
+Test::Nebulous->setup;
+
+eval {
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->delete_instance();
+};
+like( $@, qr/2 were expected/, "no params" );
+
+Test::Nebulous->setup;
+
+eval {
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->delete_instance("foo", 2, 3);
+};
+like( $@, qr/2 were expected/, "too many params" );
 
 Test::Nebulous->cleanup;

branches/cnb_branches/cnb_branch_20090301/Nebulous/t/conf/startup.pl.in

@@ -12 +12 @@
 use Test::Nebulous;
 
+#$Apache::DBI::DEBUG = 1;
 Apache::DBI->connect_on_init( $NEB_DB, $NEB_USER, $NEB_PASS );
-Nebulous::Server::SOAP->new_on_init(
+Apache::DBI->setPingTimeOut($NEB_DB, 10);
+
+my $config = Nebulous::Server::Config->new(
+    trace       => 'all',
+);
+$config->add_db(
+    dbindex     => 0,
     dsn         => $NEB_DB,
     dbuser      => $NEB_USER,
     dbpasswd    => $NEB_PASS,
-    log_level   => 'all',
 );
+#$config->add_db(
+#    dbindex     => 1,
+#    dsn         => 'DBI:mysql:database=nebulous1:host=localhost',
+#    dbuser      => $dbuser,
+#    dbpasswd    => $dbpasswd,
+#);
+
+Nebulous::Server::SOAP->new_on_init($config);
 
 1;