Changeset 24372

Timestamp:

Jun 10, 2009, 3:30:24 PM (17 years ago)

Author:

jhoblitt

Message:

clean up memcached support

Location:

trunk

Files:

• Nebulous-Server/lib/Nebulous/Server.pm (modified) (4 diffs)
• Nebulous-Server/lib/Test/Nebulous.pm (modified) (3 diffs)
• Nebulous-Server/t/05_server_replicate_object.t (modified) (1 diff)
• Nebulous/t/conf/startup.pl.in (modified) (1 diff)

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

@@ -516 +516 @@
             }
 
+            $self->cache->delete($key->path) if defined $self->cache;
+            $self->cache->set($newkey->path, 1) if defined $self->cache;
+
             $db->commit;
             $log->debug("commit");
@@ -1930 +1933 @@
     my $cached = $self->cache->get($key->path) if defined $self->cache;
     if (defined $cached) {
-        $log->debug( "key $key found in cache" );
+        $log->debug( "key $key found in cache as ", $key->path );
         $log->debug( "leaving" );
         return 1;
@@ -1956 +1959 @@
         # add key to cache
         $self->cache->set($key->path, 1) if defined $self->cache;
-        $log->debug( "key added to cache" );
+        $log->debug( "key added to cache as ", $key->path );
         $log->debug( "leaving" );
         return 1;
@@ -1970 +1973 @@
 sub _is_valid_volume_name
 {
-    my ($self, $key, $vol_name) = @_;
+    my $self = shift;
 
     my $log = $self->log;
     $log->debug( "entered - @_" );
+
+    my ($key, $vol_name) = @_;
 
     my $sql = $self->sql;

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

@@ -11 +11 @@
 use base qw( Exporter );
 
+use Cache::Memcached;
 use DBI;
 use File::Path qw( mkpath rmtree );
@@ -16 +17 @@
 use Nebulous::Server::SQL;
 
-our @EXPORT = qw( $NEB_DB $NEB_USER $NEB_PASS );
+our @EXPORT = qw( $NEB_DB $NEB_USER $NEB_PASS $NEB_MEMCACHED_SERVERS);
 
 our $NEB_DB     = $ENV{'NEB_DB'}   || "DBI:mysql:database=test:host=localhost";
 our $NEB_USER   = $ENV{'NEB_USER'} || "test";
 our $NEB_PASS   = $ENV{'NEB_PASS'} || '';
+our $NEB_MEMCACHED_SERVERS = ['127.0.0.1:11211'];
 
 my $dbh = DBI->connect( $NEB_DB, $NEB_USER, $NEB_PASS );
@@ -83 +85 @@
 
 sub cleanup {
+    # memcached needs to be emptied between test runs
+        Cache::Memcached->new(servers => $NEB_MEMCACHED_SERVERS)->flush_all;
+    # if flush_all() turns out to be useless as feared
+#   my $memd = Cache::Memcached->new(servers => $NEB_MEMCACHED_SERVERS);
+#   my $query = $dbh->prepare("SELECT ext_id FROM storage_object");
+#   if ($query->execute) {
+#        while (my $row = $query->fetchrow_hashref) {
+#            my $ext_id = $row->{ext_id};
+#            warn "found key $ext_id\n" if $memd->get($ext_id);
+#            warn "deleted $ext_id\n" if $memd->delete($ext_id);
+#        }
+#   }
+#   $query->finish;
+
     foreach my $statement (@{ $sql->get_db_clear }) {
         $dbh->do( $statement );

trunk/Nebulous-Server/t/05_server_replicate_object.t

@@ -24 +24 @@
     dbuser      => $NEB_USER,
     dbpasswd    => $NEB_PASS,
+    memcached_servers => $NEB_MEMCACHED_SERVERS,
 );
 

trunk/Nebulous/t/conf/startup.pl.in

@@ -18 +18 @@
 my $config = Nebulous::Server::Config->new(
     trace       => 'all',
+    memcached_servers => ['127.0.0.1:11211'],
 );
 $config->add_db(