Changeset 20341

Timestamp:

Oct 22, 2008, 9:44:43 PM (18 years ago)

Author:

bills

Message:

when opening a file in nebulous for writing, cull all but one existing
instance for consistencty (may need some work with respect to locking
versus replication)

Location:

trunk

Files:

• Nebulous/nebclient/src/nebclient.c (modified) (3 diffs)
• Nebulous/nebclient/src/nebclient.h (modified) (2 diffs)
• psModules/src/config/pmConfig.c (modified) (2 diffs)

trunk/Nebulous/nebclient/src/nebclient.c

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.52 2008-10-16 23:53:01 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.53 2008-10-23 07:44:43 bills Exp $
  */
 
@@ -247 +247 @@
 
     locations = nebFindInstances(server, key, NULL);
-    if (!locations) {
+    if (!locations || locations->n <= 1) {
         nebSetErr(server, "can not cull - not enough instances");
 
@@ -260 +260 @@
 
     nebObjectInstancesFree(locations);
+
+    return true;
+}
+
+bool nebCullAllButOne(nebServer *server, const char *key)
+{
+    while (nebCull(server, key)) {
+        ;
+    }
 
     return true;

trunk/Nebulous/nebclient/src/nebclient.h

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.h,v 1.34 2008-10-16 23:53:01 jhoblitt Exp $
+ * $Id: nebclient.h,v 1.35 2008-10-23 07:44:43 bills Exp $
  */
 
@@ -120 +120 @@
 );
 
+/** Removes all but one instance from a storage object
+ *
+ * @return true on success
+ */
+
+bool nebCullAllButOne(
+    nebServer *server,                  ///< nebServer object
+    const char *key                     ///< storage object key (name)
+);
+
 /** Trys to acquire a lock on a storage object
  *

trunk/psModules/src/config/pmConfig.c

@@ -1604 +1604 @@
         nebServer *server = nebServerAlloc(neb_server);
         if (!server) {
-            psError(PM_ERR_SYS, true, "failed to create a nebServer object: %s", nebErr(server));
-            nebServerFree(server);
+            psError(PM_ERR_SYS, true, "failed to create a nebServer object.");
             return NULL;
         }
@@ -1626 +1625 @@
                 return NULL;
             }
+        } else if (create || trunc) {
+            // object exists and it looks like the caller intends to write to it
+            // delete all but one instance
+            if (!nebCullAllButOne(server,filename)) {
+                psError(PM_ERR_SYS, true, "failed to cull instances of existing nebulous file: %s\n%s", 
+                    filename, nebErr(server));
+                return NULL;
+            }
+            // we don't know which instances got culled so get the instance again
+            if (!(nebfile = nebFind(server, filename))) {
+                psError(PM_ERR_SYS, true, "failed to find instance of existing nebulous file: %s\n%s", 
+                    filename, nebErr(server));
+                return NULL;
+            }
         }