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.

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

DAOS-15136 client: Switch to using libfused #14077

Draft
wants to merge 24 commits into
base: master
Choose a base branch
from
Draft

Conversation

jolivier23
Copy link
Contributor

Switch to using libfused instead of libfuse3

PR-repos: fused@PR-1:25

Required-githooks: true

Change-Id: I382b96a17a8d503d6cf7321b57050e7ab0c187d4

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.

Copy link

github-actions bot commented Mar 28, 2024

Ticket title is 'we build a libfuse rpm but there is no matching developer build'
Status is 'In Progress'
Labels: 'triaged'
https://daosio.atlassian.net/browse/DAOS-15136

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on EL 9 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14077/2/execution/node/354/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-14077/2/execution/node/327/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on Leap 15.5 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14077/2/execution/node/287/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-14077/2/execution/node/351/log

@jolivier23 jolivier23 force-pushed the jvolivie/fused branch 2 times, most recently from 825db6d to 3105249 Compare March 28, 2024 01:27
@daosbuild1
Copy link
Collaborator

Test stage Build RPM on Leap 15.5 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14077/4/execution/node/349/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on EL 9 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14077/4/execution/node/341/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-14077/4/execution/node/369/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-14077/4/execution/node/353/log

@daosbuild1
Copy link
Collaborator

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

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on EL 9 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14077/5/execution/node/349/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-14077/5/execution/node/309/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-14077/5/execution/node/355/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on Leap 15.5 completed with status UNSTABLE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14077/6/execution/node/287/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on EL 8 completed with status UNSTABLE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14077/6/execution/node/364/log

@daosbuild1
Copy link
Collaborator

Test stage Build DEB on Ubuntu 20.04 completed with status UNSTABLE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14077/6/execution/node/350/log

Switch to using libfused instead of libfuse3

PR-repos: fused@PR-1:28

Required-githooks: true

Change-Id: I382b96a17a8d503d6cf7321b57050e7ab0c187d4
Signed-off-by: Jeff Olivier <jeffolivier@google.com>
Required-githooks: true

Change-Id: Iddf5882e12161746511e598b3cb4ae380af35683
Required-githooks: true

Change-Id: Icdd7235f8a93363ee7cc33a1adb5e3c43956c4aa
Signed-off-by: Jeff Olivier <jeffolivier@google.com>
@daosbuild1
Copy link
Collaborator

Test stage Build RPM on EL 9 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14077/8/execution/node/326/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-14077/8/execution/node/345/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on Leap 15.5 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14077/8/execution/node/329/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-14077/8/execution/node/338/log

debian/changelog Outdated
daos (2.5.101-3) unstable; urgency=medium
[ Ashley M. Pittman ]
* Updated pydaos install process

-- Ashley M. Pittman <ashley.m.pittman@intel.com> Thu, 04 Apr 2024 09:15:00 -0800
>>>>>>> master
Copy link
Contributor

Choose a reason for hiding this comment

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

Bad merge here.

jolivier23 and others added 5 commits April 25, 2024 13:25
Required-githooks: true

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
Required-githooks: true

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
Required-githooks: true

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
Signed-off-by: Ashley Pittman <ashley.m.pittman@intel.com>
Try setting memcheck default to no

Required-githooks: true

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
@@ -140,7 +140,7 @@ def check_ioctl_def(context, ctype):
context.Message(f'Checking if fuse ioctl is type {ctype} ')

# pylint: disable-next=consider-using-f-string
src = """#include <fuse3/fuse_lowlevel.h>
src = """#include <fused/fuse_lowlevel.h>
Copy link
Contributor

Choose a reason for hiding this comment

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

This is for working with various fuse versions, we should replace this with a simple version check.

Comment on lines 313 to 314
commands=[['find', '../fused', '-type', 'f', '-name', '*', '-exec', 'sed', '-i',
's/fuse3/fused/g', '{}', ';'],
Copy link
Contributor

Choose a reason for hiding this comment

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

See comments in daos-stack/fused#1 about -name * and xargs.

@@ -3,7 +3,7 @@ component=daos

[commit_versions]
ARGOBOTS = v1.1
FUSE = fuse-3.16.2
FUSED = master
Copy link
Contributor

Choose a reason for hiding this comment

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

Would it be better to pin this for build reproducibiliy?

Comment on lines 53 to 57
%if (0%{?rhel} >= 8)
BuildRequires: fuse3-devel >= 3
BuildRequires: fused-devel >= 1
%else
BuildRequires: fuse3-devel >= 3.4.2
BuildRequires: fused-devel >= 1
%endif
Copy link
Contributor

Choose a reason for hiding this comment

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

The >= 1 is redundant here as is the %if branch.

Suggested change
%if (0%{?rhel} >= 8)
BuildRequires: fuse3-devel >= 3
BuildRequires: fused-devel >= 1
%else
BuildRequires: fuse3-devel >= 3.4.2
BuildRequires: fused-devel >= 1
%endif
BuildRequires: fused-devel

(Sorry, GH is really mangling this suggestion due to the unchanged lines in it.)

@@ -175,7 +175,7 @@ Requires: mercury >= %{mercury_version}
Requires: libfabric >= %{libfabric_version}
%if (0%{?suse_version} >= 1500)
Requires: libfabric1 >= %{libfabric_version}
Requires: libfuse3-3 >= 3.4.2
Requires: fused >= 1
Copy link
Contributor

Choose a reason for hiding this comment

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

Not at all necessary.

Suggested change
Requires: fused >= 1

%else
Requires: fuse3-devel >= 3.4.2
%endif
Requires: fused >= 1
Copy link
Contributor

Choose a reason for hiding this comment

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

Ditto, if this really should be a change from fused-devel to fused but it's not clear why the -devel is not needed here now.

So either:

Suggested change
Requires: fused >= 1

or

Suggested change
Requires: fused >= 1
Requires: fused-devel

@@ -587,6 +583,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
# No files in a shim package

%changelog
* Thu Apr 25 2024 Jeff Olivier <jeffolivier@google.com> 2.5.101-5
Copy link
Contributor

Choose a reason for hiding this comment

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

This datestamp could use an update.

debian/changelog Outdated
[ Jeff Olivier ]
* Switch from libfuse3 to libfused

-- Jeff Olivier <jeffolivier@google.com> Thu, 25 Apr 2024 10:30:00 +0000
Copy link
Contributor

Choose a reason for hiding this comment

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

Worth bringing this timestamp up-to-date.

Required-githooks: true

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
Features: dfuse

Required-githooks: true

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
Features: dfuse

Required-githooks: true

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
Required-githooks: true

Features: dfuse

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
@jolivier23
Copy link
Contributor Author

I started looking at static compilation and it wasn't trivial (no debian packages in daos-stack/fused, for example) so I thought I would try to finish this.

fused is currently in sync with libfuse head so need some validation but it has all of the patches. I changed tactics to just do a few renames from fuse3 to fused which hopefully won't cause too many future conflicts when syncing.

Required-githooks: true

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
Required-githooks: true

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
Features: dfuse
Allow-unstable-test: true

Required-githooks: true

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
Features: dfuse
Allow-unstable-test: true

Required-githooks: true

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
Allow-unstable-test: true
Features: dfuse

Required-githooks: true

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
@daosbuild1
Copy link
Collaborator

Allow-unstable-test: true
Features: dfuse

Required-githooks: true

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
@daosbuild1
Copy link
Collaborator

Test stage NLT on EL 8.8 completed with status UNSTABLE. https://build.hpdd.intel.com/job/daos-stack/job/daos//view/change-requests/job/PR-14077/21/testReport/

Allow-unstable-test: true
Features: dfuse

Required-githooks: true

Signed-off-by: Jeff Olivier <jeffolivier@google.com>
Features: dfuse
Allow-unstable-test: true
@daosbuild1
Copy link
Collaborator

Test stage NLT on EL 8.8 completed with status UNSTABLE. https://build.hpdd.intel.com/job/daos-stack/job/daos//view/change-requests/job/PR-14077/23/testReport/

@daosbuild1
Copy link
Collaborator

Test stage Functional Hardware Medium completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14077/23/execution/node/1425/log

Allow-unstable-test: true
Features: dfuse
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants