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

DAOS-14799 container: interoperability fix for OIT OID KVS (#13634) #13662

Merged
merged 3 commits into from
Mar 15, 2024
Merged

DAOS-14799 container: interoperability fix for OIT OID KVS (#13634) #13662

merged 3 commits into from
Mar 15, 2024

Conversation

wangshilong
Copy link
Contributor

1.The OIT OID KVS will be only created if the pool global version is greater than or equal to 2. Otherwise, pool upgrade will fail with EEXIST. (Thanks Li Wei's pointing this out)

  1. To walk around the upgrade failure, the upgrade process will skip the creation of OIT OID KVS if it already exists.

  2. When destroying a container, if the OIT OID KVS doesn't exist, it will be skipped for destruction.

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 watchers.
  • 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.

@wangshilong
DAOS-14799 container: interoperability fix for OIT OID KVS (#13634)
dc3becf 
1.The OIT OID KVS will be only created if the pool global version
is greater than or equal to 2. Otherwise, pool upgrade will fail with EEXIST.
(Thanks Li Wei's pointing this out)

2. To walk around the upgrade failure, the upgrade process will skip the
creation of OIT OID KVS if it already exists.

3. When destroying a container, if the OIT OID KVS doesn't exist,
it will be skipped for destruction.

Signed-off-by: Wang Shilong <[email protected]>
@wangshilong wangshilong requested review from liw and kccain January 25, 2024 02:07
@wangshilong wangshilong added the clean-cherry-pick Cherry-pick from another branch that did not require additional edits label Jan 25, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 25, 2024 •
edited
Loading

Bug-tracker data:
Ticket title is '2.4.1 client, 2.4.1 server, 2.2.0 pool, pool upgrade fails on data created with IOR HDF5 + VOL'
Status is 'Awaiting backport'
Labels: 'interop,scrubbed'
Job should run at elevated priority (1)
https://daosio.atlassian.net/browse/DAOS-14799

@wangshilong wangshilong added the release-2.4 PR is eventually targeted for 2.4 label Jan 25, 2024
daosbuild1
daosbuild1 previously requested changes Jan 25, 2024
View reviewed changes
src/container/srv_container.c Outdated Show resolved Hide resolved
@daosbuild1
Copy link
Collaborator

Test stage checkpatch completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-13662/1/execution/node/154/log

@wangshilong
style fix
b536629 
Required-githooks: true
Signed-off-by: Wang Shilong <[email protected]>
@github-actions github-actions bot added priority Ticket has high priority (automatically managed) and removed release-2.4 PR is eventually targeted for 2.4 labels Jan 26, 2024
@daosbuild1 daosbuild1 dismissed their stale review January 26, 2024 03:34

Updated patch

daosbuild1
daosbuild1 reviewed Jan 26, 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.

@wangshilong wangshilong requested a review from a team February 20, 2024 01:49
@wangshilong wangshilong added release-2.4 PR is eventually targeted for 2.4 and removed clean-cherry-pick Cherry-pick from another branch that did not require additional edits labels Feb 20, 2024
@wangshilong wangshilong requested review from a team as code owners March 4, 2024 06:44
@github-actions github-actions bot removed the release-2.4 PR is eventually targeted for 2.4 label Mar 4, 2024
daosbuild1
daosbuild1 reviewed Mar 4, 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.

@daltonbohning daltonbohning added clean-cherry-pick Cherry-pick from another branch that did not require additional edits unclean-cherry-pick Indicates that a cherry-pick had merge conflicts that needed resolving. and removed clean-cherry-pick Cherry-pick from another branch that did not require additional edits labels Mar 15, 2024
@daltonbohning daltonbohning merged commit 0d7c5f8 into release/2.4 Mar 15, 2024
33 of 36 checks passed
@daltonbohning daltonbohning deleted the shilongw/DAOS-14799-2.4 branch March 15, 2024 17:36
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

@kccain kccain kccain approved these changes

@liw liw liw approved these changes

Assignees
No one assigned
Labels
priority Ticket has high priority (automatically managed) unclean-cherry-pick Indicates that a cherry-pick had merge conflicts that needed resolving.
Milestone
No milestone
Development

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