From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 5B33129620 for ; Tue, 27 Aug 2019 04:29:35 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ivyX7968yjJH for ; Tue, 27 Aug 2019 04:29:35 -0400 (EDT) Received: from smtp40.i.mail.ru (smtp40.i.mail.ru [94.100.177.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id AC7A12961F for ; Tue, 27 Aug 2019 04:29:34 -0400 (EDT) From: Georgy Kirichenko Subject: [tarantool-patches] Re: [PATCH v2 1/6] refactoring: remove exceptions from triggers except alter.cc Date: Tue, 27 Aug 2019 11:29:31 +0300 Message-ID: <2544087.m1KnZoLZEZ@home.lan> In-Reply-To: <0bc89d20f2b2e45a1e46ab55d9ab517a1d0410cc.1565979897.git.i.kosarev@tarantool.org> References: <0bc89d20f2b2e45a1e46ab55d9ab517a1d0410cc.1565979897.git.i.kosarev@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: Ilya Kosarev Cc: tarantool-patches@freelists.org, i.kosarev@corp.mail.ru This patch looks good for me but I would prefer if you didn't change the formatting here: > -static void > +static int > replica_on_applier_state_f(struct trigger *trigger, void *event) > { > (void)event; > struct replica *replica = container_of(trigger, > struct replica, on_applier_state); > switch (replica->applier->state) { > - case APPLIER_INITIAL_JOIN: > - replicaset.is_joining = true; > - break; > - case APPLIER_JOINED: > - replicaset.is_joining = false; > - break; > - case APPLIER_CONNECTED: > - if (tt_uuid_is_nil(&replica->uuid)) > - replica_on_applier_connect(replica); > - else > - replica_on_applier_reconnect(replica); > - break; > - case APPLIER_LOADING: > - case APPLIER_DISCONNECTED: > - replica_on_applier_disconnect(replica); > - break; > - case APPLIER_FOLLOW: > - replica_on_applier_sync(replica); > - break; > - case APPLIER_OFF: > - /* > - * Connection to self, duplicate connection > - * to the same master, or the applier fiber > - * has been cancelled. Assume synced. > - */ > - replica_on_applier_sync(replica); > - break; > - case APPLIER_STOPPED: > - /* Unrecoverable error. */ > - replica_on_applier_disconnect(replica); > - break; > - default: > - break; > + case APPLIER_INITIAL_JOIN: > + replicaset.is_joining = true; > + break; > + case APPLIER_JOINED: > + replicaset.is_joining = false; > + break; > + case APPLIER_CONNECTED: > + try { > + if (tt_uuid_is_nil(&replica->uuid)) > + replica_on_applier_connect(replica); > + else > + replica_on_applier_reconnect(replica); > + } catch (Exception *e) { > + return -1; > + } > + break; > + case APPLIER_LOADING: > + case APPLIER_DISCONNECTED: > + replica_on_applier_disconnect(replica); > + break; > + case APPLIER_FOLLOW: > + replica_on_applier_sync(replica); > + break; > + case APPLIER_OFF: > + /* > + * Connection to self, duplicate connection > + * to the same master, or the applier fiber > + * has been cancelled. Assume synced. > + */ > + replica_on_applier_sync(replica); > + break; > + case APPLIER_STOPPED: > + /* Unrecoverable error. */ > + replica_on_applier_disconnect(replica); > + break; > + default: > + break; > } > fiber_cond_signal(&replicaset.applier.cond); > + return 0; > } >