From 9c3e331ba31fdaea98354a05554beb8bdcd2e6fc Mon Sep 17 00:00:00 2001 From: Vailin Choi Date: Mon, 26 Aug 2019 12:02:31 -0500 Subject: Merge pull request #1892 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV-10873-assertion-v-oh--nmesgs-failed to develop * commit '021919206df7764f951037ae76ccae006b2eea99': Fixed the assertion failure for HDFFV-10873. --- release_docs/RELEASE.txt | 14 ++++++++++++++ src/H5Ochunk.c | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 3bcab21..e5f719c 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -170,6 +170,20 @@ Bug Fixes since HDF5-1.10.5 release Library ------- + - Fixed a bug caused by bad tag value when condensing object header + messages + + There was an assertion failure when moving meessages from running a + user test program with library release hdf5.1.10.4. It was because + the tag value (object header's address) was not set up when entering + the library routine H5O__chunk_update_idx(), which will eventually + verifies the metadata tag value when protecting the object header. + + The problem was fixed by replacing FUNC_ENTER_PACKAGE in H5O__chunk_update_idx() + with FUNC_ENTER_PACKAGE_TAG(oh->cache_info.addr) to set up the metadata tag. + + (VC - 2019/08/23, HDFFV-10873) + - Fixed the test failure from test_metadata_read_retry_info() in test/swmr.c diff --git a/src/H5Ochunk.c b/src/H5Ochunk.c index 205515a..ccaf46c 100644 --- a/src/H5Ochunk.c +++ b/src/H5Ochunk.c @@ -335,7 +335,7 @@ H5O__chunk_update_idx(H5F_t *f, H5O_t *oh, unsigned idx) H5O_chk_cache_ud_t chk_udata; /* User data for loading chunk */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_PACKAGE + FUNC_ENTER_PACKAGE_TAG(oh->cache_info.addr) /* check args */ HDassert(f); -- cgit v0.12