RepoMirrors/go-ceph
1
0
Fork 0
mirror of https://github.com/ceph/go-ceph synced 2025-01-05 05:20:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/13'

Browse Source
This commit is contained in:
Noah Watkins 2016-03-26 11:44:42 -07:00
commit a82279dba8
3 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
rados/ioctx.go
View File

@ -62,7 +62,7 @@ func (ioctx *IOContext) Write(oid string, data []byte, offset uint64) error {
(C.size_t)(len(data)),
(C.uint64_t)(offset))
return GetRadosError(ret)
return GetRadosError(int(ret))
}
// WriteFull writes len(data) bytes to the object with key oid.
@ -75,7 +75,7 @@ func (ioctx *IOContext) WriteFull(oid string, data []byte) error {
ret := C.rados_write_full(ioctx.ioctx, c_oid,
(*C.char)(unsafe.Pointer(&data[0])),
(C.size_t)(len(data)))
return GetRadosError(ret)
return GetRadosError(int(ret))
}
// Append appends len(data) bytes to the object with key oid.
@ -88,7 +88,7 @@ func (ioctx *IOContext) Append(oid string, data []byte) error {
ret := C.rados_append(ioctx.ioctx, c_oid,
(*C.char)(unsafe.Pointer(&data[0])),
(C.size_t)(len(data)))
return GetRadosError(ret)
return GetRadosError(int(ret))
}
// Read reads up to len(data) bytes from the object with key oid starting at byte
@ -111,7 +111,7 @@ func (ioctx *IOContext) Read(oid string, data []byte, offset uint64) (int, error
if ret >= 0 {
return int(ret), nil
} else {
return 0, GetRadosError(ret)
return 0, GetRadosError(int(ret))
}
}
@ -120,7 +120,7 @@ func (ioctx *IOContext) Delete(oid string) error {
c_oid := C.CString(oid)
defer C.free(unsafe.Pointer(c_oid))
return GetRadosError(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
@ -131,7 +131,7 @@ func (ioctx *IOContext) Truncate(oid string, size uint64) error {
c_oid := C.CString(oid)
defer C.free(unsafe.Pointer(c_oid))
return GetRadosError(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.
@ -147,7 +147,7 @@ func (ioctx *IOContext) GetPoolStats() (stat PoolStat, err error) {
c_stat := C.struct_rados_pool_stat_t{}
ret := C.rados_ioctx_pool_stat(ioctx.ioctx, &c_stat)
if ret < 0 {
return PoolStat{}, RadosError(int(ret))
return PoolStat{}, GetRadosError(int(ret))
} else {
return PoolStat{
Num_bytes: uint64(c_stat.num_bytes),
@ -176,7 +176,7 @@ func (ioctx *IOContext) GetPoolName() (name string, err error) {
buf = make([]byte, len(buf)*2)
continue
} else if ret < 0 {
return "", RadosError(ret)
return "", GetRadosError(int(ret))
}
name = C.GoStringN((*C.char)(unsafe.Pointer(&buf[0])), ret)
return name, nil
@ -194,7 +194,7 @@ func (ioctx *IOContext) ListObjects(listFn ObjectListFunc) error {
var ctx C.rados_list_ctx_t
ret := C.rados_objects_list_open(ioctx.ioctx, &ctx)
if ret < 0 {
return RadosError(ret)
return GetRadosError(int(ret))
}
defer func() { C.rados_objects_list_close(ctx) }()
@ -204,7 +204,7 @@ func (ioctx *IOContext) ListObjects(listFn ObjectListFunc) error {
if ret == -2 { // FIXME
return nil
} else if ret < 0 {
return RadosError(ret)
return GetRadosError(int(ret))
}
listFn(C.GoString(c_entry))
}
@ -226,7 +226,7 @@ func (ioctx *IOContext) Stat(object string) (stat ObjectStat, err error) {
&c_pmtime)
if ret < 0 {
return ObjectStat{}, RadosError(int(ret))
return ObjectStat{}, GetRadosError(int(ret))
} else {
return ObjectStat{
Size: uint64(c_psize),
@ -253,7 +253,7 @@ func (ioctx *IOContext) GetXattr(object string, name string, data []byte) (int,
if ret >= 0 {
return int(ret), nil
} else {
return 0, GetRadosError(ret)
return 0, GetRadosError(int(ret))
}
}
@ -271,7 +271,7 @@ func (ioctx *IOContext) SetXattr(object string, name string, data []byte) error
(*C.char)(unsafe.Pointer(&data[0])),
(C.size_t)(len(data)))
return GetRadosError(ret)
return GetRadosError(int(ret))
}
// function that lists all the xattrs for an object, since xattrs are
@ -285,7 +285,7 @@ func (ioctx *IOContext) ListXattrs(oid string) (map[string][]byte, error) {
ret := C.rados_getxattrs(ioctx.ioctx, c_oid, &it)
if ret < 0 {
return nil, GetRadosError(ret)
return nil, GetRadosError(int(ret))
}
defer func() { C.rados_getxattrs_end(it) }()
m := make(map[string][]byte)
@ -297,7 +297,7 @@ func (ioctx *IOContext) ListXattrs(oid string) (map[string][]byte, error) {
ret := C.rados_getxattrs_next(it, &c_name, &c_val, &c_len)
if ret < 0 {
return nil, GetRadosError(ret)
return nil, GetRadosError(int(ret))
}
// rados api returns a null name,val & 0-length upon
// end of iteration
@ -320,7 +320,7 @@ func (ioctx *IOContext) RmXattr(oid string, name string) error {
c_oid,
c_name)
return GetRadosError(ret)
return GetRadosError(int(ret))
}
// Append the map `pairs` to the omap `oid`
@ -376,7 +376,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)
C.rados_release_write_op(op)
return GetRadosError(ret)
return GetRadosError(int(ret))
}
// OmapListFunc is the type of the function called for each omap key
@ -416,7 +416,7 @@ func (ioctx *IOContext) ListOmapValues(oid string, startAfter string, filterPref
if int(c_prval) != 0 {
return RadosError(int(c_prval))
} else if int(ret) != 0 {
return GetRadosError(ret)
return GetRadosError(int(ret))
}
for {
@ -427,7 +427,7 @@ func (ioctx *IOContext) ListOmapValues(oid string, startAfter string, filterPref
ret = C.rados_omap_get_next(c_iter, &c_key, &c_val, &c_len)
if int(ret) != 0 {
return GetRadosError(ret)
return GetRadosError(int(ret))
}
if c_key == nil {
@ -520,7 +520,7 @@ func (ioctx *IOContext) RmOmapKeys(oid string, keys []string) error {
ret := C.rados_write_op_operate(op, ioctx.ioctx, c_oid, nil, 0)
C.rados_release_write_op(op)
return GetRadosError(ret)
return GetRadosError(int(ret))
}
// Clear the omap `oid`
@ -534,5 +534,5 @@ func (ioctx *IOContext) CleanOmap(oid string) error {
ret := C.rados_write_op_operate(op, ioctx.ioctx, c_oid, nil, 0)
C.rados_release_write_op(op)
return GetRadosError(ret)
return GetRadosError(int(ret))
}

16
rados/rados.go
View File

@ -7,7 +7,6 @@ package rados
import "C"
import (
"errors"
"fmt"
"unsafe"
)
@ -15,20 +14,17 @@ import (
type RadosError int
func (e RadosError) Error() string {
return fmt.Sprintf("rados: ret=%d", e)
return fmt.Sprintf("rados: %s", C.GoString(C.strerror(C.int(-e))))
}
var RadosErrorNotFound = errors.New("Rados error not found")
var RadosErrorNotFound = RadosError(-C.ENOENT)
var RadosErrorPermissionDenied = RadosError(-C.EPERM)
func GetRadosError(err C.int) error {
if err != 0 {
if err == -C.ENOENT {
return RadosErrorNotFound
}
return RadosError(err)
} else {
func GetRadosError(err int) error {
if err == 0 {
return nil
}
return RadosError(err)
}
// Version returns the major, minor, and patch components of the version of

30
rados/rados_test.go
View File

@ -1,19 +1,20 @@
package rados_test
import "testing"
import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net"
"os"
"os/exec"
"sort"
"testing"
"time"
//import "bytes"
import "github.com/ceph/go-ceph/rados"
import "github.com/stretchr/testify/assert"
import "os"
import "os/exec"
import "io"
import "io/ioutil"
import "time"
import "net"
import "fmt"
import "sort"
import "encoding/json"
"github.com/ceph/go-ceph/rados"
"github.com/stretchr/testify/assert"
)
func GetUUID() string {
out, _ := exec.Command("uuidgen").Output()
@ -398,6 +399,9 @@ func TestObjectStat(t *testing.T) {
assert.Equal(t, uint64(len(bytes_in)), stat.Size)
assert.NotNil(t, stat.ModTime)
_, err = pool.Stat("notfound")
assert.Equal(t, err, rados.RadosErrorNotFound)
pool.Destroy()
conn.Shutdown()
}