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

fix: avoid megacli hang on adpallinfo

Browse Source
This commit is contained in:
Qiu Jian
2023-12-28 21:31:01 +08:00
parent c381cbde23
commit 3f71995205
2 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/telegraf-raid-plugin/main.go
View File

@@ -44,6 +44,14 @@ const (
// Failed, Offline, Degraded, Rebuilding, Out of Sync (OSY)
func main() {
logLevel := "debug"
logVerboseLevel := 5
log.SetVerboseLevel(int32(logVerboseLevel))
err := log.SetLogLevelByString(log.Logger(), logLevel)
if err != nil {
log.Fatalf("Set log level %q: %v", logLevel, err)
}
// creates the in-cluster config
config, err := rest.InClusterConfig()
if err != nil {

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

@@ -207,29 +207,6 @@ func (dev *MegaRaidPhyDev) convertState(val string) string {
return state
}
func (dev *MegaRaidPhyDev) parseStripSize(lines []string) error {
size2Int := func(sizeStr string) int {
sz, _ := strconv.ParseFloat(strings.Fields(sizeStr)[0], 32)
szInt := int(sz)
if strings.Contains(sizeStr, "KB") {
return szInt
}
if strings.Contains(sizeStr, "MB") {
return szInt * 1024
}
return -1
}
for _, line := range lines {
if strings.Contains(line, "Min") {
dev.minStripSize = size2Int(strings.Split(line, ": ")[1])
}
if strings.Contains(line, "Max") {
dev.maxStripSize = size2Int(strings.Split(line, ": ")[1])
}
}
return nil
}
func (dev *MegaRaidPhyDev) isComplete() bool {
if !dev.RaidBasePhyDev.IsComplete() {
return false
@@ -270,6 +247,9 @@ type MegaRaidAdaptor struct {
// used by sg_map
hostNum int
//channelNum int
minStripSize int
maxStripSize int
}
func NewMegaRaidAdaptor(index int, raid *MegaRaid) (*MegaRaidAdaptor, error) {
@@ -305,8 +285,26 @@ func (adapter MegaRaidAdaptor) key() string {
return adapter.name + adapter.sn
}
/*
Adapter: 0
Product Name: MegaRAID 9560-8i 4GB
Memory: 4096MB
BBU: Absent
Serial No: SKC4011564
*/
func (adapter *MegaRaidAdaptor) fillInfo() error {
cmd := GetCommand("-AdpAllInfo", fmt.Sprintf("-a%d", adapter.index))
size2Int := func(sizeStr string) int {
sz, _ := strconv.ParseFloat(strings.Fields(sizeStr)[0], 32)
szInt := int(sz)
if strings.Contains(sizeStr, "KB") {
return szInt
}
if strings.Contains(sizeStr, "MB") {
return szInt * 1024
}
return -1
}
cmd := GetCommand("-CfgDsply", fmt.Sprintf("-a%d", adapter.index))
ret, err := adapter.remoteRun(cmd)
if err != nil {
return errors.Wrap(err, "remote get SN")
@@ -321,6 +319,14 @@ func (adapter *MegaRaidAdaptor) fillInfo() error {
adapter.sn = val
case "Product Name":
adapter.name = val
case "Strip Size":
sz := size2Int(val)
adapter.minStripSize = sz
adapter.maxStripSize = sz
case "Min Strip Size":
adapter.minStripSize = size2Int(val)
case "Max Strip Size":
adapter.maxStripSize = size2Int(val)
}
}
if len(adapter.key()) == 0 {
@@ -1076,18 +1082,9 @@ func (raid *MegaRaid) parsePhyDevs(lines []string) error {
}
func (adapter *MegaRaidAdaptor) addPhyDevsStripSize() error {
grepCmd := []string{"grep", "-iE", "'^(Min|Max) Strip Size'"}
args := []string{"-adpallinfo", fmt.Sprintf("-a%d", adapter.index), "|"}
args = append(args, grepCmd...)
cmd := GetCommand(args...)
ret, err := adapter.remoteRun(cmd)
if err != nil {
return fmt.Errorf("addPhyDevStripSize error: %v", err)
}
for _, dev := range adapter.devs {
if err := dev.parseStripSize(ret); err != nil {
return err
}
dev.minStripSize = adapter.minStripSize
dev.maxStripSize = adapter.maxStripSize
}
return nil
}