summaryrefslogtreecommitdiffstats
path: root/src/H5Fint.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2021-04-06 11:43:31 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2021-04-06 11:43:31 (GMT)
commit4857beeb30b0bac6ea5f4467d8c07be9f3ed2ae0 (patch)
treefca214f3f947841aaed3f967853a58d0de48cca5 /src/H5Fint.c
parent555d6593b714158644f0339f69e18588e5372160 (diff)
downloadhdf5-4857beeb30b0bac6ea5f4467d8c07be9f3ed2ae0.zip
hdf5-4857beeb30b0bac6ea5f4467d8c07be9f3ed2ae0.tar.gz
hdf5-4857beeb30b0bac6ea5f4467d8c07be9f3ed2ae0.tar.bz2
Better VFD SWMR parallel skip test
Diffstat (limited to 'src/H5Fint.c')
-rw-r--r--src/H5Fint.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/H5Fint.c b/src/H5Fint.c
index e1fa7d1..7815a47 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -1999,28 +1999,16 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id)
/* Check if page buffering is enabled */
if (H5P_get(a_plist, H5F_ACS_PAGE_BUFFER_SIZE_NAME, &page_buf_size) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "can't get page buffer size")
-
-#ifdef H5_HAVE_PARALLEL
-{
- hid_t driver_id = H5I_INVALID_HID; /* VFD ID */
-
- /* Get the driver */
- if ((driver_id = H5P_peek_driver(a_plist)) < 0)
- HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "can't get driver")
- /* Temporary: fail file create when page buffering feature is enabled for parallel */
- if (H5FD_MPIO == driver_id)
- HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "page buffering is disabled for MPI-I/O VFD")
-}
-#endif /* H5_HAVE_PARALLEL */
-
if (page_buf_size) {
#ifdef H5_HAVE_PARALLEL
/* Collective metadata writes are not supported with page buffering */
if (file->shared->coll_md_write)
HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL,
"collective metadata writes are not supported with page buffering")
-#endif /* H5_HAVE_PARALLEL */
+ /* Temporary: fail file create when page buffering feature is enabled for parallel */
+ HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "page buffering is disabled for parallel")
+#endif /* H5_HAVE_PARALLEL */
/* Query for other page buffer cache properties */
if (H5P_get(a_plist, H5F_ACS_PAGE_BUFFER_MIN_META_PERC_NAME, &page_buf_min_meta_perc) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "can't get minimum metadata fraction of page buffer")