[Cluster-devel] [GIT PULL] dlm updates for 6.0

[Cluster-devel] [GIT PULL] dlm updates for 6.0

[David Teigland]

Hi Linus,

Please pull dlm updates from tag:

git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm-6.0

Changes in this set of commits:

. Delay the cleanup of interrupted posix lock requests until the
  user space result arrives. Previously, the immediate cleanup
  would lead to extraneous warnings when the result arrived.

. Tracepoint improvements, e.g. adding the lock resource name.

. Delay the completion of lockspace creation until one full recove
  cycle has completed. This allows more error cases to be returned
  the caller.

. Remove warnings from the locking layer about delayed network rep
  The recently added midcomms warnings are much more useful.

. Begin the process of deprecating two unused lock-timeout-related
  features. These features now require enabling via a Kconfig opti
  and enabling them triggers deprecation warnings. We expect to
  remove the code in v6.2.

Thanks,
Dave

(You can ignore the premature 5.20 pull request from some weeks ago.)

Alexander Aring (19):
      fs: dlm: plock use list_first_entry
      fs: dlm: add pid to debug log
      fs: dlm: change plock interrupted message to debug again
      fs: dlm: use dlm_plock_info for do_unlock_close
      fs: dlm: change posix lock sigint handling
      fs: dlm: change ast and bast trace order
      fs: dlm: remove additional dereference of lksb
      fs: dlm: add resource name to tracepoints
      fs: dlm: update comments about recovery and membership handling
      fs: dlm: call dlm_lsop_recover_prep once
      fs: dlm: make new_lockspace() wait until recovery completes
      fs: dlm: handle recovery result outside of ls_recover
      fs: dlm: add comment about lkb IFL flags
      fs: dlm: fix grammar in lowcomms output
      fs: dlm: remove waiter warnings
      fs: dlm: remove timeout from dlm_user_adopt_orphan
      fs: dlm: add deprecation Kconfig and warnings for timeouts
      fs: dlm: don't use deprecated timeout features by default
      fs: dlm: move kref_put assert for lkb structs


 fs/dlm/Kconfig             |   9 +++
 fs/dlm/Makefile            |   2 +-
 fs/dlm/ast.c               |   4 +-
 fs/dlm/config.c            |  21 ++++---
 fs/dlm/config.h            |   3 +-
 fs/dlm/dlm_internal.h      |  32 ++++++++--
 fs/dlm/lock.c              | 143 ++++++++++++++++++---------------------------
 fs/dlm/lock.h              |  17 +++++-
 fs/dlm/lockspace.c         |  31 +++++++---
 fs/dlm/lowcomms.c          |   4 +-
 fs/dlm/member.c            |  30 +++++-----
 fs/dlm/plock.c             |  51 +++++++++++-----
 fs/dlm/recoverd.c          |  35 +++++++++--
 fs/dlm/user.c              |  21 ++++++-
 include/trace/events/dlm.h | 118 ++++++++++++++++++++++++++++++-------
 15 files changed, 351 insertions(+), 170 deletions(-)

[GIT PULL] dlm updates for 6.0

[David Teigland]

Hi Linus,

Please pull dlm updates from tag:

git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm-6.0

Changes in this set of commits:

. Delay the cleanup of interrupted posix lock requests until the
  user space result arrives. Previously, the immediate cleanup
  would lead to extraneous warnings when the result arrived.

. Tracepoint improvements, e.g. adding the lock resource name.

. Delay the completion of lockspace creation until one full recove
  cycle has completed. This allows more error cases to be returned
  the caller.

. Remove warnings from the locking layer about delayed network rep
  The recently added midcomms warnings are much more useful.

. Begin the process of deprecating two unused lock-timeout-related
  features. These features now require enabling via a Kconfig opti
  and enabling them triggers deprecation warnings. We expect to
  remove the code in v6.2.

Thanks,
Dave

(You can ignore the premature 5.20 pull request from some weeks ago.)

Alexander Aring (19):
      fs: dlm: plock use list_first_entry
      fs: dlm: add pid to debug log
      fs: dlm: change plock interrupted message to debug again
      fs: dlm: use dlm_plock_info for do_unlock_close
      fs: dlm: change posix lock sigint handling
      fs: dlm: change ast and bast trace order
      fs: dlm: remove additional dereference of lksb
      fs: dlm: add resource name to tracepoints
      fs: dlm: update comments about recovery and membership handling
      fs: dlm: call dlm_lsop_recover_prep once
      fs: dlm: make new_lockspace() wait until recovery completes
      fs: dlm: handle recovery result outside of ls_recover
      fs: dlm: add comment about lkb IFL flags
      fs: dlm: fix grammar in lowcomms output
      fs: dlm: remove waiter warnings
      fs: dlm: remove timeout from dlm_user_adopt_orphan
      fs: dlm: add deprecation Kconfig and warnings for timeouts
      fs: dlm: don't use deprecated timeout features by default
      fs: dlm: move kref_put assert for lkb structs


 fs/dlm/Kconfig             |   9 +++
 fs/dlm/Makefile            |   2 +-
 fs/dlm/ast.c               |   4 +-
 fs/dlm/config.c            |  21 ++++---
 fs/dlm/config.h            |   3 +-
 fs/dlm/dlm_internal.h      |  32 ++++++++--
 fs/dlm/lock.c              | 143 ++++++++++++++++++---------------------------
 fs/dlm/lock.h              |  17 +++++-
 fs/dlm/lockspace.c         |  31 +++++++---
 fs/dlm/lowcomms.c          |   4 +-
 fs/dlm/member.c            |  30 +++++-----
 fs/dlm/plock.c             |  51 +++++++++++-----
 fs/dlm/recoverd.c          |  35 +++++++++--
 fs/dlm/user.c              |  21 ++++++-
 include/trace/events/dlm.h | 118 ++++++++++++++++++++++++++++++-------
 15 files changed, 351 insertions(+), 170 deletions(-)

[Cluster-devel] [GIT PULL] dlm updates for 6.0

[Linus Torvalds]

On Mon, Aug 1, 2022 at 7:43 AM David Teigland <teigland@redhat.com> wrote:
>
> (You can ignore the premature 5.20 pull request from some weeks ago.)

Gaah. That was the first thing I pulled this morning because it was
the earliest.

And apparently you've rebased, so I can't even just pull on top.

Gaah. Now I'll have to go back and re-do everything I've done this morning.

PLEASE don't do things like this to me. If you know you are going to
re-do a pull request, let me know early, so that I don't pull the old
one.

                  Linus

Re: [GIT PULL] dlm updates for 6.0

[Linus Torvalds]

On Mon, Aug 1, 2022 at 7:43 AM David Teigland <teigland@redhat.com> wrote:
>
> (You can ignore the premature 5.20 pull request from some weeks ago.)

Gaah. That was the first thing I pulled this morning because it was
the earliest.

And apparently you've rebased, so I can't even just pull on top.

Gaah. Now I'll have to go back and re-do everything I've done this morning.

PLEASE don't do things like this to me. If you know you are going to
re-do a pull request, let me know early, so that I don't pull the old
one.

                  Linus

[Cluster-devel] [GIT PULL] dlm updates for 6.0

[David Teigland]

On Mon, Aug 01, 2022 at 08:46:24AM -0700, Linus Torvalds wrote:
> On Mon, Aug 1, 2022 at 7:43 AM David Teigland <teigland@redhat.com> wrote:
> >
> > (You can ignore the premature 5.20 pull request from some weeks ago.)
> 
> Gaah. That was the first thing I pulled this morning because it was
> the earliest.
> 
> And apparently you've rebased, so I can't even just pull on top.
> 
> Gaah. Now I'll have to go back and re-do everything I've done this morning.
> 
> PLEASE don't do things like this to me. If you know you are going to
> re-do a pull request, let me know early, so that I don't pull the old
> one.

Very sorry about that.  (The obvious change there was updating the version
numbers in the deprecation messages to 6.2, and I should have just sent a
seprate patch to fix those up.)

Dave

Re: [GIT PULL] dlm updates for 6.0

[David Teigland]

On Mon, Aug 01, 2022 at 08:46:24AM -0700, Linus Torvalds wrote:
> On Mon, Aug 1, 2022 at 7:43 AM David Teigland <teigland@redhat.com> wrote:
> >
> > (You can ignore the premature 5.20 pull request from some weeks ago.)
> 
> Gaah. That was the first thing I pulled this morning because it was
> the earliest.
> 
> And apparently you've rebased, so I can't even just pull on top.
> 
> Gaah. Now I'll have to go back and re-do everything I've done this morning.
> 
> PLEASE don't do things like this to me. If you know you are going to
> re-do a pull request, let me know early, so that I don't pull the old
> one.

Very sorry about that.  (The obvious change there was updating the version
numbers in the deprecation messages to 6.2, and I should have just sent a
seprate patch to fix those up.)

Dave

[Cluster-devel] [GIT PULL] dlm updates for 6.0

[David Teigland]

On Mon, Aug 01, 2022 at 10:50:28AM -0500, David Teigland wrote:
> On Mon, Aug 01, 2022 at 08:46:24AM -0700, Linus Torvalds wrote:
> > On Mon, Aug 1, 2022 at 7:43 AM David Teigland <teigland@redhat.com> wrote:
> > >
> > > (You can ignore the premature 5.20 pull request from some weeks ago.)
> > 
> > Gaah. That was the first thing I pulled this morning because it was
> > the earliest.
> > 
> > And apparently you've rebased, so I can't even just pull on top.
> > 
> > Gaah. Now I'll have to go back and re-do everything I've done this morning.
> > 
> > PLEASE don't do things like this to me. If you know you are going to
> > re-do a pull request, let me know early, so that I don't pull the old
> > one.
> 
> Very sorry about that.  (The obvious change there was updating the version
> numbers in the deprecation messages to 6.2, and I should have just sent a
> seprate patch to fix those up.)

At risk of compounding your trouble, I could have added that you can use
the original merge and have me send the fixup.

Dave

Re: [GIT PULL] dlm updates for 6.0

[David Teigland]

On Mon, Aug 01, 2022 at 10:50:28AM -0500, David Teigland wrote:
> On Mon, Aug 01, 2022 at 08:46:24AM -0700, Linus Torvalds wrote:
> > On Mon, Aug 1, 2022 at 7:43 AM David Teigland <teigland@redhat.com> wrote:
> > >
> > > (You can ignore the premature 5.20 pull request from some weeks ago.)
> > 
> > Gaah. That was the first thing I pulled this morning because it was
> > the earliest.
> > 
> > And apparently you've rebased, so I can't even just pull on top.
> > 
> > Gaah. Now I'll have to go back and re-do everything I've done this morning.
> > 
> > PLEASE don't do things like this to me. If you know you are going to
> > re-do a pull request, let me know early, so that I don't pull the old
> > one.
> 
> Very sorry about that.  (The obvious change there was updating the version
> numbers in the deprecation messages to 6.2, and I should have just sent a
> seprate patch to fix those up.)

At risk of compounding your trouble, I could have added that you can use
the original merge and have me send the fixup.

Dave

[Cluster-devel] [GIT PULL] dlm updates for 6.0

[Linus Torvalds]

On Mon, Aug 1, 2022 at 8:56 AM David Teigland <teigland@redhat.com> wrote:
>
> At risk of compounding your trouble, I could have added that you can use
> the original merge and have me send the fixup.

Well, I only had something like 4 other merges on top, none of them
*that* complicated.

And I hadn't pushed out, so I just redid them.

I did notice your "v2" pull request fairly quickly, because I try to
do my pulls (when I have lots of them, like at the beginning of the
merge window) in some kind of "order of areas", so I was doing
filesystem and vfs stuff, and  your v2 ended up showing up in that
bunch too, and I hadn't done too much.

I doubt I would have needed help with the conflicts, but I decided to
not even look at them, because even with them resolved it would just
have been ugly to have that pointless duplication from the rebase when
I could just start from scratch again.

But again: please don't rebase stuff you have already exposed to
others. It causes real issues. This was just one example of it.

And if you *do* have to rebase for a real technical reason ("Oh, that
was a disaster, it absolutely *must* be fixed"), please let involved
people know asap.

And a version number change is not a "huge disaster, must rebase".

           Linus

Re: [GIT PULL] dlm updates for 6.0

[Linus Torvalds]

On Mon, Aug 1, 2022 at 8:56 AM David Teigland <teigland@redhat.com> wrote:
>
> At risk of compounding your trouble, I could have added that you can use
> the original merge and have me send the fixup.

Well, I only had something like 4 other merges on top, none of them
*that* complicated.

And I hadn't pushed out, so I just redid them.

I did notice your "v2" pull request fairly quickly, because I try to
do my pulls (when I have lots of them, like at the beginning of the
merge window) in some kind of "order of areas", so I was doing
filesystem and vfs stuff, and  your v2 ended up showing up in that
bunch too, and I hadn't done too much.

I doubt I would have needed help with the conflicts, but I decided to
not even look at them, because even with them resolved it would just
have been ugly to have that pointless duplication from the rebase when
I could just start from scratch again.

But again: please don't rebase stuff you have already exposed to
others. It causes real issues. This was just one example of it.

And if you *do* have to rebase for a real technical reason ("Oh, that
was a disaster, it absolutely *must* be fixed"), please let involved
people know asap.

And a version number change is not a "huge disaster, must rebase".

           Linus

[Cluster-devel] [GIT PULL] dlm updates for 6.0

[David Teigland]

On Mon, Aug 01, 2022 at 09:17:30AM -0700, Linus Torvalds wrote:
> But again: please don't rebase stuff you have already exposed to
> others. It causes real issues. This was just one example of it.
> 
> And if you *do* have to rebase for a real technical reason ("Oh, that
> was a disaster, it absolutely *must* be fixed"), please let involved
> people know asap.
> 
> And a version number change is not a "huge disaster, must rebase".

Yep, thanks for the comments. For some reason this escaped the usual flags
that should have gone off in my head about rebasing.

Dave

Re: [GIT PULL] dlm updates for 6.0

[David Teigland]

On Mon, Aug 01, 2022 at 09:17:30AM -0700, Linus Torvalds wrote:
> But again: please don't rebase stuff you have already exposed to
> others. It causes real issues. This was just one example of it.
> 
> And if you *do* have to rebase for a real technical reason ("Oh, that
> was a disaster, it absolutely *must* be fixed"), please let involved
> people know asap.
> 
> And a version number change is not a "huge disaster, must rebase".

Yep, thanks for the comments. For some reason this escaped the usual flags
that should have gone off in my head about rebasing.

Dave

[Cluster-devel] [GIT PULL] dlm updates for 6.0

[pr-tracker-bot]

The pull request you sent on Mon, 1 Aug 2022 09:43:29 -0500:

> git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm-6.0

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/eb43bbac4c3c97b34b72e1dbd91544ee0d48e8d6

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

Re: [GIT PULL] dlm updates for 6.0

[pr-tracker-bot]

The pull request you sent on Mon, 1 Aug 2022 09:43:29 -0500:

> git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm-6.0

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/eb43bbac4c3c97b34b72e1dbd91544ee0d48e8d6

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html