feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #3586 from mvollman/fix-per-osd-md

Browse Source 
ceph: fix per osd metadata support
This commit is contained in:
Travis Nielsen
2019-08-19 10:41:19 -06:00
committed by GitHub
parent 7e1939cc08 46f8012268
commit 73fa38ff75
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/daemon/ceph/osd/volume.go
+6 -6
View File
@@ -238,11 +238,11 @@ func (a *OsdAgent) initializeDevices(context *clusterd.Context, devices *DeviceO
for md, devs := range metadataDevices {
batchArgs = append(batchArgs, path.Join("/dev", md))
batchArgs = append(batchArgs, devs...)
mdArgs := append(batchArgs, path.Join("/dev", md))
mdArgs = append(mdArgs, devs...)
// Reporting
reportArgs := append(batchArgs, []string{
reportArgs := append(mdArgs, []string{
"--report",
}...)
@@ -267,12 +267,12 @@ func (a *OsdAgent) initializeDevices(context *clusterd.Context, devices *DeviceO
return fmt.Errorf("failed to unmarshal ceph-volume report json. %+v", err)
}
if path.Join("/dev", a.metadataDevice) != cvReport.Vg.Devices {
return fmt.Errorf("ceph-volume did not use the expected metadataDevice [%s]", a.metadataDevice)
if path.Join("/dev", md) != cvReport.Vg.Devices {
return fmt.Errorf("ceph-volume did not use the expected metadataDevice [%s]", md)
}
// execute ceph-volume batching up multiple devices
if err := context.Executor.ExecuteCommand(false, "", baseCommand, batchArgs...); err != nil {
if err := context.Executor.ExecuteCommand(false, "", baseCommand, mdArgs...); err != nil {
return fmt.Errorf("failed ceph-volume. %+v", err) // fail return here as validation provided by ceph-volume
}
}