Changeset 60

Timestamp:

08/05/04 00:30:43 (4 years ago)

Author:

marksmith

Message:

Add three new commands to mogilefsd: CREATE_DOMAIN, CREATE_CLASS, UPDATE_CLASS

These correspond to the new MogileFS methods: create_domain, create_class, update_class

These give you the ability to use a MogileFS object to create domains and
classes on the fly. You are also given the ability to update the minimum
replica count of an existing class in a domain using the update_class method.

$MogileFS->create_domain( $domain_name );
$MogileFS->create_class( $domain_name, $class_name, $minimum_replica_count );
$MogileFS->update_class( $domain_name, $class_name, $minimum_replica_count );

Files:

• trunk/api/perl/MogileFS.pm (modified) (1 diff)
• trunk/devnotes/perl-interface.txt (modified) (1 diff)
• trunk/server/mogilefsd (modified) (3 diffs)

trunk/api/perl/MogileFS.pm

@@ -122 +122 @@
-}
-
+# create a new domain
+sub create_domain {
+    my MogileFS $self = shift;
+    my $domain = shift;
+
+    my $res = $self->{backend}->do_request("create_domain", { domain => $domain });
+    return undef unless $res->{domain} eq $domain;
+    
+    return 1;
+}
+
+# create a new class within a domain
+sub create_class {
+    my MogileFS $self = shift;
+    my ($domain, $class, $mindevcount, $verb) = @_;
+    $verb ||= 'create';
+    
+    my $res = $self->{backend}->do_request("${verb}_class", {
+        domain => $domain,
+        class => $class,
+        mindevcount => $mindevcount,
+    });
+    return undef unless $res->{class} eq $class;
+    
+    return 1;
+}
+
+# update a class's mindevcount within a domain
+sub update_class {
+    my MogileFS $self = shift;
+
+    # a simple passthrough to create, but specify that it should be doing
+    # an update
+    return $self->create_class(@_, 'update');
+}
+
-# given a key, returns a scalar reference pointing at a string containing
-# the contents of the file. takes one parameter; a scalar key to get the

trunk/devnotes/perl-interface.txt

@@ -60 +60 @@
-           each class has two keys in the form of 'domainXclassYname' and
-           'domainXclassYmindevcount' where Y is in the range of 1..N.
+
+           
+    6) create a new domain on the fly
+    
+        < CREATE_DOMAIN domain=mynewdomain
+        > OK domain=mynewdomain
+
+        -- returns the domain you just created as the only response value
+
+
+    7) create a new class
+
+        < CREATE_CLASS domain=mynewdomain&class=theclass&mindevcount=2
+        > OK domain=mynewdomain&class=theclass&mindevcount=2
+
+        -- creates a new class under the domain you specify named 'class' with
+           the minimum device replication count of 'mindevcount'
+
+
+    8) updates a class's minimum device replica count
+
+        < UPDATE_CLASS domain=mynewdomain&class=theclass&mindevcount=3
+        > OK domain=mynewdomain&class=theclass&mindevcount=3
+
+        -- same as create_class except it overwrites the mindevcount of the class
+           you are specifying.  useful if you want to change the replica count
+           for a class.

trunk/server/mogilefsd

@@ -684 +684 @@
-}
-
+sub class_id {
+    my ($dmid, $class) = @_;
+    return undef unless $dmid > 0 && length $class;
+
+    my $dbh = Mgd::get_dbh;
+    my $classid = $dbh->selectrow_array
+        ("SELECT classid FROM class WHERE dmid=? AND classname=?", undef, $dmid, $class)
+            or return undef;
+    return undef unless $classid;
+    return $classid;
+}
+
-sub domain_id {
-    my $domain = shift;
@@ -1099 +1111 @@
-
-    return $self->ok_line($ret);
+}
+
+sub cmd_create_domain {
+    my Client $self = shift;
+    my $args = shift;
+
+    my $dbh = Mgd::get_dbh()
+        or return $self->err_line("nodb");
+
+    my $domain = $args->{domain};
+    return $self->err_line('no_domain') unless length $domain;
+
+    # FIXME: add some sort of authentication/limitation on this?
+    
+    my $dmid = Mgd::domain_id($domain);
+    return $self->err_line('domain_exists') if $dmid;
+
+    # get the max domain id
+    my $maxid = $dbh->selectrow_array('SELECT MAX(dmid) FROM domain');
+    $dbh->do('INSERT INTO domain (dmid, namespace) VALUES (?, ?)',
+             undef, $maxid + 1, $domain);
+    return $self->err_line('failure') if $dbh->err;
+
+    # return the domain id we created
+    return $self->ok_line({ domain => $domain });
+}
+
+sub cmd_create_class {
+    my Client $self = shift;
+    my $args = shift;
+
+    my $dbh = Mgd::get_dbh()
+        or return $self->err_line("nodb");
+
+    my $domain = $args->{domain};
+    return $self->err_line('no_domain') unless length $domain;
+
+    my $class = $args->{class};
+    return $self->err_line('no_class') unless length $class;
+
+    my $mindevcount = $args->{mindevcount}+0;
+    return $self->err_line('invalid_mindevcount') unless $mindevcount > 0;
+
+    # FIXME: add some sort of authentication/limitation on this?
+    
+    my $dmid = Mgd::domain_id($domain);
+    return $self->err_line('no_domain') unless $dmid;
+
+    my $cid = Mgd::class_id($dmid, $class);
+    return $self->err_line('class_exists') if $cid && !$args->{update};
+
+    # setup verb; if we have the update option set on, then we're doing a
+    # replace so we update our class
+    my $verb = $args->{update} ? 'REPLACE' : 'INSERT';
+
+    # get the max class id in this domain
+    my $maxid = $dbh->selectrow_array
+        ('SELECT MAX(classid) FROM class WHERE dmid = ?', undef, $dmid);
+    $dbh->do("$verb INTO class (dmid, classid, classname, mindevcount) VALUES (?, ?, ?, ?)",
+             undef, $dmid, $maxid + 1, $class, $mindevcount);
+    return $self->err_line('failure') if $dbh->err;
+
+    # return success
+    return $self->ok_line({ class => $class, mindevcount => $mindevcount, domain => $domain });
+}
+
+sub cmd_update_class {
+    my Client $self = shift;
+    my $args = shift;
+
+    # simply passes through to create_class with update set
+    $self->cmd_create_class({ %$args, update => 1 });
-}
-
@@ -1193 +1277 @@
-    my $err_text = {
-        'unknown_command' => "Unknown server command",
+        'no_domain' => "No domain provided",
+        'no_class' => "No class provided",
+        'class_exists' => "That class already exists in that domain",
+        'domain_exists' => "That domain already exists",
+        'invalid_mindevcount' => "The mindevcount must be at least 1",
+        'failure' => "Operation failed",
-    }->{$err_code};
-