diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2016-04-04 13:29:36 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2016-04-04 13:29:36 +1000 |
| commit | 1d340e2ce9d3f06adb64fe82cf610cc09e610c5f (patch) | |
| tree | 10acef3f48e66f41f5a2a324aa6a26e3cd4e5dff | |
| parent | 64cb9c809a525573535badd280dfd5c13d2ba6a9 (diff) | |
| parent | a7c59bddf2de5e58ad6f53a07fe6cec14a448d41 (diff) | |
| download | mongo-1d340e2ce9d3f06adb64fe82cf610cc09e610c5f.tar.gz | |
Merge pull request #2628 from wiredtiger/wt-2529-fsync_readonly
WT-2529 Be less aggressive asserting in readonly connections
| -rw-r--r-- | src/include/misc.i | 2 | ||||
| -rw-r--r-- | src/os_posix/os_fs.c | 2 | ||||
| -rw-r--r-- | src/os_win/os_fs.c | 2 | ||||
| -rwxr-xr-x | test/readonly/smoke.sh | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/include/misc.i b/src/include/misc.i index a96ce405c89..114b711ac88 100644 --- a/src/include/misc.i +++ b/src/include/misc.i @@ -273,8 +273,6 @@ __wt_filesize(WT_SESSION_IMPL *session, WT_FH *fh, wt_off_t *sizep) static inline int __wt_fsync(WT_SESSION_IMPL *session, WT_FH *fh, bool block) { - WT_ASSERT(session, !F_ISSET(S2C(session), WT_CONN_READONLY)); - WT_RET(__wt_verbose( session, WT_VERB_HANDLEOPS, "%s: handle-sync", fh->name)); diff --git a/src/os_posix/os_fs.c b/src/os_posix/os_fs.c index 7d3049f6c2d..86aa8db8f4f 100644 --- a/src/os_posix/os_fs.c +++ b/src/os_posix/os_fs.c @@ -18,6 +18,8 @@ __posix_sync(WT_SESSION_IMPL *session, { WT_DECL_RET; + WT_ASSERT(session, !F_ISSET(S2C(session), WT_CONN_READONLY)); + #ifdef HAVE_SYNC_FILE_RANGE if (!block) { WT_SYSCALL_RETRY(sync_file_range(fd, diff --git a/src/os_win/os_fs.c b/src/os_win/os_fs.c index 7f2c797dbe4..462773cb9fb 100644 --- a/src/os_win/os_fs.c +++ b/src/os_win/os_fs.c @@ -395,6 +395,8 @@ __win_handle_sync(WT_SESSION_IMPL *session, WT_FH *fh, bool block) { WT_DECL_RET; + WT_ASSERT(session, !F_ISSET(S2C(session), WT_CONN_READONLY)); + /* * We don't open Windows system handles when opening directories * for flushing, as it is not necessary (or possible) to flush diff --git a/test/readonly/smoke.sh b/test/readonly/smoke.sh index 740deb5743a..8dba513e7af 100755 --- a/test/readonly/smoke.sh +++ b/test/readonly/smoke.sh @@ -1,6 +1,6 @@ #!/bin/sh -trap 'chmod -R u+w WT_*; exit 0' 0 1 2 3 13 15 +trap 'chmod -R u+w WT_*' 0 1 2 3 13 15 set -e |