lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-05-06 13:42:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(baremetal): try clear jbod devices before create (#14181)

Browse Source
This commit is contained in:
Zexi Li
2022-05-01 21:36:42 +08:00
committed by GitHub
parent cb32843337
commit de3fbdedb5
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/baremetal/utils/raid/megactl/megactl.go
View File

@@ -873,6 +873,10 @@ func (adapter *MegaRaidAdaptor) megacliBuildJBOD(devs []*baremetal.BaremetalStor
if !adapter.megacliIsJBODEnabled() {
return fmt.Errorf("JBOD not supported")
}
// try clear jbod disk of devices
if err := adapter.megacliClearJBODDisks(devs); err != nil {
log.Warningf("try clear megaraid jbod disks before make jbod: %s", err)
}
devIds := []string{}
for _, d := range devs {
devIds = append(devIds, GetSpecString(d))
@@ -914,10 +918,10 @@ func (adapter *MegaRaidAdaptor) storcliClearJBODDisks() error {
return errors.NewAggregate(errs)
}
func (adapter *MegaRaidAdaptor) megacliClearJBODDisks() error {
func (adapter *MegaRaidAdaptor) megacliClearJBODDisks(devs []*baremetal.BaremetalStorage) error {
devIds := []string{}
for idx, dev := range adapter.devs {
devIds = append(devIds, GetSpecString(dev.ToBaremetalStorage(idx)))
for _, dev := range devs {
devIds = append(devIds, GetSpecString(dev))
}
errs := make([]error, 0)
for _, devId := range devIds {
@@ -930,9 +934,17 @@ func (adapter *MegaRaidAdaptor) megacliClearJBODDisks() error {
return errors.NewAggregate(errs)
}
func (adapter *MegaRaidAdaptor) megacliClearAllJBODDisks() error {
allDevs := make([]*baremetal.BaremetalStorage, 0)
for idx, dev := range adapter.devs {
allDevs = append(allDevs, dev.ToBaremetalStorage(idx))
}
return adapter.megacliClearJBODDisks(allDevs)
}
func (adapter *MegaRaidAdaptor) clearJBODDisks() {
if err := adapter.megacliClearJBODDisks(); err != nil {
log.Errorf("megacliClearJBODDisks error: %v", err)
if err := adapter.megacliClearAllJBODDisks(); err != nil {
log.Errorf("megacliClearAllJBODDisks error: %v", err)
log.Infof("try storcliClearJBODDisks")
if err := adapter.storcliClearJBODDisks(); err != nil {
log.Errorf("storcliClearJBODDisks error: %v", err)

2
pkg/util/ssh/ssh.go
View File

@@ -149,7 +149,7 @@ func (s *Client) run(parseOutput bool, cmds []string, input io.Reader, withPty b
}
}
log.Debugf("Run command: %s", cmd)
log.Debugf("Run command(%s@%s): %s", s.config.Username, s.config.Host, cmd)
var stdOut bytes.Buffer
var stdErr bytes.Buffer
session.Stdout = &stdOut