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

Fix the issue where compiling containers-storage with exclude_disk_qu… #1982

Merged

Conversation

xuegege5290
Copy link

Reference:
#1978 (comment)

To ensure that getComposeFsHelper and others are included, I attempted to move the ReadWriteDiskUsage function from no nocgo into a separate file, creating overlay_disk_quota_unsupported.go. However, the overlay_cgo.go file should not be moved out as it would then be an empty file, and it does not affect the existing logic. What are your thoughts on this modification?

Compile:

root@syx:/storage# make clean
rm -f -f containers-storage containers-storage.* docs/*.1 docs/*.5
root@syx:/storage# make binary
go build -compiler gc -tags " libdm_no_deferred_remove   exclude_disk_quota"  ./cmd/containers-storage
root@syx:/storage# vim Makefile 
root@syx:/storage# make binary
go build -compiler gc -tags " libdm_no_deferred_remove  "  ./cmd/containers-storage
root@syx:/storage#

Copy link
Collaborator

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

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

Thanks!

The approach LGTM, just one more cleanup.

(You can force-push over your existing branch instead of opening a new PR.)

drivers/overlay/overlay_cgo.go Show resolved Hide resolved
@rhatdan
Copy link
Member

rhatdan commented Jun 23, 2024

Squash your commits and make sure the one commit is signed.

git rebase -i origin
git push --force

…ota enabled on the Linux CGO platform results in an error indicating that d.quotaCtl.GetDiskUsage is not defined.

Signed-off-by: Shi Xue <shixue@cestc.com>

Fix the issue where compiling containers-storage with exclude_disk_quota enabled on the Linux CGO platform results in an error indicating that d.quotaCtl.GetDiskUsage is not defined.

Signed-off-by: Shi Xue <shixue@cestc.com>
@xuegege5290
Copy link
Author

Squash your commits and make sure the one commit is signed.

git rebase -i origin git push --force

Thank you for your reminder, I have made the modifications as per the standard requirements, thank you again.

@rhatdan
Copy link
Member

rhatdan commented Jun 24, 2024

/approve
/lgtm

Copy link
Contributor

openshift-ci bot commented Jun 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan, xuegege5290

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@rhatdan
Copy link
Member

rhatdan commented Jun 24, 2024

Thanks @xuegege5290

@openshift-merge-bot openshift-merge-bot bot merged commit 97d59be into containers:main Jun 24, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants