* [Tarantool-patches] [PATCH] Fix tuple leak in vy_build_recover_stmt
@ 2020-11-11 9:38 Kirill Yukhin
2020-11-11 17:24 ` Nikita Pettik
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Kirill Yukhin @ 2020-11-11 9:38 UTC (permalink / raw)
To: korablev, alyapunov; +Cc: tarantool-patches
Variable `old` which contains tuple reference wasn't
unrefed at all. Fix this.
---
Branch: https://github.com/tarantool/tarantool/tree/kyukhin/fix-vy-build-recover-leak
Issue: N/A
CI: https://gitlab.com/tarantool/tarantool/-/pipelines/212266538
src/box/vinyl.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/box/vinyl.c b/src/box/vinyl.c
index 57e2839..0ff1262 100644
--- a/src/box/vinyl.c
+++ b/src/box/vinyl.c
@@ -4020,8 +4020,10 @@ vy_build_recover_stmt(struct vy_lsm *lsm, struct vy_lsm *pk,
if (old_tuple != NULL) {
delete = vy_stmt_new_surrogate_delete(lsm->mem_format,
old_tuple);
- if (delete == NULL)
+ if (delete == NULL) {
+ tuple_unref(old_tuple);
return -1;
+ }
}
enum iproto_type type = vy_stmt_type(mem_stmt);
if (type == IPROTO_REPLACE || type == IPROTO_INSERT) {
@@ -4045,6 +4047,9 @@ vy_build_recover_stmt(struct vy_lsm *lsm, struct vy_lsm *pk,
goto err;
}
+ if (old_tuple != NULL)
+ tuple_unref(old_tuple);
+
/* Insert DELETE + INSERT into the LSM tree. */
if (delete != NULL) {
int rc = vy_build_insert_stmt(lsm, lsm->mem, delete, lsn);
@@ -4061,6 +4066,8 @@ vy_build_recover_stmt(struct vy_lsm *lsm, struct vy_lsm *pk,
return 0;
err:
+ if (old_tuple != NULL)
+ tuple_unref(old_tuple);
if (delete != NULL)
tuple_unref(delete);
return -1;
--
2.11.0
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Tarantool-patches] [PATCH] Fix tuple leak in vy_build_recover_stmt
2020-11-11 9:38 [Tarantool-patches] [PATCH] Fix tuple leak in vy_build_recover_stmt Kirill Yukhin
@ 2020-11-11 17:24 ` Nikita Pettik
2020-11-12 10:21 ` Alexander V. Tikhonov
2020-11-12 10:25 ` Kirill Yukhin
2 siblings, 0 replies; 4+ messages in thread
From: Nikita Pettik @ 2020-11-11 17:24 UTC (permalink / raw)
To: Kirill Yukhin; +Cc: tarantool-patches
On 11 Nov 12:38, Kirill Yukhin wrote:
> Variable `old` which contains tuple reference wasn't
> unrefed at all. Fix this.
LGTM
> ---
>
> Branch: https://github.com/tarantool/tarantool/tree/kyukhin/fix-vy-build-recover-leak
> Issue: N/A
> CI: https://gitlab.com/tarantool/tarantool/-/pipelines/212266538
>
> src/box/vinyl.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Tarantool-patches] [PATCH] Fix tuple leak in vy_build_recover_stmt
2020-11-11 9:38 [Tarantool-patches] [PATCH] Fix tuple leak in vy_build_recover_stmt Kirill Yukhin
2020-11-11 17:24 ` Nikita Pettik
@ 2020-11-12 10:21 ` Alexander V. Tikhonov
2020-11-12 10:25 ` Kirill Yukhin
2 siblings, 0 replies; 4+ messages in thread
From: Alexander V. Tikhonov @ 2020-11-12 10:21 UTC (permalink / raw)
To: Kirill Yukhin; +Cc: tarantool-patches
Hi Kirill, I've checked all results in gitlab-ci, and no new degradations
found [1], patch LGTM.
[1] - https://gitlab.com/tarantool/tarantool/-/pipelines/215136994
On Wed, Nov 11, 2020 at 12:38:10PM +0300, Kirill Yukhin wrote:
> Variable `old` which contains tuple reference wasn't
> unrefed at all. Fix this.
> ---
>
> Branch: https://github.com/tarantool/tarantool/tree/kyukhin/fix-vy-build-recover-leak
> Issue: N/A
> CI: https://gitlab.com/tarantool/tarantool/-/pipelines/212266538
>
> src/box/vinyl.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/src/box/vinyl.c b/src/box/vinyl.c
> index 57e2839..0ff1262 100644
> --- a/src/box/vinyl.c
> +++ b/src/box/vinyl.c
> @@ -4020,8 +4020,10 @@ vy_build_recover_stmt(struct vy_lsm *lsm, struct vy_lsm *pk,
> if (old_tuple != NULL) {
> delete = vy_stmt_new_surrogate_delete(lsm->mem_format,
> old_tuple);
> - if (delete == NULL)
> + if (delete == NULL) {
> + tuple_unref(old_tuple);
> return -1;
> + }
> }
> enum iproto_type type = vy_stmt_type(mem_stmt);
> if (type == IPROTO_REPLACE || type == IPROTO_INSERT) {
> @@ -4045,6 +4047,9 @@ vy_build_recover_stmt(struct vy_lsm *lsm, struct vy_lsm *pk,
> goto err;
> }
>
> + if (old_tuple != NULL)
> + tuple_unref(old_tuple);
> +
> /* Insert DELETE + INSERT into the LSM tree. */
> if (delete != NULL) {
> int rc = vy_build_insert_stmt(lsm, lsm->mem, delete, lsn);
> @@ -4061,6 +4066,8 @@ vy_build_recover_stmt(struct vy_lsm *lsm, struct vy_lsm *pk,
> return 0;
>
> err:
> + if (old_tuple != NULL)
> + tuple_unref(old_tuple);
> if (delete != NULL)
> tuple_unref(delete);
> return -1;
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Tarantool-patches] [PATCH] Fix tuple leak in vy_build_recover_stmt
2020-11-11 9:38 [Tarantool-patches] [PATCH] Fix tuple leak in vy_build_recover_stmt Kirill Yukhin
2020-11-11 17:24 ` Nikita Pettik
2020-11-12 10:21 ` Alexander V. Tikhonov
@ 2020-11-12 10:25 ` Kirill Yukhin
2 siblings, 0 replies; 4+ messages in thread
From: Kirill Yukhin @ 2020-11-12 10:25 UTC (permalink / raw)
To: korablev, alyapunov; +Cc: tarantool-patches
Hello,
On 11 Nov 12:38, Kirill Yukhin wrote:
> Variable `old` which contains tuple reference wasn't
> unrefed at all. Fix this.
> ---
>
> Branch: https://github.com/tarantool/tarantool/tree/kyukhin/fix-vy-build-recover-leak
> Issue: N/A
> CI: https://gitlab.com/tarantool/tarantool/-/pipelines/212266538
I've checked the patch into 1.10, 2.5, 2.6 and master.
--
Regards, Kirill Yukhin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-12 10:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-11 9:38 [Tarantool-patches] [PATCH] Fix tuple leak in vy_build_recover_stmt Kirill Yukhin
2020-11-11 17:24 ` Nikita Pettik
2020-11-12 10:21 ` Alexander V. Tikhonov
2020-11-12 10:25 ` Kirill Yukhin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox