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-10828 mercury: Update to mercury 2.2.0rc6 #9329

Merged
merged 1 commit into from
Jul 13, 2022
Merged

DAOS-10828 mercury: Update to mercury 2.2.0rc6 #9329

merged 1 commit into from
Jul 13, 2022

Conversation

soumagne
Copy link
Collaborator

@soumagne soumagne commented Jun 10, 2022 •
edited
Loading

  • Switch UCX to use active messages and fix UCX issues with hostname parsing / address key not set

  • Enable CXI and OPX as supported plugins

  • Fix ctrl-c issue that was happening in DAOS when interrupting a bulk transfer that required usage of overflow mechanism

  • Update Cart to use new CXI init string

  • Remove dependency on mercury_util and use HG_Set_log routines

  • Remove rpath fix as mercury now automatically adds rpath info

  • Additional fixes and new features: Full notes: https://github.com/mercury-hpc/mercury/blob/v2.2.0rc6/Documentation/CHANGES.md

PR-repos: mercury@PR-79

@soumagne soumagne requested a review from a team as a code owner June 10, 2022 22:43
frostedcmos
frostedcmos previously approved these changes Jun 10, 2022
View reviewed changes
daosbuild1
daosbuild1 reviewed Jun 10, 2022
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.

brianjmurrell
brianjmurrell previously requested changes Jun 21, 2022
View reviewed changes
Copy link
Contributor

@brianjmurrell brianjmurrell left a comment

Choose a reason for hiding this comment

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

I think you also want to update

daos/debian/control

Line 13 in fbcb551

libmercury-dev (>= 2.1.0~rc4-8),
, yes?

@soumagne soumagne force-pushed the soumagne/mercury-2.2.0 branch from fbcb551 to 0589a3f Compare June 27, 2022 23:55
@soumagne soumagne requested a review from a team as a code owner June 27, 2022 23:55
@soumagne soumagne changed the title DAOS-10828 mercury: Update to mercury 2.2.0rc3 DAOS-10828 mercury: Update to mercury 2.2.0rc6 Jun 27, 2022
daosbuild1
daosbuild1 reviewed Jun 27, 2022
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.

@soumagne soumagne requested a review from jolivier23 June 27, 2022 23:59
@daosbuild1
Copy link
Collaborator

Test stage Build DEB on Ubuntu 20.04 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-9329/2/execution/node/370/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on EL 8 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-9329/2/execution/node/343/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on Leap 15 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-9329/2/execution/node/346/log

@daosbuild1
Copy link
Collaborator

Test stage Build on Leap 15 with Intel-C and TARGET_PREFIX completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-9329/2/execution/node/502/log

@daosbuild1
Copy link
Collaborator

Test stage Build on CentOS 7 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-9329/2/execution/node/483/log

@soumagne soumagne force-pushed the soumagne/mercury-2.2.0 branch from 0589a3f to eb9b852 Compare June 28, 2022 00:45
daosbuild1
daosbuild1 reviewed Jun 28, 2022
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.

@daosbuild1
Copy link
Collaborator

Test stage Build DEB on Ubuntu 20.04 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-9329/3/execution/node/378/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on EL 8 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-9329/3/execution/node/346/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on Leap 15 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-9329/3/execution/node/343/log

jgmoore-or
jgmoore-or previously approved these changes Jun 28, 2022
View reviewed changes
@soumagne soumagne force-pushed the soumagne/mercury-2.2.0 branch from eb9b852 to 27ac59a Compare June 28, 2022 17:06
daosbuild1
daosbuild1 reviewed Jun 28, 2022
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 previously approved these changes Jun 28, 2022
View reviewed changes
@soumagne
Copy link
Collaborator Author

@brianjmurrell I addressed your previous comment. I'm honestly not really sure if we really need those but I did update it, thanks for letting me know about it.

@brianjmurrell
Copy link
Contributor

@soumagne:

soumagne force-pushed the soumagne/mercury-2.2.0 branch from eb9b852 to 27ac59a Compare18 hours ago

Please note that we do not allow force-pushing once reviews have been requested as the force push doesn't allow one to incrementally review (only) what has changed since their last review was done.

@brianjmurrell brianjmurrell dismissed their stale review June 29, 2022 11:32

Change was made

@brianjmurrell brianjmurrell self-requested a review June 29, 2022 11:32
brianjmurrell
brianjmurrell reviewed Jun 29, 2022
View reviewed changes
Copy link
Contributor

@brianjmurrell brianjmurrell left a comment

Choose a reason for hiding this comment

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

Packaging changes LGTM but I will let somebody else more familiar with the code changes give a +1.

@soumagne
Copy link
Collaborator Author

there is already a ticket filed in the list for the test that fails:
https://daosio.atlassian.net/browse/DAOS-10923

frostedcmos
frostedcmos previously approved these changes Jun 30, 2022
View reviewed changes
@soumagne soumagne requested a review from a team June 30, 2022 14:55
@soumagne
Copy link
Collaborator Author

To merge this, daos-stack/mercury#79 must also be merged

@soumagne soumagne added the priority Ticket has high priority (automatically managed) label Jul 11, 2022
@github-actions
Copy link

github-actions bot commented Jul 12, 2022 •
edited
Loading

Bug-tracker data:
Ticket title is 'Update to mercury 2.2.0'
Status is 'In Progress'
Job should run at elevated priority (2)
Errors are Unknown component
https://daosio.atlassian.net/browse/DAOS-10828

@github-actions github-actions bot removed the priority Ticket has high priority (automatically managed) label Jul 12, 2022
daosbuild1
daosbuild1 reviewed Jul 12, 2022
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.

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on EL 8 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-9329/5/execution/node/323/log

@daosbuild1
Copy link
Collaborator

Test stage Build DEB on Ubuntu 20.04 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-9329/5/execution/node/371/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on Leap 15 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-9329/5/execution/node/347/log

@soumagne
DAOS-10828 mercury: Update to mercury 2.2.0rc6
918e15a 
Update Cart to use new CXI init string

Remove dependency on mercury_util and use HG_Set_log routines

Remove rpath fix as mercury now automatically adds rpath info

PR-repos: mercury@PR-79
Signed-off-by: Jerome Soumagne <jerome.soumagne@intel.com>
@soumagne soumagne dismissed stale reviews from frostedcmos and jolivier23 via 918e15a July 12, 2022 00:11
@soumagne soumagne force-pushed the soumagne/mercury-2.2.0 branch from 5a0413c to 918e15a Compare July 12, 2022 00:11
daosbuild1
daosbuild1 reviewed Jul 12, 2022
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.

@ashleypittman
Copy link
Contributor

@soumagne to have this ticket marked as Priority you'd need to set "Required for Version" as "2.4 Community Release" in the ticket.

@soumagne
Copy link
Collaborator Author

@ashleypittman ah thanks, any idea also on how I fix the error "unknown components" in the ticket check?

@ashleypittman
Copy link
Contributor

@ashleypittman ah thanks, any idea also on how I fix the error "unknown components" in the ticket check?

Yes. This check is brand new so we're still finding our feet and don't necessarily expect it to pass yet, however it's checking the title of the PR (which will then go on to be the first line of the commit when landed). In this case the title is "DAOS-10828 mercury: Update to mercury 2.2.0rc6" and the string "mercury" is failing at this check.

https://github.com/daos-stack/daos/blob/master/ci/jira_query.py#L71-L73

It isn't something we'd had a strong policy on before, we could either just add mercury to VALID_COMPONENTS, or perhaps define a new component for 3rd party upgrades. It looks like we've used all of build,mercury,libfabric,ofi,spdk,pmdk and misc when modifying utils/build.config in the past. @jolivier23 might have an opinion here and we should improve the process but it needn't block this PR moving forward.

brianjmurrell
brianjmurrell approved these changes Jul 13, 2022
View reviewed changes
Copy link
Contributor

@brianjmurrell brianjmurrell left a comment

Choose a reason for hiding this comment

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

If you found a need to push anything more to this PR, even if it's just a merge, you could freshen up the dates in the debian and rpm changelogs.

@jolivier23 jolivier23 merged commit 8de5627 into master Jul 13, 2022
@jolivier23 jolivier23 deleted the soumagne/mercury-2.2.0 branch July 13, 2022 16:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jolivier23 jolivier23 jolivier23 approved these changes

@brianjmurrell brianjmurrell brianjmurrell approved these changes

@frostedcmos frostedcmos Awaiting requested review from frostedcmos

@jgmoore-or jgmoore-or Awaiting requested review from jgmoore-or

@daosbuild1 daosbuild1 Awaiting requested review from daosbuild1

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@soumagne @daosbuild1 @brianjmurrell @ashleypittman @jolivier23 @jgmoore-or @frostedcmos