diff options
| author | unknown <heikki@donna.mysql.fi> | 2001-05-23 20:19:56 +0300 |
|---|---|---|
| committer | unknown <heikki@donna.mysql.fi> | 2001-05-23 20:19:56 +0300 |
| commit | d02aaab42602445a16d81afb8e6ffa5031fd781c (patch) | |
| tree | 541a40a3debd24beff7330e77e9db0b7e59b2f2b /innobase/os | |
| parent | f68e5ce76a9e14b629dfcfb2290bc03ea63f1aac (diff) | |
| download | mariadb-git-d02aaab42602445a16d81afb8e6ffa5031fd781c.tar.gz | |
log0log.c InnoDB now allows parameter innodb_unix_file_flush_method
os0file.c InnoDB now allows parameter innodb_unix_file_flush_method
srv0start.c InnoDB now allows parameter innodb_unix_file_flush_method
innobase/srv/srv0start.c:
InnoDB now allows parameter innodb_unix_file_flush_method
innobase/os/os0file.c:
InnoDB now allows parameter innodb_unix_file_flush_method
innobase/log/log0log.c:
InnoDB now allows parameter innodb_unix_file_flush_method
Diffstat (limited to 'innobase/os')
| -rw-r--r-- | innobase/os/os0file.c | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 7a6edd5a7c1..fa0c266a82a 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -9,6 +9,7 @@ Created 10/21/1995 Heikki Tuuri #include "os0file.h" #include "os0sync.h" #include "ut0mem.h" +#include "srv0srv.h" #ifdef POSIX_ASYNC_IO @@ -345,12 +346,11 @@ try_again: UT_NOT_USED(purpose); - /* On Linux opening a file in the O_SYNC mode seems to be much - more efficient for small writes than calling an explicit fsync or - fdatasync after each write, but on Solaris O_SYNC and O_DSYNC is - extremely slow in large block writes to a big file. Therefore we - do not use these options, but use explicit fdatasync. */ - +#ifdef O_DSYNC + if (srv_unix_file_flush_method == SRV_UNIX_O_DSYNC) { + create_flag = create_flag | O_DSYNC; + } +#endif if (create_mode == OS_FILE_CREATE) { file = open(name, create_flag, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); @@ -546,6 +546,12 @@ os_file_flush( return(FALSE); #else int ret; + +#ifdef O_DSYNC + if (srv_unix_file_flush_method == SRV_UNIX_O_DSYNC) { + return(TRUE); + } +#endif #ifdef HAVE_FDATASYNC ret = fdatasync(file); @@ -621,10 +627,15 @@ os_file_pwrite( #ifdef HAVE_PWRITE ret = pwrite(file, buf, n, offs); - /* Always do fsync to reduce the probability that when the OS crashes, - a database page is only partially physically written to disk. */ + if (srv_unix_file_flush_method != SRV_UNIX_LITTLESYNC + && srv_unix_file_flush_method != SRV_UNIX_NOSYNC) { - ut_a(TRUE == os_file_flush(file)); + /* Always do fsync to reduce the probability that when + the OS crashes, a database page is only partially + physically written to disk. */ + + ut_a(TRUE == os_file_flush(file)); + } return(ret); #else @@ -645,10 +656,15 @@ os_file_pwrite( ret = write(file, buf, n); - /* Always do fsync to reduce the probability that when the OS crashes, - a database page is only partially physically written to disk. */ + if (srv_unix_file_flush_method != SRV_UNIX_LITTLESYNC + && srv_unix_file_flush_method != SRV_UNIX_NOSYNC) { - ut_a(TRUE == os_file_flush(file)); + /* Always do fsync to reduce the probability that when + the OS crashes, a database page is only partially + physically written to disk. */ + + ut_a(TRUE == os_file_flush(file)); + } os_mutex_exit(os_file_seek_mutexes[i]); |