From 0dc37356579f029e5a72953d8a1981c5e7b77ded Mon Sep 17 00:00:00 2001
From: Nikolay Shirokovskiy <nshirokovskiy@tarantool.org>
Date: Thu, 7 Sep 2023 17:19:18 +0300
Subject: [PATCH] box: drop debug log on tuple new/delete
They are rather noisy. Also delete debug log on arena creation. These
two make sense only with each other.
Part of #7327
NO_TEST=internal
NO_DOC=internal
NO_CHANGELOG=internal
---
src/box/memtx_engine.cc | 2 -
src/box/tuple.c | 5 ---
src/box/tuple.h | 1 -
src/box/vy_stmt.c | 3 --
.../gh_3211_per_module_log_level_test.lua | 2 -
...fferent_log_on_tuple_new_and_free_test.lua | 41 -------------------
6 files changed, 54 deletions(-)
delete mode 100644 test/box-luatest/gh_6634_different_log_on_tuple_new_and_free_test.lua
diff --git a/src/box/memtx_engine.cc b/src/box/memtx_engine.cc
index 1a29b18f7d..cf365091cc 100644
--- a/src/box/memtx_engine.cc
+++ b/src/box/memtx_engine.cc
@@ -1833,7 +1833,6 @@ memtx_tuple_new_raw_impl(struct tuple_format *format, const char *data,
raw = (char *) tuple + data_offset;
field_map_build(&builder, raw - field_map_size);
memcpy(raw, data, tuple_len);
- say_debug("%s(%zu) = %p", __func__, tuple_len, tuple);
end:
region_truncate(region, region_svp);
return tuple;
@@ -1851,7 +1850,6 @@ static void
memtx_tuple_delete(struct tuple_format *format, struct tuple *tuple)
{
assert(tuple_is_unreferenced(tuple));
- say_debug("%s(%p)", __func__, tuple);
MemtxAllocator<ALLOC>::free_tuple(tuple);
tuple_format_unref(format);
}
diff --git a/src/box/tuple.c b/src/box/tuple.c
index 844e24402b..30277a186c 100644
--- a/src/box/tuple.c
+++ b/src/box/tuple.c
@@ -136,7 +136,6 @@ runtime_tuple_new(struct tuple_format *format, const char *data, const char *end
char *raw = (char *) tuple + data_offset;
field_map_build(&builder, raw - field_map_size);
memcpy(raw, data, data_len);
- say_debug("%s(%zu) = %p", __func__, data_len, tuple);
end:
region_truncate(region, region_svp);
return tuple;
@@ -146,7 +145,6 @@ static void
runtime_tuple_delete(struct tuple_format *format, struct tuple *tuple)
{
assert(format->vtab.tuple_delete == tuple_format_runtime_vtab.tuple_delete);
- say_debug("%s(%p)", __func__, tuple);
assert(tuple->local_refs == 0);
assert(!tuple_has_flag(tuple, TUPLE_HAS_UPLOADED_REFS));
size_t total = tuple_size(tuple);
@@ -392,9 +390,6 @@ tuple_arena_create(struct slab_arena *arena, struct quota *quota,
" tuple arena", prealloc, arena_name);
}
}
-
- say_debug("tuple arena %s: addr %p size %zu flags %#x dontdump %d",
- arena_name, arena->arena, prealloc, flags, dontdump);
}
void
diff --git a/src/box/tuple.h b/src/box/tuple.h
index 9c9429cb49..be32936723 100644
--- a/src/box/tuple.h
+++ b/src/box/tuple.h
@@ -770,7 +770,6 @@ tuple_new(struct tuple_format *format, const char *data, const char *end)
static inline void
tuple_delete(struct tuple *tuple)
{
- say_debug("%s(%p)", __func__, tuple);
assert(tuple->local_refs == 0);
assert(!tuple_has_flag(tuple, TUPLE_HAS_UPLOADED_REFS));
assert(!tuple_has_flag(tuple, TUPLE_IS_DIRTY));
diff --git a/src/box/vy_stmt.c b/src/box/vy_stmt.c
index a6659082b4..b9eabbbdc1 100644
--- a/src/box/vy_stmt.c
+++ b/src/box/vy_stmt.c
@@ -100,7 +100,6 @@ vy_tuple_delete(struct tuple_format *format, struct tuple *tuple)
{
struct vy_stmt_env *env = format->engine;
size_t size = tuple_size(tuple);
- say_debug("%s(%p)", __func__, tuple);
assert(tuple_is_unreferenced(tuple));
/*
* Turn off formats referencing in worker threads to avoid
@@ -189,8 +188,6 @@ vy_stmt_alloc(struct tuple_format *format, uint32_t data_offset, uint32_t bsize)
diag_set(OutOfMemory, total_size, "malloc", "struct vy_stmt");
return NULL;
}
- say_debug("vy_stmt_alloc(format = %d data_offset = %u, bsize = %u) = %p",
- format->id, data_offset, bsize, tuple);
tuple_create(tuple, 1, tuple_format_id(format),
data_offset, bsize, false);
if (cord_is_main()) {
diff --git a/test/box-luatest/gh_3211_per_module_log_level_test.lua b/test/box-luatest/gh_3211_per_module_log_level_test.lua
index 8fc2e48177..1fbc067d1a 100644
--- a/test/box-luatest/gh_3211_per_module_log_level_test.lua
+++ b/test/box-luatest/gh_3211_per_module_log_level_test.lua
@@ -199,7 +199,6 @@ g2.test_tarantool_module = function(cg)
end)
find_in_log(cg, 'Lua debug message 1', true)
find_in_log(cg, 'C debug message 1', false)
- find_in_log(cg, 'tuple_new', false) -- printed during create_space()
cg.server:exec(function()
local log = require('log')
@@ -212,7 +211,6 @@ g2.test_tarantool_module = function(cg)
end)
find_in_log(cg, 'Lua debug message 2', false)
find_in_log(cg, 'C debug message 2', true)
- find_in_log(cg, 'tuple_new', true) -- printed during create_space()
-- Reset global log level to the default value ("info") and check
-- that Tarantool C log level is still "debug".
diff --git a/test/box-luatest/gh_6634_different_log_on_tuple_new_and_free_test.lua b/test/box-luatest/gh_6634_different_log_on_tuple_new_and_free_test.lua
deleted file mode 100644
index ac1413ee59..0000000000
--- a/test/box-luatest/gh_6634_different_log_on_tuple_new_and_free_test.lua
+++ /dev/null
@@ -1,41 +0,0 @@
-local server = require('luatest.server')
-local t = require('luatest')
-
-local g = t.group()
-
-g.before_all(function()
- g.server = server:new{
- alias = 'default',
- }
- g.server:start()
-end)
-
-g.after_all(function()
- g.server:drop()
-end)
-
-g.test_different_logs_on_new_and_free = function()
- g.server:exec(function()
- local s = box.schema.create_space('test')
- s:create_index('pk')
- box.cfg{log_level = 7}
- s:replace{0, 0, 0, 0, 0, 0, 0}
- box.cfg{log_level = 5}
- end)
-
- local str = g.server:grep_log('memtx_tuple_new[%w_]*%(%d+%) = 0x%x+$', 1024)
- local new_tuple_address = string.match(str, '0x%x+$')
- new_tuple_address = string.sub(new_tuple_address, 3)
-
- g.server:exec(function()
- box.cfg{log_level = 7}
- box.space.test:replace{0, 1}
- collectgarbage('collect')
- box.cfg{log_level = 5}
- end)
-
- str = g.server:grep_log('memtx_tuple_delete%w*%(0x%x+%)', 1024)
- local deleted_tuple_address = string.match(str, '0x%x+%)')
- deleted_tuple_address = string.sub(deleted_tuple_address, 3, -2)
- t.assert_equals(new_tuple_address, deleted_tuple_address)
-end
--
GitLab