diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2016-01-18 15:58:48 -0500 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2016-01-18 15:58:48 -0500 |
| commit | f521ef6a52b4559bac0b82fb8e24ffc63dbdfe56 (patch) | |
| tree | 0341fd118999568dd4149fcbdfc576f002c0eba1 /src/meta | |
| parent | 17d695bc1696d3b601ead6d55d68ee945849b612 (diff) | |
| download | mongo-f521ef6a52b4559bac0b82fb8e24ffc63dbdfe56.tar.gz | |
WT-1801: Add a directory sync after rollback of a WT_SESSION::rename operation
Rename the sync-and-XXX functions so they're consistent, for clarity.
Diffstat (limited to 'src/meta')
| -rw-r--r-- | src/meta/meta_track.c | 2 | ||||
| -rw-r--r-- | src/meta/meta_turtle.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/meta/meta_track.c b/src/meta/meta_track.c index ffe5477adb7..1baab2deae1 100644 --- a/src/meta/meta_track.c +++ b/src/meta/meta_track.c @@ -189,7 +189,7 @@ __meta_track_unroll(WT_SESSION_IMPL *session, WT_META_TRACK *trk) * For removes, b is NULL. */ if (trk->a != NULL && trk->b != NULL && - (ret = __wt_rename_and_sync(session, + (ret = __wt_rename_and_sync_directory(session, trk->b + strlen("file:"), trk->a + strlen("file:"))) != 0) __wt_err(session, ret, "metadata unroll rename %s to %s", trk->b, trk->a); diff --git a/src/meta/meta_turtle.c b/src/meta/meta_turtle.c index 6933e5adb08..73bab9c0cfa 100644 --- a/src/meta/meta_turtle.c +++ b/src/meta/meta_turtle.c @@ -296,7 +296,7 @@ __wt_turtle_update(WT_SESSION_IMPL *session, const char *key, const char *value) WT_ERR(__wt_write(session, fh, 0, buf->size, buf->data)); /* Flush the handle and rename the file into place. */ - ret = __wt_sync_and_rename_fh( + ret = __wt_fh_sync_and_rename( session, &fh, WT_METADATA_TURTLE_SET, WT_METADATA_TURTLE); /* Close any file handle left open, remove any temporary file. */ |