From: Serge Petrenko <sergepetrenko@tarantool.org> To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>, tarantool-patches@dev.tarantool.org, gorcunov@gmail.com Subject: Re: [Tarantool-patches] [PATCH 11/12] raft: introduce RaftError Date: Tue, 17 Nov 2020 18:13:13 +0300 [thread overview] Message-ID: <619f09b4-6bc3-8641-2611-99a5873b7458@tarantool.org> (raw) In-Reply-To: <fd5faa3b604f971ba0ae52ccf6d70e89008ffc8b.1605570907.git.v.shpilevoy@tarantool.org> 17.11.2020 03:02, Vladislav Shpilevoy пишет: > Last piece of src/box used in Raft code was error.h. It was added > to be able to raise ClientErrors. To get rid of it the libraries > usually introduce their own error type available from > src/lib/core. Such as CollationError, SwimError, CryptoError. > > This patch adds RaftError and removes the last box dependency from > Raft code. > > Part of #5303 LGTM. > --- > src/box/raftlib.c | 9 ++++----- > src/lib/core/diag.h | 2 ++ > src/lib/core/exception.cc | 24 ++++++++++++++++++++++++ > src/lib/core/exception.h | 7 +++++++ > 4 files changed, 37 insertions(+), 5 deletions(-) > > diff --git a/src/box/raftlib.c b/src/box/raftlib.c > index 2e09d5405..b669475f3 100644 > --- a/src/box/raftlib.c > +++ b/src/box/raftlib.c > @@ -30,7 +30,7 @@ > */ > #include "raft.h" > > -#include "error.h" > +#include "exception.h" > #include "fiber.h" > #include "small/region.h" > #include "tt_static.h" > @@ -291,14 +291,13 @@ raft_process_msg(struct raft *raft, const struct raft_msg *req, uint32_t source) > assert(source > 0); > assert(source != raft->self); > if (req->term == 0 || req->state == 0) { > - diag_set(ClientError, ER_PROTOCOL, "Raft term and state can't " > - "be zero"); > + diag_set(RaftError, "Raft term and state can't be zero"); > return -1; > } > if (req->state == RAFT_STATE_CANDIDATE && > (req->vote != source || req->vclock == NULL)) { > - diag_set(ClientError, ER_PROTOCOL, "Candidate should always " > - "vote for self and provide its vclock"); > + diag_set(RaftError, "Candidate should always vote for self and " > + "provide its vclock"); > return -1; > } > /* Outdated request. */ > diff --git a/src/lib/core/diag.h b/src/lib/core/diag.h > index 6bf0b139a..b07eea838 100644 > --- a/src/lib/core/diag.h > +++ b/src/lib/core/diag.h > @@ -335,6 +335,8 @@ struct error * > BuildSwimError(const char *file, unsigned line, const char *format, ...); > struct error * > BuildCryptoError(const char *file, unsigned line, const char *format, ...); > +struct error * > +BuildRaftError(const char *file, unsigned line, const char *format, ...); > > struct index_def; > > diff --git a/src/lib/core/exception.cc b/src/lib/core/exception.cc > index 180cb0e97..395baff6f 100644 > --- a/src/lib/core/exception.cc > +++ b/src/lib/core/exception.cc > @@ -288,6 +288,18 @@ CryptoError::CryptoError(const char *file, unsigned line, > va_end(ap); > } > > +const struct type_info type_RaftError = > + make_type("RaftError", &type_Exception); > + > +RaftError::RaftError(const char *file, unsigned line, const char *format, ...) > + : Exception(&type_RaftError, file, line) > +{ > + va_list ap; > + va_start(ap, format); > + error_vformat_msg(this, format, ap); > + va_end(ap); > +} > + > #define BuildAlloc(type) \ > void *p = malloc(sizeof(type)); \ > if (p == NULL) \ > @@ -409,6 +421,18 @@ BuildSocketError(const char *file, unsigned line, const char *socketname, > return e; > } > > +struct error * > +BuildRaftError(const char *file, unsigned line, const char *format, ...) > +{ > + BuildAlloc(RaftError); > + RaftError *e = new (p) RaftError(file, line, ""); > + va_list ap; > + va_start(ap, format); > + error_vformat_msg(e, format, ap); > + va_end(ap); > + return e; > +} > + > void > exception_init() > { > diff --git a/src/lib/core/exception.h b/src/lib/core/exception.h > index 1947b4f00..7277b2784 100644 > --- a/src/lib/core/exception.h > +++ b/src/lib/core/exception.h > @@ -52,6 +52,7 @@ extern const struct type_info type_SystemError; > extern const struct type_info type_CollationError; > extern const struct type_info type_SwimError; > extern const struct type_info type_CryptoError; > +extern const struct type_info type_RaftError; > > const char * > exception_get_string(struct error *e, const struct method_info *method); > @@ -168,6 +169,12 @@ public: > virtual void raise() { throw this; } > }; > > +class RaftError: public Exception { > +public: > + RaftError(const char *file, unsigned line, const char *format, ...); > + virtual void raise() { throw this; } > +}; > + > /** > * Initialize the exception subsystem. > */ -- Serge Petrenko
next prev parent reply other threads:[~2020-11-17 15:13 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-17 0:02 [Tarantool-patches] [PATCH 00/12] Raft module, part 2 - relocation to src/lib/raft Vladislav Shpilevoy 2020-11-17 0:02 ` [Tarantool-patches] [PATCH 01/12] raft: move sources to raftlib.h/.c Vladislav Shpilevoy 2020-11-17 8:14 ` Serge Petrenko 2020-11-17 0:02 ` [Tarantool-patches] [PATCH 10/12] raft: move box_update_ro_summary to update trigger Vladislav Shpilevoy 2020-11-17 12:42 ` Serge Petrenko 2020-11-17 15:17 ` Serge Petrenko 2020-11-18 23:21 ` Vladislav Shpilevoy 2020-11-19 10:08 ` Serge Petrenko 2020-11-17 0:02 ` [Tarantool-patches] [PATCH 11/12] raft: introduce RaftError Vladislav Shpilevoy 2020-11-17 15:13 ` Serge Petrenko [this message] 2020-11-17 0:02 ` [Tarantool-patches] [PATCH 12/12] raft: move algorithm code to src/lib/raft Vladislav Shpilevoy 2020-11-17 15:13 ` Serge Petrenko 2020-11-17 0:02 ` [Tarantool-patches] [PATCH 02/12] raft: move box_raft_* to src/box/raft.h and .c Vladislav Shpilevoy 2020-11-17 8:14 ` Serge Petrenko 2020-11-17 0:02 ` [Tarantool-patches] [PATCH 03/12] raft: stop using replication_disconnect_timeout() Vladislav Shpilevoy 2020-11-17 8:15 ` Serge Petrenko 2020-11-17 0:02 ` [Tarantool-patches] [PATCH 04/12] raft: stop using replication_synchro_quorum Vladislav Shpilevoy 2020-11-17 8:17 ` Serge Petrenko 2020-11-19 23:42 ` Vladislav Shpilevoy 2020-11-17 0:02 ` [Tarantool-patches] [PATCH 05/12] raft: stop using instance_id Vladislav Shpilevoy 2020-11-17 8:59 ` Serge Petrenko 2020-11-17 0:02 ` [Tarantool-patches] [PATCH 06/12] raft: make raft_request.vclock constant Vladislav Shpilevoy 2020-11-17 9:17 ` Serge Petrenko 2020-11-17 0:02 ` [Tarantool-patches] [PATCH 07/12] raft: stop using replicaset.vclock Vladislav Shpilevoy 2020-11-17 9:23 ` Serge Petrenko 2020-11-17 0:02 ` [Tarantool-patches] [PATCH 08/12] raft: introduce vtab for disk and network Vladislav Shpilevoy 2020-11-17 9:35 ` Serge Petrenko 2020-11-19 23:43 ` Vladislav Shpilevoy 2020-11-17 10:00 ` Serge Petrenko 2020-11-19 23:43 ` Vladislav Shpilevoy 2020-11-20 7:56 ` Serge Petrenko 2020-11-20 19:40 ` Vladislav Shpilevoy 2020-11-23 8:09 ` Serge Petrenko 2020-11-17 0:02 ` [Tarantool-patches] [PATCH 09/12] raft: introduce raft_msg, drop xrow dependency Vladislav Shpilevoy 2020-11-17 10:22 ` Serge Petrenko 2020-11-19 23:43 ` Vladislav Shpilevoy 2020-11-20 8:03 ` Serge Petrenko
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=619f09b4-6bc3-8641-2611-99a5873b7458@tarantool.org \ --to=sergepetrenko@tarantool.org \ --cc=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 11/12] raft: introduce RaftError' \ /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