Changeset 24939

Timestamp:

Jul 29, 2009, 11:30:24 AM (17 years ago)

Author:

jhoblitt

Message:

add nebObjectStatFree()
flesh out nebThereCanBeOnlyOne()

Location:

trunk/Nebulous/nebclient

Files:

• src/nebclient.c (modified) (6 diffs)
• src/nebclient.h (modified) (1 diff)
• tests/tests.c (modified) (2 diffs)

trunk/Nebulous/nebclient/src/nebclient.c

@@ -833 +833 @@
 }
 
+void nebObjectStatFree(nebObjectStat *stat)
+{
+    if (!stat) {
+        return;
+    }
+
+    xfree(stat->so_id);
+    xfree(stat->ext_id);
+    xfree(stat->read_lock);
+    xfree(stat->write_lock);
+    xfree(stat->epoch);
+    xfree(stat->mtime);
+    xfree(stat);
+}
+
 
 int nebChmod(nebServer *server, const char *key, mode_t mode)
 {
-    int response;
-
     REQUIRE_SERVER;
 
@@ -849 +862 @@
     // manual seems to 'suggest' that this is temporary data that gets cleaed
     // up on the next soap function call
+    int response;
     if (soap_call_ns1__chmod_USCOREobject(server->soap, server->endpoint,
             NULL, (char *)key, mode, &response) != SOAP_OK) {
@@ -861 +875 @@
 int nebPrune(nebServer *server, const char *key)
 {
-    int response;
-
     REQUIRE_SERVER;
 
@@ -874 +886 @@
     // manual seems to 'suggest' that this is temporary data that gets cleaed
     // up on the next soap function call
+    int response;
     if (soap_call_ns1__prune_USCOREobject(server->soap, server->endpoint,
             NULL, (char *)key, &response) != SOAP_OK) {
@@ -893 +906 @@
     }
 
+    // first - strip off any inaccesible instances
     if (nebPrune(server, key) < 0 ) {
-    }
-
+        // use the prune() method to also determine if $key is valid
+        return -1;
+    }
+
+    // check to see if there is an instance on $vol_name that should be the
+    // sole survivor
     nebObjectInstances *locations = NULL;
     if (volume) {
@@ -901 +919 @@
     }
 
+    long removed = 0;
     if (locations && locations->n) {
         nebObjectInstances *instances = nebFindInstances(server, key, NULL);
         for (long i = 0; i < instances->n; i++) {
-            if (strcmp(locations->URI[0], instances->URI[i])) {
-                nebDeleteInstance(server, key, instances->URI[i]);
+            if (strcmp(locations->URI[0], instances->URI[i]) == 0) {
+                continue;
             }
+            if (!nebDeleteInstance(server, key, instances->URI[i])) {
+                nebObjectInstancesFree(instances);
+                nebObjectInstancesFree(locations);
+                return -1;
+            }
+            removed++;
         }
         nebObjectInstancesFree(instances);
-    }
-    nebObjectInstancesFree(locations);
-
-
-    return 0;
+        nebObjectInstancesFree(locations);
+    } else {
+        // nuke whatever
+        nebObjectStat *stat = nebStat(server, key);
+        if (!stat) {
+            return -1;
+        }
+        // start at one so cull() is called one less time then the # of
+        // instances
+        for (long i = 1; i < stat->available; i++) {
+            if (!nebCull(server, key)) {
+                nebObjectStatFree(stat);
+                return -1;
+            }
+            removed++;
+        }
+        nebObjectStatFree(stat);
+    }
+
+    return removed;
 }
 

trunk/Nebulous/nebclient/src/nebclient.h

@@ -299 +299 @@
 );
 
+
+/** Deallocates a stat object
+ */
+void nebObjectStatFree(
+    nebObjectStat *stat                 ///< nebObjectStat object
+);
+
 /** Change permissions of a storage objects
  *

trunk/Nebulous/nebclient/tests/tests.c

@@ -20 +20 @@
     char            *key = "foobarbaz";
 
-    plan_tests(30);
+    plan_tests(31);
 
     if (getenv("NEB_SERVER")) {
@@ -141 +141 @@
     neb_ok(server, nebPrune(server, "movedfile") == 0, "prune object");
 
+    nebReplicate(server, key, NULL, NULL);
+    neb_ok(server, nebThereCanBeOnlyOne(server, "movedfile", NULL) == 0, "reduce instances to only 1");
+
     if (!nebDelete(server, "movedfile")) {
         diag( "cleanup failed %s\n", nebErr(server));