From: Roland Kammerer <roland.kammerer@linbit.com>
To: Nick Wang <nwang@suse.com>
Cc: drbd-dev@lists.linbit.com
Subject: Re: [Drbd-dev] [PATCH] drbd: Fix expression to check new replication state
Date: Wed, 24 May 2017 12:45:48 +0200 [thread overview]
Message-ID: <20170524104548.GA48382@rck.sh> (raw)
In-Reply-To: <20170524100235.22887-1-nwang@suse.com>
On Wed, May 24, 2017 at 06:02:35PM +0800, Nick Wang wrote:
> Only tell peers when replication link is established.
>
> Signed-off-by: Nick Wang <nwang@suse.com>
>
> CC: Lars Ellenberg <lars.ellenberg@linbit.com>
> CC: drbd-dev@lists.linbit.com
>
> ---
> drbd/drbd-kernel-compat | 2 +-
> drbd/drbd_state.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drbd/drbd-kernel-compat b/drbd/drbd-kernel-compat
> index bd3fb0d9..bca18431 160000
> --- a/drbd/drbd-kernel-compat
> +++ b/drbd/drbd-kernel-compat
> @@ -1 +1 @@
> -Subproject commit bd3fb0d970e496c9d374101888b15ecf3618fc8a
> +Subproject commit bca18431a58fc53485d969f8745d886dd9537755
> diff --git a/drbd/drbd_state.c b/drbd/drbd_state.c
> index 9829d94f..816b8ffe 100644
> --- a/drbd/drbd_state.c
> +++ b/drbd/drbd_state.c
> @@ -3040,7 +3040,7 @@ static int w_after_state_change(struct drbd_work *w, int unused)
>
> /* Outdated myself, or became D_UP_TO_DATE tell peers */
> if (disk_state[NEW] >= D_INCONSISTENT && disk_state[NEW] != disk_state[OLD] &&
> - repl_state[OLD] >= L_ESTABLISHED && repl_state[OLD] >= L_ESTABLISHED)
> + repl_state[OLD] >= L_ESTABLISHED && repl_state[NEW] >= L_ESTABLISHED)
> send_state = true;
>
> /* Skipped resync with peer_device, tell others... */
> --
> 2.12.0
>
Correct. In that case Phil was faster, I pushed the current state to
public.
http://git.linbit.com/drbd-9.0.git/commit/c654bbe36bcba33ab40a43f730d86bad97804879
Thanks, rck
--
Roland Kammerer
+43 1 817 82 92 - 70
roland.kammerer@linbit.com
LINBIT | Keeping the Digital World Running
DRBD – Corosync – Pacemaker
next prev parent reply other threads:[~2017-05-24 10:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-24 10:02 [Drbd-dev] [PATCH] drbd: Fix expression to check new replication state Nick Wang
2017-05-24 10:45 ` Roland Kammerer [this message]
2017-05-24 10:47 ` Roland Kammerer
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=20170524104548.GA48382@rck.sh \
--to=roland.kammerer@linbit.com \
--cc=drbd-dev@lists.linbit.com \
--cc=nwang@suse.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox