RepoMirrors
/
go-ceph
mirror of https://github.com/ceph/go-ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rados: replace Println calls with a proper error 

Replace the odd calls to Println with a comparable error value.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2019-12-12 15:30:01 -05:00 committed by Niels de Vos
parent fdc33a8e69
commit e07f6a6050
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rados/conn.go
View File

@ -5,9 +5,15 @@ package rados
// #include <rados/librados.h> // #include <rados/librados.h>
import "C" import "C"
import "unsafe" import (
import "bytes" "bytes"
import "fmt" "errors"
"unsafe"
)
var (
ErrNotConnected = errors.New("RADOS not connected")
)
// ClusterStat represents Ceph cluster statistics. // ClusterStat represents Ceph cluster statistics.
type ClusterStat struct { type ClusterStat struct {
@ -171,7 +177,7 @@ func (c *Conn) ensure_connected() error {
if c.connected { if c.connected {
return nil return nil
} else { } else {
return RadosError(1) return ErrNotConnected
} }
} }
@ -267,7 +273,6 @@ func (c *Conn) MakePool(name string) error {
// DeletePool deletes a pool and all the data inside the pool. // DeletePool deletes a pool and all the data inside the pool.
func (c *Conn) DeletePool(name string) error { func (c *Conn) DeletePool(name string) error {
if err := c.ensure_connected(); err != nil { if err := c.ensure_connected(); err != nil {
fmt.Println("NOT CONNECTED WHOOPS")
return err return err
} }
c_name := C.CString(name) c_name := C.CString(name)
@ -283,7 +288,6 @@ func (c *Conn) DeletePool(name string) error {
// GetPoolByName returns the ID of the pool with a given name. // GetPoolByName returns the ID of the pool with a given name.
func (c *Conn) GetPoolByName(name string) (int64, error) { func (c *Conn) GetPoolByName(name string) (int64, error) {
if err := c.ensure_connected(); err != nil { if err := c.ensure_connected(); err != nil {
fmt.Println("NOT CONNECTED WHOOPS")
return 0, err return 0, err
} }
c_name := C.CString(name) c_name := C.CString(name)
@ -300,7 +304,6 @@ func (c *Conn) GetPoolByName(name string) (int64, error) {
func (c *Conn) GetPoolByID(id int64) (string, error) { func (c *Conn) GetPoolByID(id int64) (string, error) {
buf := make([]byte, 4096) buf := make([]byte, 4096)
if err := c.ensure_connected(); err != nil { if err := c.ensure_connected(); err != nil {
fmt.Println("NOT CONNECTED WHOOPS")
return "", err return "", err
} }
c_id := C.int64_t(id) c_id := C.int64_t(id)