diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2017-04-10 16:08:47 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2017-04-10 16:08:47 (GMT) |
| commit | deaec79e06806d404e15abdf8c5449b28d465cb7 (patch) | |
| tree | 67c7cf93f57256f1b605cc1fb9e5d1c5fdae655e /src/H5VLdaosm.c | |
| parent | 3943452ff3cc26938fd69c1d75380bb7d0edb8ef (diff) | |
| download | hdf5-deaec79e06806d404e15abdf8c5449b28d465cb7.zip hdf5-deaec79e06806d404e15abdf8c5449b28d465cb7.tar.gz hdf5-deaec79e06806d404e15abdf8c5449b28d465cb7.tar.bz2 | |
Update H5VL_daosm_file_flush to reflect "auto slip" behaviour of daos_epoch_commit. No functional code changes since the previous code was commented out due to snapshots not being implemented in daos.
Diffstat (limited to 'src/H5VLdaosm.c')
| -rw-r--r-- | src/H5VLdaosm.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/H5VLdaosm.c b/src/H5VLdaosm.c index c1a1108..0d62bc1 100644 --- a/src/H5VLdaosm.c +++ b/src/H5VLdaosm.c @@ -1475,10 +1475,6 @@ H5VL_daosm_file_flush(H5VL_daosm_file_t *file) /* Commit the epoch */ if(file->my_rank == 0) { - /* Commit the epoch */ - if(0 != (ret = daos_epoch_commit(file->coh, file->epoch, NULL /*state*/, NULL /*event*/))) - HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "failed to commit epoch: %d", ret) - /* Save a snapshot of this epoch if requested */ /* Disabled until snapshots are supported in DAOS DSMINC */ #if 0 @@ -1487,13 +1483,9 @@ H5VL_daosm_file_flush(H5VL_daosm_file_t *file) HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, FAIL, "can't create snapshot: %d", ret) #endif - /* Slip the epoch, indicating we don't need to reference - * anything prior */ - /* Disabled until snapshots are supported in DAOS DSMINC */ -#if 0 - if(0 != (ret = daos_epoch_slip(file->coh, file->epoch, NULL /*state*/, NULL /*event*/))) - HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "failed to slip epoch: %d", ret) -#endif + /* Commit the epoch. This should slip previous epochs automatically. */ + if(0 != (ret = daos_epoch_commit(file->coh, file->epoch, NULL /*state*/, NULL /*event*/))) + HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "failed to commit epoch: %d", ret) } /* end if */ /* Advance the epoch */ |