[svn-r24584] Fix abort from all ranks problem (at least for now).

6 files changed, 33 insertions, 18 deletions

diff --git a/src/H5VLiod_attr.c b/src/H5VLiod_attr.c
index f762ea9..e39a8d0 100644
--- a/src/H5VLiod_attr.c
+++ b/src/H5VLiod_attr.c
@@ -72,8 +72,8 @@ H5VL_iod_server_attr_create_cb(AXE_engine_t UNUSED axe_engine,
     FUNC_ENTER_NOAPI_NOINIT
 
 #if H5VL_IOD_DEBUG
-    fprintf(stderr, "Start attribute create %s at %"PRIu64" with ID %"PRIx64"\n", 
-            attr_name, loc_handle.wr_oh, attr_id);
+    fprintf(stderr, "Start attribute create %s at %"PRIu64" with ID %"PRIx64" %"PRIx64"",
+            attr_name, loc_handle.wr_oh, attr_id, loc_attrkv_id);
 #endif
 
     attr_oh.rd_oh.cookie = IOD_OH_UNDEFINED;
@@ -198,15 +198,8 @@ done:
         iod_obj_close(obj_oh.rd_oh, NULL, NULL);
     }
 
-    /* close the Metadata KV object */
-    if(mdkv_oh.cookie != IOD_OH_UNDEFINED &&
-       iod_obj_close(mdkv_oh, NULL, NULL) < 0)
-        HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
-
-    /* close the Attribute KV object */
-    if(attr_kv_oh.cookie != IOD_OH_UNDEFINED &&
-       iod_obj_close(attr_kv_oh, NULL, NULL) < 0)
-        HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
+    iod_obj_close(mdkv_oh, NULL, NULL);
+    iod_obj_close(attr_kv_oh, NULL, NULL);
 
     /* return an UNDEFINED oh to the client if the operation failed */
     if(ret_value < 0) {
@@ -224,6 +217,18 @@ done:
         HG_Handler_start_output(op_data->hg_handle, &output);
     }
 
+#if 0
+    /* close the Metadata KV object */
+    if(mdkv_oh.cookie != IOD_OH_UNDEFINED &&
+       iod_obj_close(mdkv_oh, NULL, NULL) < 0)
+        HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
+
+    /* close the Attribute KV object */
+    if(attr_kv_oh.cookie != IOD_OH_UNDEFINED &&
+       iod_obj_close(attr_kv_oh, NULL, NULL) < 0)
+        HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
+#endif
+
     input = (attr_create_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
@@ -1119,14 +1124,14 @@ done:
     }
 
     if(step == 2) {
-        /* close the Attribute KV object */
-        iod_obj_close(attr_kv_oh.rd_oh, NULL, NULL);
-        iod_obj_close(attr_kv_oh.wr_oh, NULL, NULL);
+        /* close the attribute oh */
+        iod_obj_close(attr_oh, NULL, NULL);
         step --;
     }
     if(step == 1) {
-        /* close the attribute oh */
-        iod_obj_close(attr_oh, NULL, NULL);
+        /* close the Attribute KV object */
+        iod_obj_close(attr_kv_oh.rd_oh, NULL, NULL);
+        iod_obj_close(attr_kv_oh.wr_oh, NULL, NULL);
         step --;
     }
 
diff --git a/src/H5VLiod_dset.c b/src/H5VLiod_dset.c
index 4d53a27..61f8e07 100644
--- a/src/H5VLiod_dset.c
+++ b/src/H5VLiod_dset.c
@@ -112,8 +112,10 @@ H5VL_iod_server_dset_create_cb(AXE_engine_t UNUSED axe_engine,
                                 &last_comp, &cur_id, &cur_oh) < 0)
         HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path");
 
-    fprintf(stderr, "Creating Dataset ID %"PRIx64" ", dset_id);
+#if H5VL_IOD_DEBUG
+    fprintf(stderr, "Creating Dataset ID %"PRIx64" ",dset_id);
     fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64")\n", cur_oh.wr_oh, cur_id);
+#endif
 
     /* Set the IOD array creation parameters */
     array.cell_size = (uint32_t)H5Tget_size(input->type_id);
diff --git a/src/H5VLiod_dtype.c b/src/H5VLiod_dtype.c
index 329ea1a..6b6448d 100644
--- a/src/H5VLiod_dtype.c
+++ b/src/H5VLiod_dtype.c
@@ -83,8 +83,10 @@ H5VL_iod_server_dtype_commit_cb(AXE_engine_t UNUSED axe_engine,
                                 &last_comp, &cur_id, &cur_oh) < 0)
         HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path");
 
+#if H5VL_IOD_DEBUG
     fprintf(stderr, "Creating Datatype ID %"PRIx64" ", dtype_id);
     fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64")\n", cur_oh.wr_oh, cur_id);
+#endif
 
     /* create the datatype */
     if(iod_obj_create(coh, wtid, NULL, IOD_OBJ_BLOB, NULL, NULL, &dtype_id, NULL) < 0)
diff --git a/src/H5VLiod_file.c b/src/H5VLiod_file.c
index 18348b6..8aa6afd 100644
--- a/src/H5VLiod_file.c
+++ b/src/H5VLiod_file.c
@@ -63,7 +63,9 @@ H5VL_iod_server_file_create_cb(AXE_engine_t UNUSED axe_engine,
     FUNC_ENTER_NOAPI_NOINIT
 
 #if H5VL_IOD_DEBUG
-    fprintf(stderr, "Start file create %s\n", input->name);
+    fprintf(stderr, "Start file create %s ", input->name);
+    fprintf(stderr, "with MDKV %"PRIx64" ", mdkv_id), 
+    fprintf(stderr, "with attrKV %"PRIx64"\n", attrkv_id), 
 #endif
 
     /* convert HDF5 flags to IOD flags */
diff --git a/src/H5VLiod_group.c b/src/H5VLiod_group.c
index 7bd4ef1..4a57f70 100644
--- a/src/H5VLiod_group.c
+++ b/src/H5VLiod_group.c
@@ -80,9 +80,11 @@ H5VL_iod_server_group_create_cb(AXE_engine_t UNUSED axe_engine,
                                 &last_comp, &cur_id, &cur_oh) < 0)
         HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path");
 
+#if H5VL_IOD_DEBUG
     fprintf(stderr, "Creating Group ID %"PRIx64" (CV %"PRIu64", TR %"PRIu64") ", 
             grp_id, rtid, wtid);
     fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64")\n", cur_oh.wr_oh, cur_id);
+#endif
 
     /* create the group */
     if(iod_obj_create(coh, wtid, NULL, IOD_OBJ_KV, NULL, NULL, &grp_id, NULL) < 0)
diff --git a/src/H5VLiod_map.c b/src/H5VLiod_map.c
index 7a48859..08de483 100644
--- a/src/H5VLiod_map.c
+++ b/src/H5VLiod_map.c
@@ -85,8 +85,10 @@ H5VL_iod_server_map_create_cb(AXE_engine_t UNUSED axe_engine,
                                 &last_comp, &cur_id, &cur_oh) < 0)
         HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path");
 
+#if H5VL_IOD_DEBUG
     fprintf(stderr, "Creating Map ID %"PRIx64") ", map_id);
     fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64")\n", cur_oh.wr_oh, cur_id);
+#endif
 
     /* create the map */
     if(iod_obj_create(coh, wtid, NULL, IOD_OBJ_KV, NULL, NULL, &map_id, NULL) < 0)