Changeset 8595

Timestamp:

10/26/10 15:17:21 (3 years ago)

Author:

bligon

Message:

In the call to trove_collection_lookup() from server_initialize_subsystems(), I passed in the address
of a local variable, orig_fsid, instead of the address of cur_fs->coll_id, because this variable
is modified in the lookup at the same time the trove_thread_function() tries to read it,
causing a data race condition.

Files:

• branches/Orange-Branch/src/server/pvfs2-server.c (modified) (3 diffs)

branches/Orange-Branch/src/server/pvfs2-server.c

@@ -678 +678 @@
     TROVE_context_id trove_context = -1;
     char buf[16] = {0};
-    PVFS_fs_id orig_fsid;
+    PVFS_fs_id orig_fsid=0;
     PVFS_ds_flags init_flags = 0;
     int bmi_flags = BMI_INIT_SERVER;
@@ -874 +874 @@
         }
 
-        orig_fsid = cur_fs->coll_id;
         ret = trove_collection_lookup(
             cur_fs->trove_method,
-            cur_fs->file_system_name, &(cur_fs->coll_id), NULL, NULL);
+            cur_fs->file_system_name, &(orig_fsid), NULL, NULL);
 
         if (ret < 0)
@@ -889 +888 @@
         {
             gossip_err("Error: configuration file does not match storage collection.\n");
-            gossip_err("   config file fs_id: %d\n", (int)orig_fsid);
-            gossip_err("   storage fs_id: %d\n", (int)cur_fs->coll_id);
+            gossip_err("   storage file fs_id: %d\n", (int)orig_fsid);
+            gossip_err("   config  file fs_id: %d\n", (int)cur_fs->coll_id);
             gossip_err("Warning: This most likely means that the configuration\n");
             gossip_err("   files have been regenerated without destroying and\n");