From 72b5ea1eb43a5c553ec213676b1bbb183a9e4ea1 Mon Sep 17 00:00:00 2001
From: ioito <qu_xuan@icloud.com>
Date: Thu, 12 Sep 2019 15:56:57 +0800
Subject: [PATCH] fix: update go-ceph vendor

---
 go.mod                                    |  2 +-
 go.sum                                    |  4 ++++
 vendor/github.com/ceph/go-ceph/rbd/rbd.go | 26 +++++++++++------------
 vendor/modules.txt                        |  2 +-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/go.mod b/go.mod
index 3c32ea3d75..25849a497b 100644
--- a/go.mod
+++ b/go.mod
@@ -157,4 +157,4 @@ require (
 	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
+replace github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94 => github.com/yunionio/go-ceph v0.0.0-20190912140512-ccc6576c3fe2ef6de74aa1473b9401d95c7cd7c1
diff --git a/go.sum b/go.sum
index e4cc7d2f38..3d25f8c233 100644
--- a/go.sum
+++ b/go.sum
@@ -444,8 +444,12 @@ 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-74fcb7c02a h1:qFmRm0Pm0HbCSwRfD8F24oEsTk9Mm/DveixxLIz+1Ho=
+github.com/yunionio/go-ceph v0.0.0-20190912140512-74fcb7c02a/go.mod h1:8XuBae5AzsgotLArJSewMruYVaQs8AlfsK5jBCG8T9Y=
 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=
+github.com/yunionio/go-ceph v0.0.0-20190912140512-ccc6576c3fe2ef6de74aa1473b9401d95c7cd7c1 h1:TURJ5mfG3+iRJBDDNLl+gy9CDpIQlgDlvAbzF1+WwVo=
+github.com/yunionio/go-ceph v0.0.0-20190912140512-ccc6576c3fe2ef6de74aa1473b9401d95c7cd7c1/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=
diff --git a/vendor/github.com/ceph/go-ceph/rbd/rbd.go b/vendor/github.com/ceph/go-ceph/rbd/rbd.go
index eec380059e..2639167eeb 100644
--- a/vendor/github.com/ceph/go-ceph/rbd/rbd.go
+++ b/vendor/github.com/ceph/go-ceph/rbd/rbd.go
@@ -787,21 +787,21 @@ func (image *Image) GetSnapshotNames() (snaps []SnapInfo, err error) {
 		return nil, RbdErrorImageNotOpen
 	}
 
-	var c_max_snaps C.int
+	var c_max_snaps C.int = 10
+	var c_snaps []C.rbd_snap_info_t
 
-	ret := C.rbd_snap_list(image.image, nil, &c_max_snaps)
+	for i := 0; i < 3; i++ {
+		c_snaps = make([]C.rbd_snap_info_t, c_max_snaps)
+		snaps = make([]SnapInfo, 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)
-
-	ret = C.rbd_snap_list(image.image,
-		&c_snaps[0], &c_max_snaps)
-	if ret < 0 {
-		return nil, RBDError(ret)
+		ret := C.rbd_snap_list(image.image, &c_snaps[0], &c_max_snaps)
+		if ret != -C.ERANGE {
+			if ret >= 0 {
+				break
+			} else if ret < 0 {
+				return nil, RBDError(ret)
+			}
+		}
 	}
 
 	for i, s := range c_snaps {
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 62208a7eb3..1f5521425e 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -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/yunionio/go-ceph v0.0.0-20190912140512-c51b8478c
+# github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94 => github.com/yunionio/go-ceph v0.0.0-20190912140512-ccc6576c3fe2ef6de74aa1473b9401d95c7cd7c1
 github.com/ceph/go-ceph/rados
 github.com/ceph/go-ceph/rbd
 # github.com/coredns/coredns v1.3.0