ceph: skip osd prepare job creation if osd daemon exists for the pvc #4277
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
travisn
requested changes
Nov 7, 2019
pkg/operator/ceph/cluster/osd/osd.go
Outdated
| //Skip OSD prepare if deployement already exists for the PVC | ||
| listOpts := metav1.ListOptions{LabelSelector: fmt.Sprintf("%s=%s,%s=%s", | ||
| k8sutil.AppAttr, AppName, | ||
| pvcLabelKey, osdProps.crushHostname, |
There was a problem hiding this comment.
I see the crushHostName set above as the PVC name above on line 253, but I'd suggest we set this to volume.PersistentVolumeClaimSource.ClaimName just to be clear that we want the pvc name and not the host name, just for code readability. The crushHostname is actually not the pvc name if the osd is not portable, this must be updated somewhere else.
pkg/operator/ceph/cluster/osd/osd.go
Outdated
| return osds, fmt.Errorf("failed to get required osdInfo. %+v", osd) | ||
| } | ||
|
|
||
| osds = append(osds, osd) |
There was a problem hiding this comment.
nit: instead of appending, you could do this: return []OSDInfo{osd}, nil
travisn
reviewed
Nov 7, 2019
| @@ -828,3 +856,38 @@ func (c *Cluster) getPVCHostName(pvcName string) (string, error) { | |||
| } | |||
| return "", err | |||
| } | |||
|
|
|||
| func getOSDInfo(d *apps.Deployment) ([]OSDInfo, error) { | |||
There was a problem hiding this comment.
how about a unit test for this method?
sp98
changed the title
leseb
requested changes
Nov 8, 2019
travisn
approved these changes
Nov 8, 2019
When an orchestration is restarted or retriggered and starts new osd prepare pods, they are unable to start because the device is already in use by the osd daemon pods. This fix simple skips the osd prepare pod creation if the daemon is already running. Signed-off-by: Santosh Pillai <sapillai@redhat.com>
leseb
approved these changes
Nov 8, 2019
mergify bot
added a commit
that referenced
this pull request
Nov 8, 2019
ceph: skip osd prepare job creation if osd daemon exists for the pvc (bp #4277)
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.
When an orchestration is restarted or retriggered and starts new osd prepare pods, they are unable to start because the device is already in use by the osd daemon pods.
This fix skips the osd prepare pod creation if the daemon is already running.
Signed-off-by: Santosh Pillai sapillai@redhat.com
Description of your changes:
Which issue is resolved by this Pull Request:
Resolves #
Checklist:
make codegen) has been run to update object specifications, if necessary.