From: Vladimir Davydov <vdavydov.dev@gmail.com> To: kostja@tarantool.org Cc: tarantool-patches@freelists.org Subject: [PATCH v2 01/11] vinyl: add helper to start scheduler and enable quota on startup Date: Fri, 28 Sep 2018 20:39:59 +0300 [thread overview] Message-ID: <de4dbaec1fbfd6ebe37071a3ad251018df1ebb93.1538155645.git.vdavydov.dev@gmail.com> (raw) In-Reply-To: <cover.1538155645.git.vdavydov.dev@gmail.com> In-Reply-To: <cover.1538155645.git.vdavydov.dev@gmail.com> There are three places where we start the scheduler fiber and enable the configured memory quota limit: local bootstrap, remote bootstrap, and local recovery completion. I'm planning to add more code there so let's factor it out now. --- src/box/vinyl.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/box/vinyl.c b/src/box/vinyl.c index 803f32d5..67b9c589 100644 --- a/src/box/vinyl.c +++ b/src/box/vinyl.c @@ -2565,6 +2565,17 @@ vy_env_delete(struct vy_env *e) free(e); } +/** + * Called upon local recovery completion to enable memory quota + * and start the scheduler. + */ +static void +vy_env_complete_recovery(struct vy_env *env) +{ + vy_scheduler_start(&env->scheduler); + vy_quota_set_limit(&env->quota, env->memory); +} + struct vinyl_engine * vinyl_engine_new(const char *dir, size_t memory, int read_threads, int write_threads, bool force_recovery) @@ -2722,8 +2733,7 @@ vinyl_engine_bootstrap(struct engine *engine) assert(e->status == VINYL_OFFLINE); if (vy_log_bootstrap() != 0) return -1; - vy_scheduler_start(&e->scheduler); - vy_quota_set_limit(&e->quota, e->memory); + vy_env_complete_recovery(e); e->status = VINYL_ONLINE; return 0; } @@ -2757,8 +2767,7 @@ vinyl_engine_begin_initial_recovery(struct engine *engine, } else { if (vy_log_bootstrap() != 0) return -1; - vy_scheduler_start(&e->scheduler); - vy_quota_set_limit(&e->quota, e->memory); + vy_env_complete_recovery(e); e->status = VINYL_INITIAL_RECOVERY_REMOTE; } return 0; @@ -2801,8 +2810,7 @@ vinyl_engine_end_recovery(struct engine *engine) vy_recovery_delete(e->recovery); e->recovery = NULL; e->recovery_vclock = NULL; - vy_scheduler_start(&e->scheduler); - vy_quota_set_limit(&e->quota, e->memory); + vy_env_complete_recovery(e); break; case VINYL_FINAL_RECOVERY_REMOTE: break; -- 2.11.0
next prev parent reply other threads:[~2018-09-28 17:39 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-28 17:39 [PATCH v2 00/11] vinyl: transaction throttling infrastructure Vladimir Davydov 2018-09-28 17:39 ` Vladimir Davydov [this message] 2018-09-29 4:37 ` [tarantool-patches] Re: [PATCH v2 01/11] vinyl: add helper to start scheduler and enable quota on startup Konstantin Osipov 2018-09-28 17:40 ` [PATCH v2 02/11] vinyl: factor load regulator out of quota Vladimir Davydov 2018-09-29 5:00 ` [tarantool-patches] " Konstantin Osipov 2018-09-29 11:36 ` Vladimir Davydov [not found] ` <20180929114308.GA19162@chai> 2018-10-01 10:27 ` Vladimir Davydov 2018-10-01 10:31 ` Vladimir Davydov 2018-10-02 18:16 ` [tarantool-patches] " Konstantin Osipov 2018-10-03 8:49 ` Vladimir Davydov 2018-09-28 17:40 ` [PATCH v2 03/11] vinyl: minor refactoring of quota methods Vladimir Davydov 2018-09-29 5:01 ` [tarantool-patches] " Konstantin Osipov 2018-09-28 17:40 ` [PATCH v2 04/11] vinyl: move transaction size sanity check to quota Vladimir Davydov 2018-09-29 5:02 ` [tarantool-patches] " Konstantin Osipov 2018-09-28 17:40 ` [PATCH v2 05/11] vinyl: implement quota wait queue without fiber_cond Vladimir Davydov 2018-09-29 5:05 ` [tarantool-patches] " Konstantin Osipov 2018-09-29 11:44 ` Vladimir Davydov 2018-09-28 17:40 ` [PATCH v2 06/11] vinyl: enable quota upon recovery completion explicitly Vladimir Davydov 2018-09-29 5:06 ` [tarantool-patches] " Konstantin Osipov 2018-09-28 17:40 ` [PATCH v2 07/11] vinyl: zap vy_env::memory, read_threads, and write_threads Vladimir Davydov 2018-09-29 5:06 ` [tarantool-patches] " Konstantin Osipov 2018-09-28 17:40 ` [PATCH v2 08/11] vinyl: do not try to trigger dump in regulator if already in progress Vladimir Davydov 2018-09-28 17:40 ` [PATCH v2 09/11] vinyl: do not account zero dump bandwidth Vladimir Davydov 2018-10-12 13:27 ` Vladimir Davydov 2018-10-16 18:25 ` [tarantool-patches] " Konstantin Osipov 2018-10-17 8:44 ` Vladimir Davydov 2018-10-23 7:02 ` Konstantin Osipov 2018-09-28 17:40 ` [PATCH v2 10/11] vinyl: implement basic transaction throttling Vladimir Davydov 2018-09-28 17:40 ` [PATCH v2 11/11] vinyl: introduce quota consumer priorities Vladimir Davydov 2018-10-06 13:24 ` Konstantin Osipov 2018-10-08 11:10 ` Vladimir Davydov 2018-10-09 13:25 ` Vladimir Davydov 2018-10-11 7:02 ` Konstantin Osipov 2018-10-11 8:29 ` Vladimir Davydov 2018-10-03 9:06 ` [PATCH v2 00/11] vinyl: transaction throttling infrastructure Vladimir Davydov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=de4dbaec1fbfd6ebe37071a3ad251018df1ebb93.1538155645.git.vdavydov.dev@gmail.com \ --to=vdavydov.dev@gmail.com \ --cc=kostja@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [PATCH v2 01/11] vinyl: add helper to start scheduler and enable quota on startup' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox