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

Merged
merged 2 commits into from
Jan 25, 2024
Merged

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

merged 2 commits into from
Jan 25, 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.

Required-githooks: true

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
1964020 
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.

Required-githooks: true
Signed-off-by: Wang Shilong <[email protected]>
@github-actions GitHub Actions
Copy link

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 'Open'
Labels: 'interop'
https://daosio.atlassian.net/browse/DAOS-14799

@wangshilong wangshilong requested review from kccain, liw and wangdi1 January 19, 2024 03:11
@daosbuild1
Copy link
Collaborator

Test stage Functional Hardware Medium completed with status UNSTABLE. https://build.hpdd.intel.com/job/daos-stack/job/daos//view/change-requests/job/PR-13634/1/testReport/

liw
liw approved these changes Jan 21, 2024
View reviewed changes
Copy link
Contributor

@liw liw left a comment

Choose a reason for hiding this comment

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

We might want to document somewhere the known issue that containers created by some 2.4 releases (assuming that this patch will also land to release/2.4) in 2.2 pools may not be destroyed completely if the servers are downgraded to 2.2.

@wangshilong
Copy link
Contributor Author

We might want to document somewhere the known issue that containers created by some 2.4 releases (assuming that this patch will also land to release/2.4) in 2.2 pools may not be destroyed completely if the servers are downgraded to 2.2.

I agreed, i have no idea where we should document for this? i suppose it should be documented in release 2.4 notes somewhere. maybe @ipoddubn or @Michael-Hennecke have some ideas?

kccain
kccain approved these changes Jan 22, 2024
View reviewed changes
Copy link
Contributor

@kccain kccain left a comment

Choose a reason for hiding this comment

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

looks good for a patch that would be cherry-picked to release/2.4 branch (will it be?).

On master (daos 2.6, for which DAOS_POOL_GLOBAL_VERSION=3) will the parts of the code that executes for daos 2.2 pools even get run? i.e., when a pool's global_ver=1 < DAOS_POOL_GLOBAL_VERSION_WITH_OIT_OID_KVS=2. Since in 2.6 I don't think will even allow a pool handle connection to a 2.2 pool?

@wangshilong
Copy link
Contributor Author

looks good for a patch that would be cherry-picked to release/2.4 branch (will it be?).

On master (daos 2.6, for which DAOS_POOL_GLOBAL_VERSION=3) will the parts of the code that executes for daos 2.2 pools even get run? i.e., when a pool's global_ver=1 < DAOS_POOL_GLOBAL_VERSION_WITH_OIT_OID_KVS=2. Since in 2.6 I don't think will even allow a pool handle connection to a 2.2 pool?

Yup, in generally we don't support jump upgrading. but in the codes we don't forbid it, eg just for upgrading.

I think this better go to 2.4, let's try to land it master firstly..

@wangshilong wangshilong requested a review from a team January 24, 2024 12:26
@NiuYawei NiuYawei merged commit 2a2e2f1 into master Jan 25, 2024
47 of 48 checks passed
@NiuYawei NiuYawei deleted the shilongw/DAOS-14799 branch January 25, 2024 01:52
wangshilong added a commit that referenced this pull request Jan 25, 2024
@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]>
daltonbohning pushed a commit that referenced this pull request Mar 15, 2024
@wangshilong
DAOS-14799 container: interoperability fix for OIT OID KVS (#13634) (#…
0d7c5f8 
…13662)

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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kccain kccain kccain approved these changes

@liw liw liw approved these changes

@wangdi1 wangdi1 Awaiting requested review from wangdi1

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

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