Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backports to address b/336317519 #14561

Merged
merged 5 commits into from
Jun 17, 2024
Merged

Backports to address b/336317519 #14561

merged 5 commits into from
Jun 17, 2024

Conversation

jolivier23
Copy link
Contributor

@jolivier23 jolivier23 commented Jun 12, 2024 •
edited
Loading

DAOS-14679 pool: Report on stopping sp_stopping (#14374)
DAOS-15514 container: fix container destroy failure (#14108)
DAOS-15672 rebuild: Fix pool destroy hangs (#14183)
DAOS-15145 pool: add pool collective function (#13764)
*DAOS-14105 object: collectively punch object (#13493)

  • partial backport, just the bitmap function

Required-githooks: true
Change-Id: I2b21b8121cbdecc79ae49a464a42b1d47fb9be10

Before requesting gatekeeper:

  • Two review approvals and any prior change requests have been resolved.
  • Testing is complete and all tests passed or there is a reason documented in the PR why it should be force landed and forced-landing tag is set.
  • Features: (or Test-tag*) commit pragma was used or there is a reason documented that there are no appropriate tags for this PR.
  • Commit messages follows the guidelines outlined here.
  • Any tests skipped by the ticket being addressed have been run and passed in the PR.

Gatekeeper:

  • You are the appropriate gatekeeper to be landing the patch.
  • The PR has 2 reviews by people familiar with the code, including appropriate owners.
  • Githooks were used. If not, request that user install them and check copyright dates.
  • Checkpatch issues are resolved. Pay particular attention to ones that will show up on future PRs.
  • All builds have passed. Check non-required builds for any new compiler warnings.
  • Sufficient testing is done. Check feature pragmas and test tags and that tests skipped for the ticket are run and now pass with the changes.
  • If applicable, the PR has addressed any potential version compatibility issues.
  • Check the target branch. If it is master branch, should the PR go to a feature branch? If it is a release branch, does it have merge approval in the JIRA ticket.
  • Extra checks if forced landing is requested
    • Review comments are sufficiently resolved, particularly by prior reviewers that requested changes.
    • No new NLT or valgrind warnings. Check the classic view.
    • Quick-build or Quick-functional is not used.
  • Fix the commit message upon landing. Check the standard here. Edit it to create a single commit. If necessary, ask submitter for a new summary.

@jolivier23
Backports to address b/336317519
c355740 
DAOS-14679 pool: Report on stopping sp_stopping (#14374)
DAOS-15145 pool: add pool collective function (#13764)
*DAOS-14105 object: collectively punch object (#13493)

* partial backport, just the bitmap function

Required-githooks: true
Change-Id: I2b21b8121cbdecc79ae49a464a42b1d47fb9be10
Signed-off-by: Jeff Olivier <jeffolivier@google.com>
@github-actions GitHub Actions
Copy link

Bug-tracker data:
Errors are component not formatted correctly,Ticket number prefix incorrect,PR title is malformatted. See https://daosio.atlassian.net/wiki/spaces/DC/pages/11133911069/Commit+Comments,Unable to load ticket data
https://daosio.atlassian.net/browse/Backports

daosbuild1
daosbuild1 reviewed Jun 12, 2024
View reviewed changes
Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. No errors found by checkpatch.

@jolivier23
Copy link
Contributor Author

Tested with reintegrate loop, seems to be working still. This is the other patch of two suggested on DAOS-15386

@jolivier23 jolivier23 requested a review from liw June 12, 2024 22:05
@jolivier23
Copy link
Contributor Author

@liw this is a bit complicated and required some manual work. If you have cycles and could take a look, I'd appreciate it. I was mainly trying to get your patch but the two other patches (or parts of them) seemed useful.

liw
liw requested changes Jun 12, 2024
View reviewed changes
src/object/srv_obj_migrate.c Outdated

rc = ds_pool_thread_collective(pool->sp_uuid,
PO_COMP_ST_NEW | PO_COMP_ST_DOWN | PO_COMP_ST_DOWNOUT,
migrate_fini_one_ult, &arg, 0);
Copy link
Contributor

@liw liw Jun 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Request for changes] The "DAOS-15145 pool: add pool collective function #13764" commit is buggy, and requires at least (I can't find any other myself) the following fixes:

Copy link
Contributor Author

@jolivier23 jolivier23 Jun 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was recommended by @NiuYawei as something that might help with https://daosio.atlassian.net/browse/DAOS-15386

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, this was meant as a reply to the other comment.

@liw
Copy link
Contributor

liw commented Jun 12, 2024

I was mainly trying to get your patch but the two other patches (or parts of them) seemed useful.

Just curious: Why do you want my humble patch? :) It doesn't seem that critical.

liw and others added 2 commits June 12, 2024 20:51
@liw @jolivier23
DAOS-15672 rebuild: Fix pool destroy hangs (#14183)
679d381 
See the Jira ticket for the long story. When releasing resources, for
instance, for stopping a pool, we should attempt on all targets, because
the latest version of the pool map may differ from the version used to
acquire the resources. (And in some cases, we no longer have the
original pool map version in the context.)

Required-githooks: true

Change-Id: I363fbfefae01dd75cc07ded31a2e5b7033f01610
Signed-off-by: Li Wei <wei.g.li@intel.com>
@wangshilong @jolivier23
DAOS-15514 container: fix container destroy failure (#14108)
658f26b 
The container might be opened when the target is up,
but changed to down when closing. We need to attempt to
close down/downout targets regardless; it won't take any action
if it was not opened before. Failure to properly close it will
result in container destruction failing with EBUSY. (See DAOS-15514)

Required-githooks: true

Change-Id: I82e7c507d5f165057d562455e31d7b02d19e1815
Signed-off-by: Wang Shilong <shilong.wang@intel.com>
@jolivier23 jolivier23 requested a review from liw June 13, 2024 02:54
daosbuild1
daosbuild1 reviewed Jun 13, 2024
View reviewed changes
Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. No errors found by checkpatch.

@jolivier23
Copy link
Contributor Author

Bottom line

I was mainly trying to get your patch but the two other patches (or parts of them) seemed useful.

Just curious: Why do you want my humble patch? :) It doesn't seem that critical.

I replied to the wrong comment but ultimately, I'm just trying to take anything that might help stabilize our reintegration workflow

@jolivier23
Merge branch 'google/2.4' into jvolivie/backport_liwei
d1a43a5 
Change-Id: Ib1b044f566d0aaf21e5faa40fb979448b503d7c8
@jolivier23
Empty commit
4c022f8 
Required-githooks: true

Change-Id: I7a4f33eec601e33ca7d23b135b03ed1c36c3e4e4
Signed-off-by: Jeff Olivier <jeffolivier@google.com>
daosbuild1
daosbuild1 reviewed Jun 14, 2024
View reviewed changes
Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. No errors found by checkpatch.

@jolivier23 jolivier23 merged commit 937b5a3 into google/2.4 Jun 17, 2024
33 of 34 checks passed
@jolivier23 jolivier23 deleted the jvolivie/backport_liwei branch June 17, 2024 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daosbuild1 daosbuild1 daosbuild1 left review comments

@liw liw liw approved these changes

@johannlombardi johannlombardi johannlombardi approved these changes

@techbasset techbasset Awaiting requested review from techbasset

@cdavis28 cdavis28 Awaiting requested review from cdavis28

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jolivier23 @liw @johannlombardi @daosbuild1 @wangshilong