Mid: Filesystem: For block devices, allow monitor_10 even when specified by UID or LABEL. - #2216
HideoYamauchi wants to merge 2 commits into
Conversation
| return $OCF_ERR_CONFIGURED | ||
| fi | ||
| else | ||
| ocf_log warn "$DEVICE is not a block device, monitor 10 is noop" |
There was a problem hiding this comment.
We also have to do the exit reason/CONFIGURED return here.
There was a problem hiding this comment.
I’ve also modified the legacy processing.
If there are no issues, I’ll clean up the PR and resubmit it.
What do you think?
Many thanks,
Hideo Yamauchi
There was a problem hiding this comment.
@oalbrigt
It looks like there is an error occurring in Jenkins.
The fix itself doesn't seem to be the problem, though...
There was a problem hiding this comment.
You dont have to resubmit it.
You can run git rebase -i HEAD~4 and change pick to s on the lines you want to merge into the first commit. Then you'll get mix and match any parts of the commit messages for the commit.
And finally you run git push -f and we should get the new commit instead of the 4 we have now.
There was a problem hiding this comment.
Yeah. Jenkins is or was under maintenance today, so dont mind that failing when it's not related to the PR.
There was a problem hiding this comment.
@oalbrigt
I tried rebasing.
How does it look?
…ied by UID or LABEL.
f0fd28b to
93ee94b
Compare
|
It looks like there a points that need correction. I added a check because duplicate values can be set for the device LABEL. What do you think? Best Regards, |
2 participants
Hi Oyvind,
Hi All,
This modification is based on the discussion in the following issue.
It allows the
monitor_10processing to proceed when a match withblkidis found, even if UUID or LABEL is specified.Best Reards,
Hideo Yamauchi.