| Message ID | 1464231615-27939-1-git-send-email-junxiao.bi@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, May 26, 2016 at 11:00:15AM +0800, Junxiao Bi wrote: > Two new messages are added to support negotiating hb timeout. Stopping > nodes talking old version to mount as they will cause the negotiation > fail. > > Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com> Reviewed-by: Mark Fasheh <mfasheh@suse.de> Btw, you might want to send the whole series again as a whole so Andrew knows where this is coming from and that it should be bundled with the protocol changes themselves. Thanks, --Mark -- Mark Fasheh
On Thu, 26 May 2016 16:10:00 -0700 Mark Fasheh <mfasheh@suse.de> wrote: > On Thu, May 26, 2016 at 11:00:15AM +0800, Junxiao Bi wrote: > > Two new messages are added to support negotiating hb timeout. Stopping > > nodes talking old version to mount as they will cause the negotiation > > fail. > > > > Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com> > > Reviewed-by: Mark Fasheh <mfasheh@suse.de> > > Btw, you might want to send the whole series again as a whole so Andrew > knows where this is coming from and that it should be bundled with the > protocol changes themselves. > It's these: ocfs2-o2hb-add-negotiate-timer.patch ocfs2-o2hb-add-nego_timeout-message.patch ocfs2-o2hb-add-negotiate_approve-message.patch ocfs2-o2hb-add-some-user-debug-log.patch ocfs2-o2hb-dont-negotiate-if-last-hb-fail.patch ocfs2-o2hb-fix-hb-hung-time.patch from http://ozlabs.org/~akpm/mmotm/broken-out/, isn't it?
On Thu, May 26, 2016 at 04:17:00PM -0700, Andrew Morton wrote: > On Thu, 26 May 2016 16:10:00 -0700 Mark Fasheh <mfasheh@suse.de> wrote: > > Btw, you might want to send the whole series again as a whole so Andrew > > knows where this is coming from and that it should be bundled with the > > protocol changes themselves. > > > > It's these: > > ocfs2-o2hb-add-negotiate-timer.patch > ocfs2-o2hb-add-nego_timeout-message.patch > ocfs2-o2hb-add-negotiate_approve-message.patch > ocfs2-o2hb-add-some-user-debug-log.patch > ocfs2-o2hb-dont-negotiate-if-last-hb-fail.patch > ocfs2-o2hb-fix-hb-hung-time.patch > > from http://ozlabs.org/~akpm/mmotm/broken-out/, isn't it? Yes, thanks Andrew :) --Mark -- Mark Fasheh
diff --git a/fs/ocfs2/cluster/tcp_internal.h b/fs/ocfs2/cluster/tcp_internal.h index b95e7df5b76a..94b18369b1cc 100644 --- a/fs/ocfs2/cluster/tcp_internal.h +++ b/fs/ocfs2/cluster/tcp_internal.h @@ -44,6 +44,9 @@ * version here in tcp_internal.h should not need to be bumped for * filesystem locking changes. * + * New in version 12 + * - Negotiate hb timeout when storage is down. + * * New in version 11 * - Negotiation of filesystem locking in the dlm join. * @@ -75,7 +78,7 @@ * - full 64 bit i_size in the metadata lock lvbs * - introduction of "rw" lock and pushing meta/data locking down */ -#define O2NET_PROTOCOL_VERSION 11ULL +#define O2NET_PROTOCOL_VERSION 12ULL struct o2net_handshake { __be64 protocol_version; __be64 connector_id;
Two new messages are added to support negotiating hb timeout. Stopping nodes talking old version to mount as they will cause the negotiation fail. Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com> --- fs/ocfs2/cluster/tcp_internal.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)