Changeset 8357

Timestamp:

06/02/10 17:35:05 (3 years ago)

Author:

pcarns

Message:

merge final precreate race fixes from trunk to 2-8 branch

Files:

• branches/pvfs-2-8-branch/src/io/job/job.c (modified) (6 diffs)

branches/pvfs-2-8-branch/src/io/job/job.c

@@ -4427 +4427 @@
 
     trove_pending_count--;
-    assert(trove_pending_count >= 0);
+
+    /* don't overwrite error codes from other trove ops */
+    if(tmp_trove->jd->u.precreate_pool.error_code == 0)
+    {
+        tmp_trove->jd->u.precreate_pool.error_code = error_code;
+    }
+
+    /* acquiring this mutex a little early so that it can also serve to
+     * prevent multiple trove operations from racing between decrementing 
+     * and then reading the pool.trove_pending counter
+     */
+    gen_mutex_lock(&completion_mutex);
 
     tmp_trove->jd->u.precreate_pool.trove_pending--;
     assert(tmp_trove->jd->u.precreate_pool.trove_pending >= 0);
 
-    /* don't overwrite error codes from other trove ops */
-    if(tmp_trove->jd->u.precreate_pool.error_code == 0)
-    {
-        tmp_trove->jd->u.precreate_pool.error_code = error_code;
-    }
-
     /* is this job done? */
     if(tmp_trove->jd->u.precreate_pool.trove_pending == 0)
     {
-        gen_mutex_lock(&completion_mutex);
-
         /* set job descriptor fields and put into completion queue */
         tmp_trove->jd->u.precreate_pool.error_code = 0;
@@ -4459 +4462 @@
     }
 
+    gen_mutex_unlock(&completion_mutex);
     return;
 }
@@ -5705 +5709 @@
     jd->u.precreate_pool.fsid = fsid;
     jd->u.precreate_pool.servers = servers;
+    jd->u.precreate_pool.flags = flags;
     jd->u.precreate_pool.trove_pending = 0;
-    jd->u.precreate_pool.flags = flags;
 
     /* rotate to use a different starting server in the pool next time */
@@ -5861 +5865 @@
     }
 
+    /* pre-increment pending count before posting any trove operations */
+    jd->u.precreate_pool.trove_pending = jd->u.precreate_pool.precreate_handle_count;
+
     /* post all trove operations at once */
     for(i=0; i<jd->u.precreate_pool.precreate_handle_count; i++)
@@ -5901 +5908 @@
         }
 
-        /* pre-increment pending count before posting trove operation */
-        trove_pending_count++;
-        jd->u.precreate_pool.trove_pending++;
 
         /* post trove operation to pull out a handle */
@@ -5933 +5937 @@
         else
         {
+            trove_pending_count++;
             /* callback will be triggered later */
         }