This commit is contained in:
madz 2016-07-20 20:16:11 +08:00
parent c65d11d6c1
commit fc0bef724a

View File

@ -250,11 +250,7 @@ type cephOsdDump struct {
} }
func (o *OsdCollector) collect() error { func (o *OsdCollector) collect() error {
cmd, err := o.cephOSDDfCommand() cmd := o.cephOSDDfCommand()
if err != nil {
return err
}
buf, _, err := o.conn.MonCommand(cmd) buf, _, err := o.conn.MonCommand(cmd)
if err != nil { if err != nil {
@ -446,15 +442,15 @@ func (o *OsdCollector) cephOsdDump() []byte {
return cmd return cmd
} }
func (o *OsdCollector) cephOSDDfCommand() ([]byte, error) { func (o *OsdCollector) cephOSDDfCommand() []byte {
cmd, err := json.Marshal(map[string]interface{}{ cmd, err := json.Marshal(map[string]interface{}{
"prefix": "osd df", "prefix": "osd df",
"format": "json", "format": "json",
}) })
if err != nil { if err != nil {
return nil, err panic(err)
} }
return cmd, nil return cmd
} }
func (o *OsdCollector) cephOSDPerfCommand() []byte { func (o *OsdCollector) cephOSDPerfCommand() []byte {