This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Tarantool -- an efficient key/value data store".
The branch master has been updated
via 77105d2d551573cb4959f32b2a8b855c96b4be4a (commit)
via 8ead3c5e5b2b3ed2b890cd5d66d71109e6ebe8cd (commit)
via 913a27df18a92eb898f6ada77a26c3de2f971abf (commit)
via 25f75ec510400cfcd80924f2678b3be1d6b3997f (commit)
via e0e9eb0a546aa7db983129c6e6a971b6095a160a (commit)
via a6c1f381f0254705bd12c2e42ab90dbcf0827982 (commit)
from 65df38a97580cefa9a2d6a97ebbc6dc894096121 (commit)
Summary of changes:
CMakeLists.txt | 10 +++-
core/CMakeLists.txt | 8 ++-
core/log_io.c | 7 ++-
core/tarantool.c | 64 +++++++++++++++--------
core/util.c | 4 ++
include/config.h.cmake | 4 ++
include/log_io.h | 2 +-
include/tarantool.h | 2 +-
test/box/args.result | 15 ++++++
test/box/args.test | 28 ++++++++++
test/box/{tarantool_good.cfg => bug726778.cfg} | 11 ++++-
test/box/show.result | 2 +-
test/box/tarantool.cfg | 5 ++-
test/box/tarantool_bad2.cfg | 2 +-
test/box/tarantool_bad3.cfg | 2 +-
test/box/tarantool_bad4.cfg | 2 +-
test/box/tarantool_bad5.cfg | 2 +-
test/box/tarantool_good.cfg | 2 +-
18 files changed, 135 insertions(+), 37 deletions(-)
copy test/box/{tarantool_good.cfg => bug726778.cfg} (65%)
commit 77105d2d551573cb4959f32b2a8b855c96b4be4a
Author: Konstantin Osipov <[email protected]>
Date: Tue Mar 1 16:53:03 2011 +0300
Adjust tests after merge from master-stable.
diff --git a/test/box/args.result b/test/box/args.result
index 91937f0..d2b3578 100644
--- a/test/box/args.result
+++ b/test/box/args.result
@@ -74,9 +74,9 @@ tarantool_box -V
# Verify that this is not the case, and snap_dir and xlog_dir
# can be relative to work_dir.
-tarantool_silverbox --config=bug726778.cfg --init-storage
-tarantool_silverbox: namespace 0 successfully configured
-tarantool_silverbox: creating `snapshots/00000000000000000001.snap.inprogress'
-tarantool_silverbox: saving snapshot `snapshots/00000000000000000001.snap'
-tarantool_silverbox: done
+tarantool_box --config=bug726778.cfg --init-storage
+tarantool_box: namespace 0 successfully configured
+tarantool_box: creating `snapshots/00000000000000000001.snap.inprogress'
+tarantool_box: saving snapshot `snapshots/00000000000000000001.snap'
+tarantool_box: done
commit 8ead3c5e5b2b3ed2b890cd5d66d71109e6ebe8cd
Merge: 65df38a 913a27d
Author: Konstantin Osipov <[email protected]>
Date: Tue Mar 1 16:52:14 2011 +0300
Merge branch 'master-stable'
diff --cc core/util.c
index 679ea8c,9e53cab..8184fb4
--- a/core/util.c
+++ b/core/util.c
@@@ -39,9 -39,13 +39,13 @@@
#include <bfd.h>
#endif /* HAVE_BFD */
-#include <util.h>
#include <fiber.h>
+#include "say.h"
+ #ifndef HAVE_LIBC_STACK_END
+ void *__libc_stack_end;
+ #endif
+
void
close_all_xcpt(int fdc, ...)
{
diff --cc test/box/args.result
index 7320ce6,70ecd41..91937f0
--- a/test/box/args.result
+++ b/test/box/args.result
@@@ -38,30 -38,45 +38,45 @@@ Usage: tarantool_box [OPTIONS
Please visit project home page at http://launchpad.net/tarantool
to see online documentation, submit bugs or contribute a patch.
-tarantool_silverbox -Z
-tarantool_silverbox: -Z: unknown option
+tarantool_box -Z
+tarantool_box: -Z: unknown option
-tarantool_silverbox --no-such-option
-tarantool_silverbox: --no-such-option: unknown option
+tarantool_box --no-such-option
+tarantool_box: --no-such-option: unknown option
-tarantool_silverbox --version --no-such-option
-tarantool_silverbox: --no-such-option: unknown option
+tarantool_box --version --no-such-option
+tarantool_box: --no-such-option: unknown option
-tarantool_silverbox --config
-tarantool_silverbox: --config: option requires an option argument
+tarantool_box --config
+tarantool_box: --config: option requires an option argument
-tarantool_silverbox -c
-tarantool_silverbox: -c: option requires an option argument
+tarantool_box -c
+tarantool_box: -c: option requires an option argument
-tarantool_silverbox --config tarantool.cfg
-tarantool_silverbox: the daemon is already running
+tarantool_box --config tarantool.cfg
+tarantool_box: the daemon is already running
-tarantool_silverbox --daemonize
-tarantool_silverbox: the daemon is already running
+tarantool_box --daemonize
+tarantool_box: the daemon is already running
-tarantool_silverbox --version
+tarantool_box --version
1.minor.patch-<rev>-<commit>
-tarantool_silverbox -V
+tarantool_box -V
1.minor.patch-<rev>-<commit>
+ #
+ # A test case for Bug#726778 "Gopt broke wal_dir and snap_dir: they are no
+ # longer relative to work_dir".
+ # https://bugs.launchpad.net/tarantool/+bug/726778
+ # After addition of gopt(), we started to chdir() to the working
+ # directory after option parsing.
+ # Verify that this is not the case, and snap_dir and xlog_dir
+ # can be relative to work_dir.
+
+ tarantool_silverbox --config=bug726778.cfg --init-storage
+ tarantool_silverbox: namespace 0 successfully configured
+ tarantool_silverbox: creating `snapshots/00000000000000000001.snap.inprogress'
+ tarantool_silverbox: saving snapshot `snapshots/00000000000000000001.snap'
+ tarantool_silverbox: done
+
commit 913a27df18a92eb898f6ada77a26c3de2f971abf
Merge: e0e9eb0 25f75ec
Author: Konstantin Osipov <[email protected]>
Date: Tue Mar 1 16:50:35 2011 +0300
Merge branch 'master-stable' of farm.corp.mail.ru:tarantool into
master-stable
commit 25f75ec510400cfcd80924f2678b3be1d6b3997f
Author: Roman Tokarev <[email protected]>
Date: Tue Mar 1 12:51:48 2011 +0300
Fixes to compile on FreeBSD.
- Replace strndrupa with alloca + memcpy.
- In create_pid function do rewind before read from pid file.
diff --git a/core/log_io.c b/core/log_io.c
index b4f4f97..f41080d 100644
--- a/core/log_io.c
+++ b/core/log_io.c
@@ -576,7 +576,9 @@ inprogress_log_rename(char *filename)
assert(strcmp(suffix, inprogress_suffix) == 0);
/* Create a new filename without '.inprogress' suffix. */
- new_filename = strndupa(filename, suffix - filename);
+ new_filename = alloca(suffix - filename + 1);
+ memcpy(new_filename, filename, suffix - filename);
+ new_filename[suffix - filename] = '\0';
if (rename(filename, new_filename) != 0) {
say_syserror("can't rename %s to %s", filename, new_filename);
diff --git a/core/tarantool.c b/core/tarantool.c
index 67c74a2..2ed0c9f 100644
--- a/core/tarantool.c
+++ b/core/tarantool.c
@@ -267,6 +267,13 @@ create_pid(void)
f = fopen(cfg.pid_file, "a+");
if (f == NULL)
panic_syserror("can't open pid file");
+ /*
+ * fopen() is not guaranteed to set the seek position to
+ * the beginning of file according to ANSI C (and, e.g.,
+ * on FreeBSD.
+ */
+ if (fseeko(f, 0, SEEK_SET) != 0)
+ panic_syserror("can't fseek to the beginning of pid file");
if (fgets(buf, sizeof(buf), f) != NULL && strlen(buf) > 0) {
pid = strtol(buf, NULL, 10);
@@ -274,7 +281,8 @@ create_pid(void)
panic("the daemon is already running");
else
say_info("updating a stale pid file");
- fseeko(f, 0, SEEK_SET);
+ if (fseeko(f, 0, SEEK_SET) != 0)
+ panic_syserror("can't fseek to the beginning of pid
file");
if (ftruncate(fileno(f), 0) == -1)
panic_syserror("ftruncate(`%s')", cfg.pid_file);
}
commit e0e9eb0a546aa7db983129c6e6a971b6095a160a
Author: Konstantin Osipov <[email protected]>
Date: Tue Mar 1 00:20:20 2011 +0300
A fix and a test case for Bug#726778
A fix and a test case for Bug#726778 "Gopt broke wal_dir and
snap_dir: they are no longer relative to work_dir".
Ensure that snap_dir and xlog_dir can be relative to
work_dir.
Ensure that chdir happens before we handle --init-storage.
Do not mix declarations and definitions for recovery_state.
Add a test case to args.test.
diff --git a/core/tarantool.c b/core/tarantool.c
index 67c74a2..0e6e4ca 100644
--- a/core/tarantool.c
+++ b/core/tarantool.c
@@ -62,6 +62,7 @@ char *cfg_filename_fullpath = NULL;
struct tbuf *cfg_out = NULL;
char *binary_filename;
struct tarantool_cfg cfg;
+struct recovery_state *recovery_state;
bool init_storage, booting = true;
@@ -416,27 +417,6 @@ main(int argc, char **argv)
panic("can't load config:"
"%.*s", cfg_out->len, (char *)cfg_out->data);
-#ifdef STORAGE
- if (gopt_arg(opt, 'C', &cat_filename)) {
- initialize_minimal();
- if (access(cat_filename, R_OK) == -1) {
- say_syserror("access(\"%s\")", cat_filename);
- exit(EX_OSFILE);
- }
- return mod_cat(cat_filename);
- }
-
- if (gopt(opt, 'I')) {
- init_storage = true;
- initialize_minimal();
- mod_init();
- next_lsn(recovery_state, 1);
- confirm_lsn(recovery_state, 1);
- snapshot_save(recovery_state, mod_snapshot);
- exit(EXIT_SUCCESS);
- }
-#endif
-
if (gopt_arg(opt, 'g', &cfg_paramname)) {
tarantool_cfg_iterator_t *i;
char *key, *value;
@@ -494,6 +474,27 @@ main(int argc, char **argv)
#endif
}
+#ifdef STORAGE
+ if (gopt_arg(opt, 'C', &cat_filename)) {
+ initialize_minimal();
+ if (access(cat_filename, R_OK) == -1) {
+ say_syserror("access(\"%s\")", cat_filename);
+ exit(EX_OSFILE);
+ }
+ return mod_cat(cat_filename);
+ }
+
+ if (gopt(opt, 'I')) {
+ init_storage = true;
+ initialize_minimal();
+ mod_init();
+ next_lsn(recovery_state, 1);
+ confirm_lsn(recovery_state, 1);
+ snapshot_save(recovery_state, mod_snapshot);
+ exit(EXIT_SUCCESS);
+ }
+#endif
+
if (gopt(opt, 'D'))
daemonize(1, 1);
diff --git a/include/log_io.h b/include/log_io.h
index 64fe367..1280967 100644
--- a/include/log_io.h
+++ b/include/log_io.h
@@ -96,7 +96,7 @@ struct recovery_state {
bool finalize;
- /* pointer to user supplied custom data */
+ /* Points to module-specific state */
void *data;
};
diff --git a/include/tarantool.h b/include/tarantool.h
index 78b80b8..2e8d409 100644
--- a/include/tarantool.h
+++ b/include/tarantool.h
@@ -31,7 +31,7 @@
#include <util.h>
#include <log_io.h>
-struct recovery_state *recovery_state;
+extern struct recovery_state *recovery_state;
void mod_init(void);
struct tarantool_cfg;
i32 mod_check_config(struct tarantool_cfg *conf);
diff --git a/test/box/args.result b/test/box/args.result
index 68b984b..70ecd41 100644
--- a/test/box/args.result
+++ b/test/box/args.result
@@ -65,3 +65,18 @@ tarantool_silverbox --version
tarantool_silverbox -V
1.minor.patch-<rev>-<commit>
+#
+# A test case for Bug#726778 "Gopt broke wal_dir and snap_dir: they are no
+# longer relative to work_dir".
+# https://bugs.launchpad.net/tarantool/+bug/726778
+# After addition of gopt(), we started to chdir() to the working
+# directory after option parsing.
+# Verify that this is not the case, and snap_dir and xlog_dir
+# can be relative to work_dir.
+
+tarantool_silverbox --config=bug726778.cfg --init-storage
+tarantool_silverbox: namespace 0 successfully configured
+tarantool_silverbox: creating `snapshots/00000000000000000001.snap.inprogress'
+tarantool_silverbox: saving snapshot `snapshots/00000000000000000001.snap'
+tarantool_silverbox: done
+
diff --git a/test/box/args.test b/test/box/args.test
index fa25958..5648a87 100644
--- a/test/box/args.test
+++ b/test/box/args.test
@@ -13,3 +13,31 @@ sys.stdout.push_filter("(\d)\.\d\.\d(-\d+-\w+)?",
"\\1.minor.patch-<rev>-<commit
server.test_option("--version")
server.test_option("-V ")
sys.stdout.pop_filter()
+
+print """#
+# A test case for Bug#726778 "Gopt broke wal_dir and snap_dir: they are no
+# longer relative to work_dir".
+# https://bugs.launchpad.net/tarantool/+bug/726778
+# After addition of gopt(), we started to chdir() to the working
+# directory after option parsing.
+# Verify that this is not the case, and snap_dir and xlog_dir
+# can be relative to work_dir.
+"""
+import shutil
+shutil.rmtree(os.path.join(vardir, "bug726778"), True)
+cfg = os.path.join(vardir, "bug726778.cfg")
+os.mkdir(os.path.join(vardir, "bug726778"))
+os.mkdir(os.path.join(vardir, "bug726778/snapshots"))
+os.mkdir(os.path.join(vardir, "bug726778/xlogs"))
+
+os.symlink(os.path.abspath("box/bug726778.cfg"), cfg)
+
+sys.stdout.push_filter("(/\S+)+/tarantool", "tarantool")
+server.test_option("--config=bug726778.cfg --init-storage")
+sys.stdout.pop_filter()
+
+os.unlink(cfg)
+shutil.rmtree(os.path.join(vardir, "bug726778"))
+
+# Args filter cleanup
+# vim: syntax=python
diff --git a/test/box/bug726778.cfg b/test/box/bug726778.cfg
new file mode 100644
index 0000000..449c398
--- /dev/null
+++ b/test/box/bug726778.cfg
@@ -0,0 +1,27 @@
+#
+# Used in args.test
+#
+slab_alloc_arena = 0.1
+
+pid_file = "box.pid"
+
+work_dir = "bug726778"
+snap_dir = "snapshots"
+wal_dir = "xlogs"
+
+# Use -a not -a to work correctly on FreeBSD
+#
+logger="tee -a tarantool.log"
+
+primary_port = 33013
+secondary_port = 33014
+admin_port = 33015
+
+rows_per_wal = 50
+
+namespace[0].enabled = 1
+namespace[0].index[0].type = "HASH"
+namespace[0].index[0].unique = 1
+namespace[0].index[0].key_field[0].fieldno = 0
+namespace[0].index[0].key_field[0].type = "NUM"
+
commit a6c1f381f0254705bd12c2e42ab90dbcf0827982
Author: Konstantin Osipov <[email protected]>
Date: Mon Feb 28 17:46:37 2011 +0300
Some initial fixed to compile on FreeBSD.
Implement a number of simple fixes to compile on FreeBSD:
- work correctly with a GCC version that doesn't have
-Wno-unused-result
- compile even if not GNU libc
- tee doesn't have '--append' option on FreeBSD, use
the short version ('-a').
- fix a typo in log_io.c, ENOENT, not ENONET.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1991e2..c757d3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6)
project(tarantool)
include(CheckLibraryExists)
include(CheckIncludeFile)
+include(CheckCCompilerFlag)
find_program(ECHO echo)
find_program(CAT cat)
find_program(GIT git)
@@ -44,6 +45,12 @@ else()
endif()
#
+# Some versions of GNU libc define non-portable __libc_stack_end
+# which we use to determine the end (or beginning, actually) of
+# stack. Find whether or not it's present.
+check_library_exists("" __libc_stack_end "" HAVE_LIBC_STACK_END)
+
+#
# Tarantool uses 'coro' (coroutines) library # to implement
# cooperative multi-tasking. Since coro.h is included
# universally, define the underlying implementation switch
@@ -140,6 +147,7 @@ with gcc. If GNU binutils and binutils-dev libraries are
installed, backtrace
is output with resolved function (symbol) names. Otherwise only frame
addresses are printed." ${CMAKE_COMPILER_IS_GNUCC})
+set (HAVE_BFD False)
if (ENABLE_BACKTRACE)
if (NOT ${CMAKE_COMPILER_IS_GNUCC} OR
NOT (${CMAKE_SYSTEM_PROCESSOR} MATCHES "86"))
@@ -151,7 +159,7 @@ if (ENABLE_BACKTRACE)
check_library_exists (bfd bfd_init "" HAVE_BFD_LIB)
check_include_file(bfd.h HAVE_BFD_H)
if (HAVE_BFD_LIB AND HAVE_BFD_H)
- set (HAVE_BFD 1)
+ set (HAVE_BFD True)
message (STATUS "Found GNU bfd headers and libs, enabling symbol ")
message (STATUS "resolve in backtraces.")
elseif (NOT HAVE_BFD_LIB)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 7d0ef61..391c018 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -3,8 +3,12 @@
#
add_library(ev tarantool_ev.c)
-set_source_files_properties(tarantool_ev.c
- PROPERTIES COMPILE_FLAGS "-Wno-unused-result")
+check_c_compiler_flag ("-Wno-unused-result" gcc_has_wno_unused_result)
+
+if (gcc_has_wno_unused_result)
+ set_source_files_properties(tarantool_ev.c
+ PROPERTIES COMPILE_FLAGS "-Wno-unused-result")
+endif()
if (TARGET_OS_LINUX)
#
diff --git a/core/log_io.c b/core/log_io.c
index 6c5df8e..b4f4f97 100644
--- a/core/log_io.c
+++ b/core/log_io.c
@@ -596,7 +596,8 @@ inprogress_log_unlink(char *filename)
assert(strcmp(suffix, inprogress_suffix) == 0);
#endif
if (unlink(filename) != 0) {
- if (errno == ENONET)
+ /* Don't panic if there is no such file. */
+ if (errno == ENOENT)
return 0;
say_syserror("can't unlink %s", filename);
diff --git a/core/tarantool.c b/core/tarantool.c
index 6964498..67c74a2 100644
--- a/core/tarantool.c
+++ b/core/tarantool.c
@@ -313,6 +313,17 @@ main(int argc, char **argv)
#endif
const char *cfg_paramname = NULL;
+#ifndef HAVE_LIBC_STACK_END
+/*
+ * GNU libc provides a way to get at the top of the stack. This
+ * is, of course, not standard and doesn't work on non-GNU
+ * systems, such as FreeBSD. But as far as we're concerned, argv
+ * is at the top of the main thread's stack, so save the address
+ * of it.
+ */
+ __libc_stack_end = (void*) &argv;
+#endif
+
master_pid = getpid();
stat_init();
palloc_init();
diff --git a/core/util.c b/core/util.c
index d38f883..9e53cab 100644
--- a/core/util.c
+++ b/core/util.c
@@ -42,6 +42,10 @@
#include <util.h>
#include <fiber.h>
+#ifndef HAVE_LIBC_STACK_END
+void *__libc_stack_end;
+#endif
+
void
close_all_xcpt(int fdc, ...)
{
diff --git a/include/config.h.cmake b/include/config.h.cmake
index cadf475..e8cad3c 100644
--- a/include/config.h.cmake
+++ b/include/config.h.cmake
@@ -32,6 +32,10 @@
*/
#cmakedefine HAVE_BFD 1
/*
+ * Set if this is a GNU system and libc has __libc_stack_end.
+ */
+#cmakedefine HAVE_LIBC_STACK_END 1
+/*
* vim: syntax=c
*/
#endif /* TARANTOOL_CONFIG_H_INCLUDED */
diff --git a/test/box/show.result b/test/box/show.result
index 0811fbe..53f2d43 100644
--- a/test/box/show.result
+++ b/test/box/show.result
@@ -35,7 +35,7 @@ configuration:
slab_alloc_factor: "2"
work_dir: (null)
pid_file: "box.pid"
- logger: "tee --append tarantool.log"
+ logger: "tee -a tarantool.log"
logger_nonblock: "1"
io_collect_interval: "0"
backlog: "1024"
diff --git a/test/box/tarantool.cfg b/test/box/tarantool.cfg
index d7cd0fe..6743880 100644
--- a/test/box/tarantool.cfg
+++ b/test/box/tarantool.cfg
@@ -2,7 +2,10 @@ slab_alloc_arena = 0.1
pid_file = "box.pid"
-logger="tee --append tarantool.log"
+
+# Use -a not -a to work correctly on FreeBSD
+#
+logger="tee -a tarantool.log"
primary_port = 33013
secondary_port = 33014
diff --git a/test/box/tarantool_bad2.cfg b/test/box/tarantool_bad2.cfg
index 0d03bfd..699a08b 100644
--- a/test/box/tarantool_bad2.cfg
+++ b/test/box/tarantool_bad2.cfg
@@ -2,7 +2,7 @@ slab_alloc_arena = 0.1
pid_file = "box.pid"
-logger="tee --append tarantool.log"
+logger="tee -a tarantool.log"
#primary_port = 33013
secondary_port = 33014
diff --git a/test/box/tarantool_bad3.cfg b/test/box/tarantool_bad3.cfg
index 8c1d14c..934acbe 100644
--- a/test/box/tarantool_bad3.cfg
+++ b/test/box/tarantool_bad3.cfg
@@ -2,7 +2,7 @@ slab_alloc_arena = 0.1
pid_file = "box.pid"
-logger="tee --append tarantool.log"
+logger="tee -a tarantool.log"
primary_port = 33013
secondary_port = 33014
diff --git a/test/box/tarantool_bad4.cfg b/test/box/tarantool_bad4.cfg
index 67b9c89..305de0e 100644
--- a/test/box/tarantool_bad4.cfg
+++ b/test/box/tarantool_bad4.cfg
@@ -2,7 +2,7 @@ slab_alloc_arena = 0.1
pid_file = "box.pid"
-logger="tee --append tarantool.log"
+logger="tee -a tarantool.log"
primary_port = 33013
secondary_port = 33014
diff --git a/test/box/tarantool_bad5.cfg b/test/box/tarantool_bad5.cfg
index 1390839..7854bd4 100644
--- a/test/box/tarantool_bad5.cfg
+++ b/test/box/tarantool_bad5.cfg
@@ -2,7 +2,7 @@ slab_alloc_arena = 0.1
pid_file = "box.pid"
-logger="tee --append tarantool.log"
+logger="tee -a tarantool.log"
primary_port = 33013
secondary_port = 33014
diff --git a/test/box/tarantool_good.cfg b/test/box/tarantool_good.cfg
index d7cd0fe..32f2c82 100644
--- a/test/box/tarantool_good.cfg
+++ b/test/box/tarantool_good.cfg
@@ -2,7 +2,7 @@ slab_alloc_arena = 0.1
pid_file = "box.pid"
-logger="tee --append tarantool.log"
+logger="tee -a tarantool.log"
primary_port = 33013
secondary_port = 33014
--
Tarantool -- an efficient key/value data store
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
