Tarantool development patches archive
 help / color / mirror / Atom feed
From: Cyrill Gorcunov <gorcunov@gmail.com>
To: tml <tarantool-patches@dev.tarantool.org>
Subject: [Tarantool-patches] [PATCH 15/17] recovery: provide throwable wrappers
Date: Tue, 28 Apr 2020 19:11:35 +0300	[thread overview]
Message-ID: <20200428161137.20536-16-gorcunov@gmail.com> (raw)
In-Reply-To: <20200428161137.20536-1-gorcunov@gmail.com>

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 src/box/recovery.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/src/box/recovery.h b/src/box/recovery.h
index e8ac3198a..f085522db 100644
--- a/src/box/recovery.h
+++ b/src/box/recovery.h
@@ -102,6 +102,59 @@ recover_remaining_wals(struct recovery *r, struct xstream *stream,
 
 #if defined(__cplusplus)
 } /* extern "C" */
+
+#include "exception.h"
+
+static inline struct recovery *
+recovery_new_xc(const char *wal_dirname, bool force_recovery,
+		const struct vclock *vclock)
+{
+	struct recovery *r;
+
+	r = recovery_new(wal_dirname, force_recovery, vclock);
+	if (r == NULL)
+		diag_raise();
+	return r;
+}
+
+static inline void
+recovery_scan_xc(struct recovery *r, struct vclock *end_vclock,
+		 struct vclock *gc_vclock)
+{
+	if (recovery_scan(r, end_vclock, gc_vclock))
+		diag_raise();
+}
+
+static inline void
+recover_remaining_wals_xc(struct recovery *r, struct xstream *stream,
+			  const struct vclock *stop_vclock, bool scan_dir)
+{
+	if (recover_remaining_wals(r, stream, stop_vclock, scan_dir))
+		diag_raise();
+}
+
+static inline void
+recovery_follow_local_xc(struct recovery *r, struct xstream *stream,
+			 const char *name, ev_tstamp wal_dir_rescan_delay)
+{
+	if (recovery_follow_local(r, stream, name, wal_dir_rescan_delay))
+		diag_raise();
+}
+
+static inline void
+recovery_stop_local_xc(struct recovery *r)
+{
+	if (recovery_stop_local(r))
+		diag_raise();
+}
+
+static inline void
+recovery_finalize_xc(struct recovery *r)
+{
+	if (recovery_finalize(r))
+		diag_raise();
+}
+
 #endif /* defined(__cplusplus) */
 
 #endif /* TARANTOOL_RECOVERY_H_INCLUDED */
-- 
2.20.1

  parent reply	other threads:[~2020-04-28 16:14 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 ` [Tarantool-patches] [PATCH 09/17] recovery: recovery_new " Cyrill Gorcunov
2020-05-03 18:47   ` 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 ` Cyrill Gorcunov [this message]
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-16-gorcunov@gmail.com \
    --to=gorcunov@gmail.com \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH 15/17] recovery: provide throwable wrappers' \
    /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