mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-10 00:10:20 +00:00
util: remove unused getPools()
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
parent
3fea4fa827
commit
6cea9e2649
@ -19,7 +19,6 @@ package util
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
@ -53,40 +52,6 @@ func ExecCommand(program string, args ...string) (stdout, stderr []byte, err err
|
|||||||
return stdoutBuf.Bytes(), nil, nil
|
return stdoutBuf.Bytes(), nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// cephStoragePoolSummary strongly typed JSON spec for osd ls pools output
|
|
||||||
type cephStoragePoolSummary struct {
|
|
||||||
Name string `json:"poolname"`
|
|
||||||
Number int64 `json:"poolnum"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPools fetches a list of pools from a cluster
|
|
||||||
func getPools(ctx context.Context, monitors string, cr *Credentials) ([]cephStoragePoolSummary, error) {
|
|
||||||
// ceph <options> -f json osd lspools
|
|
||||||
// JSON out: [{"poolnum":<int64>,"poolname":<string>}]
|
|
||||||
|
|
||||||
stdout, _, err := ExecCommand(
|
|
||||||
"ceph",
|
|
||||||
"-m", monitors,
|
|
||||||
"--id", cr.ID,
|
|
||||||
"--keyfile="+cr.KeyFile,
|
|
||||||
"-c", CephConfigPath,
|
|
||||||
"-f", "json",
|
|
||||||
"osd", "lspools")
|
|
||||||
if err != nil {
|
|
||||||
klog.Errorf(Log(ctx, "failed getting pool list from cluster (%s)"), err)
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var pools []cephStoragePoolSummary
|
|
||||||
err = json.Unmarshal(stdout, &pools)
|
|
||||||
if err != nil {
|
|
||||||
klog.Errorf(Log(ctx, "failed to parse JSON output of pool list from cluster (%s)"), err)
|
|
||||||
return nil, fmt.Errorf("unmarshal of pool list failed: %+v. raw buffer response: %s", err, string(stdout))
|
|
||||||
}
|
|
||||||
|
|
||||||
return pools, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPoolID fetches the ID of the pool that matches the passed in poolName
|
// GetPoolID fetches the ID of the pool that matches the passed in poolName
|
||||||
// parameter
|
// parameter
|
||||||
func GetPoolID(monitors string, cr *Credentials, poolName string) (int64, error) {
|
func GetPoolID(monitors string, cr *Credentials, poolName string) (int64, error) {
|
||||||
|
Loading…
Reference in New Issue
Block a user