firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 00:03:03 +01:00
Code Issues

Backported fix for CORE-2316: Throttling Nbackup on large databases

Browse Source
This commit is contained in:
alexpeshkoff 2009-03-06 18:17:44 +00:00
parent 0888aa8da4
commit cdd4323c7d
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.in
View File

@ -684,7 +684,7 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
AC_CHECK_FUNCS(sem_timedwait) AC_CHECK_FUNCS(sem_timedwait)
AC_CHECK_FUNCS(sem_init) AC_CHECK_FUNCS(sem_init)
if test "$ac_cv_func_sem_init" = "yes"; then if test "$ac_cv_func_sem_init" = "yes"; then
AC_MSG_CHECKING(for working sem_int()) AC_MSG_CHECKING(for working sem_init())
AC_TRY_RUN([#include <semaphore.h> AC_TRY_RUN([#include <semaphore.h>
main () { main () {
sem_t s; sem_t s;
@ -698,6 +698,7 @@ fi
CFLAGS="$savedFlags" CFLAGS="$savedFlags"
fi fi
AC_CHECK_FUNCS(semtimedop) AC_CHECK_FUNCS(semtimedop)
AC_CHECK_FUNCS(posix_fadvise)
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_C_BIGENDIAN AC_C_BIGENDIAN

14
src/utilities/nbackup.cpp
View File

@ -329,10 +329,16 @@ void nbackup::open_database_scan()
if (dbase == INVALID_HANDLE_VALUE) if (dbase == INVALID_HANDLE_VALUE)
b_error::raise("Error (%d) opening database file: %s", GetLastError(), dbname.c_str()); b_error::raise("Error (%d) opening database file: %s", GetLastError(), dbname.c_str());
#else #else
dbase = open(dbname.c_str(), O_RDONLY | O_LARGEFILE); dbase = open(dbname.c_str(), O_RDONLY | O_LARGEFILE | O_NOATIME | O_DIRECT);
if (dbase < 0) if (dbase < 0)
b_error::raise("Error (%d) opening database file: %s", errno, dbname.c_str()); b_error::raise("Error (%d) opening database file: %s", errno, dbname.c_str());
#endif #ifdef HAVE_POSIX_FADVISE
if (posix_fadvise(dbase, 0, 0, POSIX_FADV_SEQUENTIAL) < 0)
b_error::raise(uSvc, "Error (%d) in posix_fadvise(SEQUENTIAL) for %s", errno, dbname.c_str());
if (posix_fadvise(dbase, 0, 0, POSIX_FADV_NOREUSE) < 0)
b_error::raise(uSvc, "Error (%d) in posix_fadvise(NOREUSE) for %s", errno, dbname.c_str());
#endif //HAVE_POSIX_FADVISE
#endif //WIN_NT
} }
void nbackup::create_database() void nbackup::create_database()