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

Fix the problem of using option to append Dataset public option #3454

Merged
merged 2 commits into from
Sep 16, 2023
Merged

Fix the problem of using option to append Dataset public option #3454

merged 2 commits into from
Sep 16, 2023

Conversation

lgy1027
Copy link
Contributor

@lgy1027 lgy1027 commented Sep 14, 2023

Fix error when using sharedOptions to mount multiple mounts

image

@fluid-e2e-bot
Copy link

fluid-e2e-bot bot commented Sep 14, 2023

Hi @lgy1027. Thanks for your PR.

I'm waiting for a fluid-cloudnative member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

cheyang
cheyang reviewed Sep 15, 2023
View reviewed changes
pkg/ddc/alluxio/ufs_internal.go
@@ -372,8 +372,8 @@ func (e *AlluxioEngine) genUFSMountOptions(m datav1alpha1.Mount, SharedOptions m

// initialize alluxio mount options
mOptions := map[string]string{}
if len(SharedOptions) > 0 {
mOptions = SharedOptions
for k, v := range SharedOptions {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could you also add unit test for the fix? thanks very much!

Copy link
Collaborator

Choose a reason for hiding this comment

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

I have added unit test: generating UFS mount options multiple times via functions genUFSMountOptions in AlluxioEngine

@sonarqubecloud
Copy link

sonarqubecloud bot commented Sep 15, 2023 •
edited
Loading

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 7 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@codecov
Copy link

codecov bot commented Sep 15, 2023

Codecov Report

Merging #3454 (d8db9de) into master (5076ef0) will increase coverage by 0.03%.
Report is 3 commits behind head on master.
The diff coverage is 87.50%.

❗ Current head d8db9de differs from pull request most recent head e74f047. Consider uploading reports for the commit e74f047 to get more accurate results

@@            Coverage Diff             @@
##           master    #3454      +/-   ##
==========================================
+ Coverage   64.24%   64.28%   +0.03%     
==========================================
  Files         442      442              
  Lines       26441    26452      +11     
==========================================
+ Hits        16988    17005      +17     
+ Misses       7444     7441       -3     
+ Partials     2009     2006       -3
Files Changed Coverage Δ
pkg/ddc/jindocache/transform.go 67.38% <85.71%> (+1.31%) ⬆️
pkg/ddc/alluxio/ufs_internal.go 28.51% <100.00%> (ø)

cheyang
cheyang approved these changes Sep 16, 2023
View reviewed changes
Copy link
Collaborator

@cheyang cheyang left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@fluid-e2e-bot fluid-e2e-bot bot added the lgtm label Sep 16, 2023
@fluid-e2e-bot
Copy link

fluid-e2e-bot bot commented Sep 16, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cheyang

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

@fluid-e2e-bot fluid-e2e-bot bot merged commit f0de847 into fluid-cloudnative:master Sep 16, 2023
@cheyang
Copy link
Collaborator

cheyang commented Sep 16, 2023

Thanks very much for your contribution, @lgy1027 @zhang-x-z

cheyang pushed a commit to cheyang/fluid that referenced this pull request Sep 16, 2023
@lgy1027 @zhang-x-z @cheyang
Fix the problem of using option to append Dataset public option (flui…
76237e7 
…d-cloudnative#3454)

* Fix the problem of using option to append Dataset public option

Signed-off-by: lgy1027 <[email protected]>

* Add Unit Test for alluxio engine genUFSMountOptions

Signed-off-by: ZhangXiaozheng <[email protected]>

---------

Signed-off-by: lgy1027 <[email protected]>
Signed-off-by: ZhangXiaozheng <[email protected]>
Co-authored-by: liguoyu3564 <[email protected]>
Co-authored-by: ZhangXiaozheng <[email protected]>
cheyang pushed a commit to cheyang/fluid that referenced this pull request Sep 16, 2023
@lgy1027 @zhang-x-z @cheyang
Fix the problem of using option to append Dataset public option (flui…
1d09bfe 
…d-cloudnative#3454)

* Fix the problem of using option to append Dataset public option

Signed-off-by: lgy1027 <[email protected]>

* Add Unit Test for alluxio engine genUFSMountOptions

Signed-off-by: ZhangXiaozheng <[email protected]>

---------

Signed-off-by: lgy1027 <[email protected]>
Signed-off-by: ZhangXiaozheng <[email protected]>
Co-authored-by: liguoyu3564 <[email protected]>
Co-authored-by: ZhangXiaozheng <[email protected]>
Signed-off-by: cheyang <[email protected]>
cheyang added a commit that referenced this pull request Sep 18, 2023
@cheyang @lgy1027 @zhang-x-z
Fix the problem of using option to append Dataset public option (#3454)…
02f70ac 
… (#3459)

* Fix the problem of using option to append Dataset public option (#3454)

* Fix the problem of using option to append Dataset public option

Signed-off-by: lgy1027 <[email protected]>

* Add Unit Test for alluxio engine genUFSMountOptions

Signed-off-by: ZhangXiaozheng <[email protected]>

---------

Signed-off-by: lgy1027 <[email protected]>
Signed-off-by: ZhangXiaozheng <[email protected]>
Co-authored-by: liguoyu3564 <[email protected]>
Co-authored-by: ZhangXiaozheng <[email protected]>
Signed-off-by: cheyang <[email protected]>

* Fix api issue for genUFSMountOptions, To #51793350

Signed-off-by: cheyang <[email protected]>

---------

Signed-off-by: lgy1027 <[email protected]>
Signed-off-by: ZhangXiaozheng <[email protected]>
Signed-off-by: cheyang <[email protected]>
Co-authored-by: li_max <[email protected]>
Co-authored-by: liguoyu3564 <[email protected]>
Co-authored-by: ZhangXiaozheng <[email protected]>
cheyang pushed a commit to cheyang/fluid that referenced this pull request Oct 3, 2023
@lgy1027 @zhang-x-z @cheyang
Fix the problem of using option to append Dataset public option (flui…
8e0985f 
…d-cloudnative#3454)

* Fix the problem of using option to append Dataset public option

Signed-off-by: lgy1027 <[email protected]>

* Add Unit Test for alluxio engine genUFSMountOptions

Signed-off-by: ZhangXiaozheng <[email protected]>

---------

Signed-off-by: lgy1027 <[email protected]>
Signed-off-by: ZhangXiaozheng <[email protected]>
Co-authored-by: liguoyu3564 <[email protected]>
Co-authored-by: ZhangXiaozheng <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhang-x-z zhang-x-z zhang-x-z left review comments

@cheyang cheyang cheyang approved these changes

Assignees

@cheyang cheyang

Labels
approved lgtm needs-ok-to-test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lgy1027 @cheyang @zhang-x-z