opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2885 from ioito/hotfix/qx-go-ceph-replace

Browse Source 
fix: go-ceph bugifx
This commit is contained in:
yunion-ci-robot
2019-09-12 14:29:20 +08:00
committed by GitHub
parent 507d8f91ab 79766e7c7e
commit 182eac5305
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+2
View File
@@ -156,3 +156,5 @@ require (
yunion.io/x/sqlchemy v0.0.0-20190823062008-bb710661356f
yunion.io/x/structarg v0.0.0-20190809075558-115bed041de3
)
replace github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94 => github.com/yunionio/go-ceph v0.0.0-20190912140512-c51b8478c
go.sum
+2
View File
@@ -444,6 +444,8 @@ github.com/willf/bloom v2.0.3+incompatible h1:QDacWdqcAUI1MPOwIQZRy9kOR7yxfyEmxX
github.com/willf/bloom v2.0.3+incompatible/go.mod h1:MmAltL9pDMNTrvUkxdg0k0q5I0suxmuwp3KbyrZLOZ8=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/yunionio/go-ceph v0.0.0-20190912140512-c51b8478c h1:/9QrgZBxNyq1HsJk5jA2NXQxWoxaSc9v2DJVOlavEq4=
github.com/yunionio/go-ceph v0.0.0-20190912140512-c51b8478c/go.mod h1:8XuBae5AzsgotLArJSewMruYVaQs8AlfsK5jBCG8T9Y=
go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/etcd v3.3.10+incompatible h1:qXVcIR1kU3CYLD8zXDseOmBNwg0uaui53e4Wg4uj0rk=
vendor/github.com/ceph/go-ceph/rbd/rbd.go
Generated Vendored
+6 -1
View File
@@ -12,10 +12,11 @@ import (
"bytes"
"errors"
"fmt"
"github.com/ceph/go-ceph/rados"
"io"
"time"
"unsafe"
"github.com/ceph/go-ceph/rados"
)
const (
@@ -790,6 +791,10 @@ func (image *Image) GetSnapshotNames() (snaps []SnapInfo, err error) {
ret := C.rbd_snap_list(image.image, nil, &c_max_snaps)
if c_max_snaps == 0 {
c_max_snaps = 10
}
c_snaps := make([]C.rbd_snap_info_t, c_max_snaps)
snaps = make([]SnapInfo, c_max_snaps)
vendor/modules.txt
Vendored
+1 -1
View File
@@ -152,7 +152,7 @@ github.com/boombuler/barcode/utils
github.com/bradfitz/iter
# github.com/c-bata/go-prompt v0.2.1
github.com/c-bata/go-prompt
# github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94
# github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94 => github.com/yunionio/go-ceph v0.0.0-20190912140512-c51b8478c
github.com/ceph/go-ceph/rados
github.com/ceph/go-ceph/rbd
# github.com/coredns/coredns v1.3.0