RepoMirrors/go-ceph
1
0
Fork 0
mirror of https://github.com/ceph/go-ceph synced 2025-04-07 09:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

rados: make get rados error a private function

Browse Source 
There is no good reason why the internal error handling support should
be exposed outside the rados package. Make the function lower-cased and
thus private.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2019-12-20 13:24:12 -05:00 committed by Niels de Vos
parent c412600bfd
commit df46476e21
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
rados/ioctx.go
View File

@ -109,7 +109,7 @@ func (ioctx *IOContext) Write(oid string, data []byte, offset uint64) error {
(C.size_t)(len(data)), (C.size_t)(len(data)),
(C.uint64_t)(offset)) (C.uint64_t)(offset))
return GetRadosError(int(ret)) return getRadosError(int(ret))
} }
// WriteFull writes len(data) bytes to the object with key oid. // WriteFull writes len(data) bytes to the object with key oid.
@ -122,7 +122,7 @@ func (ioctx *IOContext) WriteFull(oid string, data []byte) error {
ret := C.rados_write_full(ioctx.ioctx, c_oid, ret := C.rados_write_full(ioctx.ioctx, c_oid,
(*C.char)(unsafe.Pointer(&data[0])), (*C.char)(unsafe.Pointer(&data[0])),
(C.size_t)(len(data))) (C.size_t)(len(data)))
return GetRadosError(int(ret)) return getRadosError(int(ret))
} }
// Append appends len(data) bytes to the object with key oid. // Append appends len(data) bytes to the object with key oid.
@ -135,7 +135,7 @@ func (ioctx *IOContext) Append(oid string, data []byte) error {
ret := C.rados_append(ioctx.ioctx, c_oid, ret := C.rados_append(ioctx.ioctx, c_oid,
(*C.char)(unsafe.Pointer(&data[0])), (*C.char)(unsafe.Pointer(&data[0])),
(C.size_t)(len(data))) (C.size_t)(len(data)))
return GetRadosError(int(ret)) return getRadosError(int(ret))
} }
// Read reads up to len(data) bytes from the object with key oid starting at byte // Read reads up to len(data) bytes from the object with key oid starting at byte
@ -159,7 +159,7 @@ func (ioctx *IOContext) Read(oid string, data []byte, offset uint64) (int, error
if ret >= 0 { if ret >= 0 {
return int(ret), nil return int(ret), nil
} else { } else {
return 0, GetRadosError(int(ret)) return 0, getRadosError(int(ret))
} }
} }
@ -168,7 +168,7 @@ func (ioctx *IOContext) Delete(oid string) error {
c_oid := C.CString(oid) c_oid := C.CString(oid)
defer C.free(unsafe.Pointer(c_oid)) defer C.free(unsafe.Pointer(c_oid))
return GetRadosError(int(C.rados_remove(ioctx.ioctx, c_oid))) return getRadosError(int(C.rados_remove(ioctx.ioctx, c_oid)))
} }
// Truncate resizes the object with key oid to size size. If the operation // Truncate resizes the object with key oid to size size. If the operation
@ -179,7 +179,7 @@ func (ioctx *IOContext) Truncate(oid string, size uint64) error {
c_oid := C.CString(oid) c_oid := C.CString(oid)
defer C.free(unsafe.Pointer(c_oid)) defer C.free(unsafe.Pointer(c_oid))
return GetRadosError(int(C.rados_trunc(ioctx.ioctx, c_oid, (C.uint64_t)(size)))) return getRadosError(int(C.rados_trunc(ioctx.ioctx, c_oid, (C.uint64_t)(size))))
} }
// Destroy informs librados that the I/O context is no longer in use. // Destroy informs librados that the I/O context is no longer in use.
@ -195,7 +195,7 @@ func (ioctx *IOContext) GetPoolStats() (stat PoolStat, err error) {
c_stat := C.struct_rados_pool_stat_t{} c_stat := C.struct_rados_pool_stat_t{}
ret := C.rados_ioctx_pool_stat(ioctx.ioctx, &c_stat) ret := C.rados_ioctx_pool_stat(ioctx.ioctx, &c_stat)
if ret < 0 { if ret < 0 {
return PoolStat{}, GetRadosError(int(ret)) return PoolStat{}, getRadosError(int(ret))
} else { } else {
return PoolStat{ return PoolStat{
Num_bytes: uint64(c_stat.num_bytes), Num_bytes: uint64(c_stat.num_bytes),
@ -224,7 +224,7 @@ func (ioctx *IOContext) GetPoolName() (name string, err error) {
buf = make([]byte, len(buf)*2) buf = make([]byte, len(buf)*2)
continue continue
} else if ret < 0 { } else if ret < 0 {
return "", GetRadosError(int(ret)) return "", getRadosError(int(ret))
} }
name = C.GoStringN((*C.char)(unsafe.Pointer(&buf[0])), ret) name = C.GoStringN((*C.char)(unsafe.Pointer(&buf[0])), ret)
return name, nil return name, nil
@ -244,7 +244,7 @@ func (ioctx *IOContext) ListObjects(listFn ObjectListFunc) error {
var ctx C.rados_list_ctx_t var ctx C.rados_list_ctx_t
ret := C.rados_nobjects_list_open(ioctx.ioctx, &ctx) ret := C.rados_nobjects_list_open(ioctx.ioctx, &ctx)
if ret < 0 { if ret < 0 {
return GetRadosError(int(ret)) return getRadosError(int(ret))
} }
defer func() { C.rados_nobjects_list_close(ctx) }() defer func() { C.rados_nobjects_list_close(ctx) }()
@ -254,7 +254,7 @@ func (ioctx *IOContext) ListObjects(listFn ObjectListFunc) error {
if ret == -C.ENOENT { if ret == -C.ENOENT {
return nil return nil
} else if ret < 0 { } else if ret < 0 {
return GetRadosError(int(ret)) return getRadosError(int(ret))
} }
listFn(C.GoString(c_entry)) listFn(C.GoString(c_entry))
} }
@ -274,7 +274,7 @@ func (ioctx *IOContext) Stat(object string) (stat ObjectStat, err error) {
&c_pmtime) &c_pmtime)
if ret < 0 { if ret < 0 {
return ObjectStat{}, GetRadosError(int(ret)) return ObjectStat{}, getRadosError(int(ret))
} else { } else {
return ObjectStat{ return ObjectStat{
Size: uint64(c_psize), Size: uint64(c_psize),
@ -301,7 +301,7 @@ func (ioctx *IOContext) GetXattr(object string, name string, data []byte) (int,
if ret >= 0 { if ret >= 0 {
return int(ret), nil return int(ret), nil
} else { } else {
return 0, GetRadosError(int(ret)) return 0, getRadosError(int(ret))
} }
} }
@ -319,7 +319,7 @@ func (ioctx *IOContext) SetXattr(object string, name string, data []byte) error
(*C.char)(unsafe.Pointer(&data[0])), (*C.char)(unsafe.Pointer(&data[0])),
(C.size_t)(len(data))) (C.size_t)(len(data)))
return GetRadosError(int(ret)) return getRadosError(int(ret))
} }
// function that lists all the xattrs for an object, since xattrs are // function that lists all the xattrs for an object, since xattrs are
@ -333,7 +333,7 @@ func (ioctx *IOContext) ListXattrs(oid string) (map[string][]byte, error) {
ret := C.rados_getxattrs(ioctx.ioctx, c_oid, &it) ret := C.rados_getxattrs(ioctx.ioctx, c_oid, &it)
if ret < 0 { if ret < 0 {
return nil, GetRadosError(int(ret)) return nil, getRadosError(int(ret))
} }
defer func() { C.rados_getxattrs_end(it) }() defer func() { C.rados_getxattrs_end(it) }()
m := make(map[string][]byte) m := make(map[string][]byte)
@ -345,7 +345,7 @@ func (ioctx *IOContext) ListXattrs(oid string) (map[string][]byte, error) {
ret := C.rados_getxattrs_next(it, &c_name, &c_val, &c_len) ret := C.rados_getxattrs_next(it, &c_name, &c_val, &c_len)
if ret < 0 { if ret < 0 {
return nil, GetRadosError(int(ret)) return nil, getRadosError(int(ret))
} }
// rados api returns a null name,val & 0-length upon // rados api returns a null name,val & 0-length upon
// end of iteration // end of iteration
@ -368,7 +368,7 @@ func (ioctx *IOContext) RmXattr(oid string, name string) error {
c_oid, c_oid,
c_name) c_name)
return GetRadosError(int(ret)) return getRadosError(int(ret))
} }
// Append the map `pairs` to the omap `oid` // Append the map `pairs` to the omap `oid`
@ -424,7 +424,7 @@ func (ioctx *IOContext) SetOmap(oid string, pairs map[string][]byte) error {
ret := C.rados_write_op_operate(op, ioctx.ioctx, c_oid, nil, 0) ret := C.rados_write_op_operate(op, ioctx.ioctx, c_oid, nil, 0)
C.rados_release_write_op(op) C.rados_release_write_op(op)
return GetRadosError(int(ret)) return getRadosError(int(ret))
} }
// OmapListFunc is the type of the function called for each omap key // OmapListFunc is the type of the function called for each omap key
@ -463,7 +463,7 @@ func (ioctx *IOContext) ListOmapValues(oid string, startAfter string, filterPref
ret := C.rados_read_op_operate(op, ioctx.ioctx, c_oid, 0) ret := C.rados_read_op_operate(op, ioctx.ioctx, c_oid, 0)
if int(ret) != 0 { if int(ret) != 0 {
return GetRadosError(int(ret)) return getRadosError(int(ret))
} else if int(c_prval) != 0 { } else if int(c_prval) != 0 {
return RadosError(int(c_prval)) return RadosError(int(c_prval))
} }
@ -476,7 +476,7 @@ func (ioctx *IOContext) ListOmapValues(oid string, startAfter string, filterPref
ret = C.rados_omap_get_next(c_iter, &c_key, &c_val, &c_len) ret = C.rados_omap_get_next(c_iter, &c_key, &c_val, &c_len)
if int(ret) != 0 { if int(ret) != 0 {
return GetRadosError(int(ret)) return getRadosError(int(ret))
} }
if c_key == nil { if c_key == nil {
@ -569,7 +569,7 @@ func (ioctx *IOContext) RmOmapKeys(oid string, keys []string) error {
ret := C.rados_write_op_operate(op, ioctx.ioctx, c_oid, nil, 0) ret := C.rados_write_op_operate(op, ioctx.ioctx, c_oid, nil, 0)
C.rados_release_write_op(op) C.rados_release_write_op(op)
return GetRadosError(int(ret)) return getRadosError(int(ret))
} }
// CleanOmap clears the omap `oid` // CleanOmap clears the omap `oid`
@ -583,7 +583,7 @@ func (ioctx *IOContext) CleanOmap(oid string) error {
ret := C.rados_write_op_operate(op, ioctx.ioctx, c_oid, nil, 0) ret := C.rados_write_op_operate(op, ioctx.ioctx, c_oid, nil, 0)
C.rados_release_write_op(op) C.rados_release_write_op(op)
return GetRadosError(int(ret)) return getRadosError(int(ret))
} }
type Iter struct { type Iter struct {
@ -599,7 +599,7 @@ type IterToken uint32
func (ioctx *IOContext) Iter() (*Iter, error) { func (ioctx *IOContext) Iter() (*Iter, error) {
iter := Iter{} iter := Iter{}
if cerr := C.rados_nobjects_list_open(ioctx.ioctx, &iter.ctx); cerr < 0 { if cerr := C.rados_nobjects_list_open(ioctx.ioctx, &iter.ctx); cerr < 0 {
return nil, GetRadosError(int(cerr)) return nil, getRadosError(int(cerr))
} }
return &iter, nil return &iter, nil
} }
@ -631,7 +631,7 @@ func (iter *Iter) Next() bool {
var c_entry *C.char var c_entry *C.char
var c_namespace *C.char var c_namespace *C.char
if cerr := C.rados_nobjects_list_next(iter.ctx, &c_entry, nil, &c_namespace); cerr < 0 { if cerr := C.rados_nobjects_list_next(iter.ctx, &c_entry, nil, &c_namespace); cerr < 0 {
iter.err = GetRadosError(int(cerr)) iter.err = getRadosError(int(cerr))
return false return false
} }
iter.entry = C.GoString(c_entry) iter.entry = C.GoString(c_entry)

2
rados/rados.go
View File

@ -29,7 +29,7 @@ var RadosAllNamespaces = C.LIBRADOS_ALL_NSPACES
var RadosErrorNotFound = RadosError(-C.ENOENT) var RadosErrorNotFound = RadosError(-C.ENOENT)
var RadosErrorPermissionDenied = RadosError(-C.EPERM) var RadosErrorPermissionDenied = RadosError(-C.EPERM)
func GetRadosError(err int) error { func getRadosError(err int) error {
if err == 0 { if err == 0 {
return nil return nil
} }

6
rados/rados_test.go
View File

@ -1150,14 +1150,14 @@ func TestRadosTestSuite(t *testing.T) {
} }
func TestRadosError(t *testing.T) { func TestRadosError(t *testing.T) {
err := GetRadosError(0) err := getRadosError(0)
assert.NoError(t, err) assert.NoError(t, err)
err = GetRadosError(-5) // IO error err = getRadosError(-5) // IO error
assert.Error(t, err) assert.Error(t, err)
assert.Equal(t, err.Error(), "rados: ret=5, Input/output error") assert.Equal(t, err.Error(), "rados: ret=5, Input/output error")
err = GetRadosError(345) // no such errno err = getRadosError(345) // no such errno
assert.Error(t, err) assert.Error(t, err)
assert.Equal(t, err.Error(), "rados: ret=345") assert.Equal(t, err.Error(), "rados: ret=345")
} }