[Drbd-dev] [PATCH] drbd: Fix expression to check new replication state

[Drbd-dev] [PATCH] drbd: Fix expression to check new replication state

[Nick Wang]

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

Re: [Drbd-dev] [PATCH] drbd: Fix expression to check new replication state

[Roland Kammerer]

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

Re: [Drbd-dev] [PATCH] drbd: Fix expression to check new replication state

[Roland Kammerer]

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
> 
> _______________________________________________
> drbd-dev mailing list
> drbd-dev@lists.linbit.com
> http://lists.linbit.com/mailman/listinfo/drbd-dev


Sorry, refernced the wrong commit, that was it:

http://git.linbit.com/drbd-9.0.git/commit/11660a06ccf98128d305d11668d10d38987b5bba

Regards, rck
-- 
Roland Kammerer
+43 1 817 82 92 - 70
roland.kammerer@linbit.com

LINBIT | Keeping the Digital World Running
DRBD – Corosync – Pacemaker