Address comments from review

Author: jhendersonHDF

src/H5FDros3.c

@@ -1290,7 +1290,17 @@ H5FD__ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
                 page_buf_size = ROS3_DEF_PAGE_BUF_SIZE;
         }
 
+        if (page_buf_size == 0)
+            HGOTO_ERROR(H5E_VFL, H5E_BADVALUE, NULL, "invalid page buffer size (0) specified");
+
+        /* Specified page buffer size should be the final say on the amount of bytes
+         * allocated; round page size down to page buffer size if the latter is smaller.
+         */
+        if (page_buf_size < file->page_cache.page_size)
+            file->page_cache.page_size = page_buf_size;
+
         file->page_cache.max_num_pages = (page_buf_size / file->page_cache.page_size);
+        assert(file->page_cache.max_num_pages >= 1);
     }
 
 #ifdef ROS3_STATS
@@ -1901,7 +1911,7 @@ H5FD__ros3_init_page_cache(H5FD_ros3_t *file)
     }
 
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5FD__ros3_init_page_cache() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FD__ros3_determine_io_reqs
@@ -1988,7 +1998,7 @@ H5FD__ros3_determine_io_reqs(H5FD_ros3_t *file, haddr_t addr, size_t io_size,
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD__ros3_determine_io_pages() */
+} /* end H5FD__ros3_determine_io_reqs() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FD__ros3_page_cache_make_space

test/ros3.c

@@ -1158,11 +1158,14 @@ test_hive_style_object_key(void)
 static int
 test_ros3_paging_apis(void)
 {
-    size_t page_size;
-    size_t page_cache_size;
-    hid_t  fid     = H5I_INVALID_HID;
-    hid_t  fapl_id = H5I_INVALID_HID;
-    bool   lock_super_page;
+    unsigned page_buf_min_meta;
+    unsigned page_buf_min_raw;
+    size_t   page_size;
+    size_t   page_cache_size;
+    size_t   page_buf_size;
+    hid_t    fid     = H5I_INVALID_HID;
+    hid_t    fapl_id = H5I_INVALID_HID;
+    bool     lock_super_page;
 
     TESTING("ros3 I/O paging parameter APIs");
 
@@ -1242,6 +1245,24 @@ test_ros3_paging_apis(void)
     if (H5Fclose(fid) < 0)
         TEST_ERROR;
 
+    /* Set page buffer size to smaller than page size - should round page size down; no way to verify
+     * currently
+     */
+    if (H5Pget_page_buffer_size(fapl_id, &page_buf_size, &page_buf_min_meta, &page_buf_min_raw) < 0)
+        TEST_ERROR;
+    if (H5Pset_page_buffer_size(fapl_id, HDF5_ROS3_VFD_DEFAULT_PAGE_SIZE - 1, 50, 50) < 0)
+        TEST_ERROR;
+
+    /* Check that parameters are accepted - no validation performed since H5FD_ros3_t fields are internal */
+    if ((fid = H5Fopen(url_h5_public, H5F_ACC_RDONLY, fapl_id)) < 0)
+        TEST_ERROR;
+    if (H5Fclose(fid) < 0)
+        TEST_ERROR;
+
+    /* Restore page buffer settings */
+    if (H5Pset_page_buffer_size(fapl_id, page_buf_size, page_buf_min_meta, page_buf_min_raw) < 0)
+        TEST_ERROR;
+
     /* Disable locking of the superblock page into the page cache */
     if (H5Pset_fapl_ros3_paging(fapl_id, 1048576, 4194304, false) < 0)
         TEST_ERROR;