From: Vladimir Davydov <vdavydov.dev@gmail.com> To: kostja@tarantool.org Cc: tarantool-patches@freelists.org Subject: [PATCH 05/11] vinyl: add helper to start scheduler and enable quota on startup Date: Thu, 20 Sep 2018 12:34:10 +0300 [thread overview] Message-ID: <6b03975eb2cfdb35dc4a088f4054c7c85195115d.1537435404.git.vdavydov.dev@gmail.com> (raw) In-Reply-To: <cover.1537435404.git.vdavydov.dev@gmail.com> In-Reply-To: <cover.1537435404.git.vdavydov.dev@gmail.com> There are three places where we start the scheduler fiber and enable the 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 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/box/vinyl.c b/src/box/vinyl.c index e1b35f3a..32143af0 100644 --- a/src/box/vinyl.c +++ b/src/box/vinyl.c @@ -2565,6 +2565,13 @@ vy_env_delete(struct vy_env *e) free(e); } +static void +vy_env_start_scheduler(struct vy_env *e) +{ + vy_scheduler_start(&e->scheduler); + vy_quota_enable(&e->quota); +} + struct vinyl_engine * vinyl_engine_new(const char *dir, size_t memory, int read_threads, int write_threads, bool force_recovery) @@ -2722,8 +2729,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_enable(&e->quota); + vy_env_start_scheduler(e); e->status = VINYL_ONLINE; return 0; } @@ -2757,8 +2763,7 @@ vinyl_engine_begin_initial_recovery(struct engine *engine, } else { if (vy_log_bootstrap() != 0) return -1; - vy_scheduler_start(&e->scheduler); - vy_quota_enable(&e->quota); + vy_env_start_scheduler(e); e->status = VINYL_INITIAL_RECOVERY_REMOTE; } return 0; @@ -2801,8 +2806,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_enable(&e->quota); + vy_env_start_scheduler(e); break; case VINYL_FINAL_RECOVERY_REMOTE: break; -- 2.11.0
next prev parent reply other threads:[~2018-09-20 9:34 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-20 9:34 [PATCH 00/11] vinyl: prepare for transaction throttling Vladimir Davydov 2018-09-20 9:34 ` [PATCH 01/11] vinyl: merge vy_quota_release and vy_quota_update_dump_bandwidth Vladimir Davydov 2018-09-20 9:34 ` [PATCH 02/11] vinyl: refactor quota use/unuse methods Vladimir Davydov 2018-09-20 9:34 ` [PATCH 03/11] vinyl: do not try to trigger dump if it is already in progress Vladimir Davydov 2018-09-20 9:34 ` [PATCH 04/11] vinyl: don't start quota timer until local recovery is complete Vladimir Davydov 2018-09-20 9:34 ` Vladimir Davydov [this message] 2018-09-25 23:22 ` [tarantool-patches] Re: [PATCH 05/11] vinyl: add helper to start scheduler and enable quota on startup Konstantin Osipov 2018-09-20 9:34 ` [PATCH 06/11] vinyl: zap vy_env::memory, read_threads, and write_threads Vladimir Davydov 2018-09-25 23:23 ` [tarantool-patches] " Konstantin Osipov 2018-09-20 9:34 ` [PATCH 07/11] vinyl: do not account zero dump bandwidth Vladimir Davydov 2018-09-25 23:24 ` [tarantool-patches] " Konstantin Osipov 2018-09-20 9:34 ` [PATCH 08/11] vinyl: set quota timer period to 100 ms Vladimir Davydov 2018-09-20 9:34 ` [PATCH 09/11] vinyl: implement basic transaction throttling Vladimir Davydov 2018-09-20 9:34 ` [PATCH 10/11] vinyl: implement quota wait queue without fiber_cond Vladimir Davydov 2018-09-20 9:34 ` [PATCH 11/11] vinyl: split quota consumption rate limit into soft and hard Vladimir Davydov 2018-09-25 23:19 ` [tarantool-patches] Re: [PATCH 00/11] vinyl: prepare for transaction throttling Konstantin Osipov
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=6b03975eb2cfdb35dc4a088f4054c7c85195115d.1537435404.git.vdavydov.dev@gmail.com \ --to=vdavydov.dev@gmail.com \ --cc=kostja@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [PATCH 05/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