bugfix: fix csi plugin concurrency issue on FuseRecovery and NodeUnpublishVolume #3448
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: trafalgarzzz <trafalgarz@outlook.com>
Signed-off-by: trafalgarzzz <trafalgarz@outlook.com>
Signed-off-by: trafalgarzzz <trafalgarz@outlook.com>
Signed-off-by: trafalgarzzz <trafalgarz@outlook.com>
|
/test fluid-e2e |
cheyang
reviewed
Sep 11, 2023
pkg/csi/plugins/nodeserver.go
Outdated
| } | ||
| // targetPath is corrupted |
There was a problem hiding this comment.
I suggest using if-else to make it easy to understand.
Signed-off-by: trafalgarzzz <trafalgarz@outlook.com>
zwwhdls
reviewed
Sep 12, 2023
pkg/csi/recover/recover.go
Outdated
| should, err := r.shouldRecover(point.MountPath) | ||
| if err != nil { | ||
| glog.Warningf("FuseRecovery: found path %s which is unable to recover due to error %v, skip it", point.MountPath, err) | ||
| continue |
There was a problem hiding this comment.
If continue here, the lock of mountPath will not release.
There was a problem hiding this comment.
Fixed. Thx for pointing this!
Signed-off-by: trafalgarzzz <trafalgarz@outlook.com>
Codecov Report
@@ Coverage Diff @@
## master #3448 +/- ##
==========================================
- Coverage 64.28% 64.24% -0.04%
==========================================
Files 442 442
Lines 26420 26441 +21
==========================================
+ Hits 16984 16988 +4
- Misses 7430 7444 +14
- Partials 2006 2009 +3
|
Signed-off-by: trafalgarzzz <trafalgarz@outlook.com>
|
/test fluid-e2e |
cheyang
reviewed
Sep 12, 2023
pkg/csi/recover/recover.go
Outdated
| brokenMounts, err := mountinfo.GetBrokenMountPoints() | ||
| if err != nil { | ||
| glog.Error(err) | ||
| return | ||
| } | ||
|
|
||
| for _, point := range brokenMounts { | ||
| glog.V(4).Infof("Get broken mount point: %v", point) | ||
| if lock := r.locks.TryAcquire(point.MountPath); !lock { |
There was a problem hiding this comment.
How about using r.checkAndRecoverMounts() to wrap the logic in the loop? We can use defer r.locks.Release to make the logic simper.
There was a problem hiding this comment.
Thx for the suggestion. Moved it into func doRecover
Signed-off-by: trafalgarzzz <trafalgarz@outlook.com>
|
Kudos, SonarCloud Quality Gate passed!
|
|
/test fluid-e2e |
|
[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 |
TrafalgarZZZ
added a commit
to TrafalgarZZZ/fluid
that referenced
this pull request
Sep 13, 2023
…blishVolume (fluid-cloudnative#3448) * Add comments for NodeUnpublishVolume Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> * Refactor NodeUnpublishVolume code Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> * FuseRecovery uses volume locks to avoid race conditions Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> * Refactor node server with codes.Internal error code Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> * Rename CSI Config to RunningContext Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> * Fix github actions checks Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> * Fix lock release Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> * Refactor recover logic Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> --------- Signed-off-by: trafalgarzzz <trafalgarz@outlook.com>
fluid-e2e-bot bot
pushed a commit
that referenced
this pull request
Sep 13, 2023
…and NodeUnpublishVolume (#3448) (#3453) * Bugfix: ignore not connected error in NodeUnpublishVolume (#3445) * ignore not connected error in NodeUnpublishVolume Signed-off-by: wangshulin <wangshulin@smail.nju.edu.cn> * fix check nil error Signed-off-by: wangshulin <wangshulin@smail.nju.edu.cn> * simplify error judgment Signed-off-by: wangshulin <wangshulin@smail.nju.edu.cn> --------- Signed-off-by: wangshulin <wangshulin@smail.nju.edu.cn> * bugfix: fix csi plugin concurrency issue on FuseRecovery and NodeUnpublishVolume (#3448) * Add comments for NodeUnpublishVolume Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> * Refactor NodeUnpublishVolume code Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> * FuseRecovery uses volume locks to avoid race conditions Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> * Refactor node server with codes.Internal error code Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> * Rename CSI Config to RunningContext Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> * Fix github actions checks Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> * Fix lock release Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> * Refactor recover logic Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> --------- Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> --------- Signed-off-by: wangshulin <wangshulin@smail.nju.edu.cn> Signed-off-by: trafalgarzzz <trafalgarz@outlook.com> Co-authored-by: wangshulin <89928606+wangshli@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ⅰ. Describe what this PR does
Fix potential concurrency issue when FuseRecovery and NodeUnpublishVolume process on a same target path.
Ⅱ. Does this pull request fix one issue?
fixes #3449
Ⅲ. List the added test cases (unit test/integration test) if any, please explain if no tests are needed.
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews