Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix recovery tests on MacOS (#6610)

This commit is contained in:
Simon 2018-09-27 18:52:28 +02:00 committed by Jan
parent 805a1c5d51
commit 25f5c841b9
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Basics/files.cpp
View File

@ -1161,7 +1161,6 @@ int TRI_VerifyLockFile(char const* filename) {
LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "found existing lockfile '" << filename << "' of previous process with pid " << pid << ", and that process seems to be still running"; LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "found existing lockfile '" << filename << "' of previous process with pid " << pid << ", and that process seems to be still running";
} }
#ifdef TRI_HAVE_SETLK
struct flock lock; struct flock lock;
lock.l_start = 0; lock.l_start = 0;
@ -1196,7 +1195,6 @@ int TRI_VerifyLockFile(char const* filename) {
<< "' failed: " << TRI_last_error() << "' failed: " << TRI_last_error()
<< ". a possible reason is that the filesystem does not support file-locking"; << ". a possible reason is that the filesystem does not support file-locking";
} }
#endif
return TRI_ERROR_ARANGO_DATADIR_LOCKED; return TRI_ERROR_ARANGO_DATADIR_LOCKED;
} }

1
lib/Basics/operating-system.h
View File

@ -602,7 +602,6 @@
#define TRI_HAVE_POSIX_PWD_GRP 1 #define TRI_HAVE_POSIX_PWD_GRP 1
#define TRI_HAVE_POSIX_THREADS 1 #define TRI_HAVE_POSIX_THREADS 1
#define TRI_HAVE_SC_PHYS_PAGES 1 #define TRI_HAVE_SC_PHYS_PAGES 1
#define TRI_HAVE_SETLK 1
#define TRI_HAVE_ANONYMOUS_MMAP 1 #define TRI_HAVE_ANONYMOUS_MMAP 1

2
scripts/disable-cores.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
ulimit -c 0 ulimit -c 0
$@ || true "$@" || true