From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH 09/17] recovery: recovery_new -- don't throw exception Date: Tue, 28 Apr 2020 19:11:29 +0300 [thread overview] Message-ID: <20200428161137.20536-10-gorcunov@gmail.com> (raw) In-Reply-To: <20200428161137.20536-1-gorcunov@gmail.com> Prepare for transition to plain C. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/box.cc | 2 ++ src/box/recovery.cc | 22 ++++++++++------------ src/box/relay.cc | 12 ++++++++---- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/box/box.cc b/src/box/box.cc index 7551ca753..4371c1986 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -2224,6 +2224,8 @@ local_recovery(const struct tt_uuid *instance_uuid, recovery = recovery_new(cfg_gets("wal_dir"), cfg_geti("force_recovery"), checkpoint_vclock); + if (recovery == NULL) + diag_raise(); /* * Make sure we report the actual recovery position diff --git a/src/box/recovery.cc b/src/box/recovery.cc index 24036b7c1..1c7665f87 100644 --- a/src/box/recovery.cc +++ b/src/box/recovery.cc @@ -77,24 +77,21 @@ /* {{{ Initial recovery */ /** - * Throws an exception in case of error. + * Returns NULL in case of error. */ struct recovery * recovery_new(const char *wal_dirname, bool force_recovery, const struct vclock *vclock) { - struct recovery *r = (struct recovery *) - calloc(1, sizeof(*r)); + struct recovery *r; + r = (struct recovery *)calloc(1, sizeof(*r)); if (r == NULL) { - tnt_raise(OutOfMemory, sizeof(*r), "malloc", - "struct recovery"); + diag_set(OutOfMemory, sizeof(*r), "calloc", + "struct recovery"); + return NULL; } - auto guard = make_scoped_guard([=]{ - free(r); - }); - xdir_create(&r->wal_dir, wal_dirname, XLOG, &INSTANCE_UUID, &xlog_opts_default); r->wal_dir.force_recovery = force_recovery; @@ -108,12 +105,13 @@ recovery_new(const char *wal_dirname, bool force_recovery, * UUID, see replication/cluster.test for * details. */ - xdir_check_xc(&r->wal_dir); + if (xdir_check(&r->wal_dir) != 0) { + free(r); + return NULL; + } r->watcher = NULL; rlist_create(&r->on_close_log); - - guard.is_active = false; return r; } diff --git a/src/box/relay.cc b/src/box/relay.cc index 2e17d0476..a5bcd9580 100644 --- a/src/box/relay.cc +++ b/src/box/relay.cc @@ -363,8 +363,10 @@ relay_final_join(int fd, uint64_t sync, struct vclock *start_vclock, relay_delete(relay); }); - relay->r = recovery_new(cfg_gets("wal_dir"), false, - start_vclock); + relay->r = recovery_new(cfg_gets("wal_dir"), false, start_vclock); + if (relay->r == NULL) + diag_raise(); + vclock_copy(&relay->stop_vclock, stop_vclock); int rc = cord_costart(&relay->cord, "final_join", @@ -717,8 +719,10 @@ relay_subscribe(struct replica *replica, int fd, uint64_t sync, }); vclock_copy(&relay->local_vclock_at_subscribe, &replicaset.vclock); - relay->r = recovery_new(cfg_gets("wal_dir"), false, - replica_clock); + relay->r = recovery_new(cfg_gets("wal_dir"), false, replica_clock); + if (relay->r == NULL) + diag_raise(); + vclock_copy(&relay->tx.vclock, replica_clock); relay->version_id = replica_version_id; -- 2.20.1
next prev parent reply other threads:[~2020-04-28 16:13 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-28 16:11 [Tarantool-patches] [PATCH 00/17] recovery: move from cxx to c code Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 01/17] recovery: do not call recovery_stop_local inside recovery_delete Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 02/17] recovery: convert WalSubscription class to structure Cyrill Gorcunov 2020-05-03 18:42 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 03/17] recovery: recovery_close_log -- don't throw exception Cyrill Gorcunov 2020-05-03 18:43 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 04/17] recovery: recovery_open_log " Cyrill Gorcunov 2020-05-03 18:43 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 05/17] recovery: recover_xlog " Cyrill Gorcunov 2020-05-03 18:44 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 06/17] recovery: recover_remaining_wals " Cyrill Gorcunov 2020-05-03 18:44 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 07/17] recovery: hot_standby_f " Cyrill Gorcunov 2020-05-03 18:45 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 08/17] recovery: recovery_follow_local " Cyrill Gorcunov 2020-05-03 18:46 ` Vladislav Shpilevoy 2020-04-28 16:11 ` Cyrill Gorcunov [this message] 2020-05-03 18:47 ` [Tarantool-patches] [PATCH 09/17] recovery: recovery_new " Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 10/17] recovery: recovery_scan " Cyrill Gorcunov 2020-05-03 18:47 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 11/17] recovery: recovery_finalize " Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 12/17] recovery: recovery_stop_local " Cyrill Gorcunov 2020-05-03 18:47 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 13/17] recovery: cxx to c transition Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 14/17] recovery: drop redundant type_XlogGapError Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 15/17] recovery: provide throwable wrappers Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 16/17] box: use _xc helpers of recovery code Cyrill Gorcunov 2020-05-03 18:47 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 17/17] relay: use _xc recovery helpers Cyrill Gorcunov 2020-04-28 16:24 ` [Tarantool-patches] [PATCH 01/17] recovery: do not call recovery_stop_local inside recovery_delete Cyrill Gorcunov
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=20200428161137.20536-10-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 09/17] recovery: recovery_new -- don'\''t throw exception' \ /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