Logical fix

master
Alexey Kostin 2019-02-15 20:08:00 +03:00
parent 70cb80c176
commit 7073cc64df
2 changed files with 6 additions and 6 deletions

View File

@ -26,7 +26,7 @@ func get_pool_size(cephconn *Cephconnection, params *Params) *Monanswer {
}
func get_pg_by_pool(cephconn *Cephconnection, params *Params) *[]PlacementGroups {
func get_pg_by_pool(cephconn *Cephconnection, params *Params) *[]PlacementGroup {
monjson, err := json.Marshal(Moncommand{Prefix: "pg ls-by-pool", Poolstr: params.pool, Format: "json"})
if err != nil {
log.Fatalf("Can't marshal json mon query. Error: %v", err)
@ -36,7 +36,7 @@ func get_pg_by_pool(cephconn *Cephconnection, params *Params) *[]PlacementGroups
log.Fatalf("Failed exec monCommand. Error: %v", err)
}
monanswer := []PlacementGroups{}
monanswer := []PlacementGroup{}
if err := json.Unmarshal([]byte(monrawanswer), &monanswer); err != nil {
log.Fatalf("Can't parse monitor answer. Error: %v", err)
}
@ -73,7 +73,7 @@ func main() {
monanswersize.Pool, monanswersize.Size, monanswersize.Pool, monanswersize.Pool)
}
monanswerpgs := get_pg_by_pool(cephconn, params)
log.Println(monanswerpgs)
placementGroups := get_pg_by_pool(cephconn, params)
log.Println(placementGroups)
}

View File

@ -32,7 +32,7 @@ type Monanswer struct {
Size int `json:"size,omitempty"`
}
func (times *PlacementGroups) StringsToTimes() {
func (times *PlacementGroup) StringsToTimes() {
const LongForm = "2006-01-02 15:04:05.000000"
times.Last_fresh, _ = time.Parse(LongForm, times.Last_fresh_str)
times.Last_change, _ = time.Parse(LongForm, times.Last_fresh_str)
@ -51,7 +51,7 @@ func (times *PlacementGroups) StringsToTimes() {
times.Last_scrub, _ = time.Parse(LongForm, times.Last_scrub_str)
}
type PlacementGroups struct {
type PlacementGroup struct {
Pgid string `json:"pgid"`
Version string `json:"version"`
Reported_seq string `json:"reported_seq"`