From 0d1c2aa983e60a93a00ecd26a987c5ea36afc3d3 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Wed, 15 Dec 2021 10:56:34 +0530 Subject: [PATCH] rebase: update go-ceph to release v0.13.0 This commit update go-ceph to v0.13.0 and change CEPH_VERSION in build.env to pacific. Signed-off-by: Rakshith R --- build.env | 2 +- go.mod | 2 +- go.sum | 4 +- .../ceph/go-ceph/cephfs/admin/bytecount.go | 3 - .../ceph/go-ceph/cephfs/admin/clone.go | 3 - .../ceph/go-ceph/cephfs/admin/flags.go | 3 - .../ceph/go-ceph/cephfs/admin/fsadmin.go | 3 - .../ceph/go-ceph/cephfs/admin/mgrmodule.go | 29 +++++++++ .../ceph/go-ceph/cephfs/admin/response.go | 3 - .../ceph/go-ceph/cephfs/admin/subvolume.go | 3 - .../go-ceph/cephfs/admin/subvolumegroup.go | 3 - .../ceph/go-ceph/cephfs/admin/timestamp.go | 3 - .../ceph/go-ceph/cephfs/admin/volume.go | 3 - .../ceph/go-ceph/internal/cutil/aliases.go | 3 + vendor/github.com/ceph/go-ceph/rados/omap.go | 16 +++-- .../github.com/ceph/go-ceph/rados/read_op.go | 4 +- .../ceph/go-ceph/rados/write_op_preview.go | 63 +++++++++++++++++++ .../ceph/go-ceph/rados/write_step.go | 2 +- .../ceph/go-ceph/rbd/admin/imagespec.go | 7 +-- .../github.com/ceph/go-ceph/rbd/admin/task.go | 14 +---- .../ceph/go-ceph/rbd/features_nautilus.go | 3 - .../ceph/go-ceph/rbd/namespace_nautilus.go | 3 - .../ceph/go-ceph/rbd/pool_nautilus.go | 3 - vendor/github.com/ceph/go-ceph/rbd/rbd.go | 5 ++ .../ceph/go-ceph/rbd/rbd_nautilus.go | 3 - .../ceph/go-ceph/rbd/snapshot_namespace.go | 3 - .../ceph/go-ceph/rbd/snapshot_nautilus.go | 3 - vendor/modules.txt | 2 +- 28 files changed, 122 insertions(+), 76 deletions(-) create mode 100644 vendor/github.com/ceph/go-ceph/rados/write_op_preview.go diff --git a/build.env b/build.env index 441140ed8..8590b910e 100644 --- a/build.env +++ b/build.env @@ -13,7 +13,7 @@ CSI_IMAGE_VERSION=canary # Ceph version to use BASE_IMAGE=docker.io/ceph/ceph:v16 -CEPH_VERSION=octopus +CEPH_VERSION=pacific # standard Golang options GOLANG_VERSION=1.17.5 diff --git a/go.mod b/go.mod index 6c625a2ea..3cb35509b 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/IBM/keyprotect-go-client v0.7.0 github.com/aws/aws-sdk-go v1.42.7 github.com/ceph/ceph-csi/api v0.0.0-00010101000000-000000000000 - github.com/ceph/go-ceph v0.12.0 + github.com/ceph/go-ceph v0.13.0 github.com/container-storage-interface/spec v1.5.0 github.com/csi-addons/replication-lib-utils v0.2.0 github.com/csi-addons/spec v0.1.2-0.20211220083702-c779b23cf97c diff --git a/go.sum b/go.sum index 0a3d57516..ccaff2324 100644 --- a/go.sum +++ b/go.sum @@ -168,8 +168,8 @@ github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3 github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/centrify/cloud-golang-sdk v0.0.0-20190214225812-119110094d0f/go.mod h1:C0rtzmGXgN78pYR0tGJFhtHgkbAs0lIbHwkB81VxDQE= -github.com/ceph/go-ceph v0.12.0 h1:nlFgKQZXOFR4oMnzXsKwTr79Y6EYDwqTrpigICGy/Tw= -github.com/ceph/go-ceph v0.12.0/go.mod h1:mafFpf5Vg8Ai8Bd+FAMvKBHLmtdpTXdRP/TNq8XWegY= +github.com/ceph/go-ceph v0.13.0 h1:69dgIPlNHD2OCz98T0benI4++vcnShGcpQK4RIALjw4= +github.com/ceph/go-ceph v0.13.0/go.mod h1:mafFpf5Vg8Ai8Bd+FAMvKBHLmtdpTXdRP/TNq8XWegY= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= diff --git a/vendor/github.com/ceph/go-ceph/cephfs/admin/bytecount.go b/vendor/github.com/ceph/go-ceph/cephfs/admin/bytecount.go index 38f24adf0..664025c70 100644 --- a/vendor/github.com/ceph/go-ceph/cephfs/admin/bytecount.go +++ b/vendor/github.com/ceph/go-ceph/cephfs/admin/bytecount.go @@ -1,6 +1,3 @@ -//go:build !luminous && !mimic -// +build !luminous,!mimic - package admin import ( diff --git a/vendor/github.com/ceph/go-ceph/cephfs/admin/clone.go b/vendor/github.com/ceph/go-ceph/cephfs/admin/clone.go index 8f8b15654..d6dc29ab8 100644 --- a/vendor/github.com/ceph/go-ceph/cephfs/admin/clone.go +++ b/vendor/github.com/ceph/go-ceph/cephfs/admin/clone.go @@ -1,6 +1,3 @@ -//go:build !luminous && !mimic -// +build !luminous,!mimic - package admin import ( diff --git a/vendor/github.com/ceph/go-ceph/cephfs/admin/flags.go b/vendor/github.com/ceph/go-ceph/cephfs/admin/flags.go index 3eb1dc7b0..1f1bdceee 100644 --- a/vendor/github.com/ceph/go-ceph/cephfs/admin/flags.go +++ b/vendor/github.com/ceph/go-ceph/cephfs/admin/flags.go @@ -1,6 +1,3 @@ -//go:build !luminous && !mimic -// +build !luminous,!mimic - package admin // For APIs that accept extra sets of "boolean" flags we may end up wanting diff --git a/vendor/github.com/ceph/go-ceph/cephfs/admin/fsadmin.go b/vendor/github.com/ceph/go-ceph/cephfs/admin/fsadmin.go index 329ef885f..03b3323ae 100644 --- a/vendor/github.com/ceph/go-ceph/cephfs/admin/fsadmin.go +++ b/vendor/github.com/ceph/go-ceph/cephfs/admin/fsadmin.go @@ -1,6 +1,3 @@ -//go:build !luminous && !mimic -// +build !luminous,!mimic - package admin import ( diff --git a/vendor/github.com/ceph/go-ceph/cephfs/admin/mgrmodule.go b/vendor/github.com/ceph/go-ceph/cephfs/admin/mgrmodule.go index 50a915752..7efcd0ce4 100644 --- a/vendor/github.com/ceph/go-ceph/cephfs/admin/mgrmodule.go +++ b/vendor/github.com/ceph/go-ceph/cephfs/admin/mgrmodule.go @@ -52,3 +52,32 @@ func (fsa *FSAdmin) EnableMirroringModule(force bool) error { func (fsa *FSAdmin) DisableMirroringModule() error { return fsa.DisableModule(mirroring) } + +type moduleInfo struct { + EnabledModules []string `json:"enabled_modules"` + //DisabledModules []string `json:"disabled_modules"` + // DisabledModules is documented in ceph as a list of string + // but that's not what comes back from the server (on pacific). + // Since we don't need this today, we're just going to ignore + // it, but if we ever want to support this for external consumers + // we'll need to figure out the real structure of this. +} + +func parseModuleInfo(res response) (*moduleInfo, error) { + m := &moduleInfo{} + if err := res.NoStatus().Unmarshal(m).End(); err != nil { + return nil, err + } + return m, nil +} + +// listModules returns moduleInfo or error. it is not exported because +// this is really not a cephfs specific thing but we needed it +// for cephfs tests. maybe lift it somewhere else someday. +func (fsa *FSAdmin) listModules() (*moduleInfo, error) { + m := map[string]string{ + "prefix": "mgr module ls", + "format": "json", + } + return parseModuleInfo(commands.MarshalMonCommand(fsa.conn, m)) +} diff --git a/vendor/github.com/ceph/go-ceph/cephfs/admin/response.go b/vendor/github.com/ceph/go-ceph/cephfs/admin/response.go index ede0e77ad..d43bd2292 100644 --- a/vendor/github.com/ceph/go-ceph/cephfs/admin/response.go +++ b/vendor/github.com/ceph/go-ceph/cephfs/admin/response.go @@ -1,6 +1,3 @@ -//go:build !luminous && !mimic -// +build !luminous,!mimic - package admin import ( diff --git a/vendor/github.com/ceph/go-ceph/cephfs/admin/subvolume.go b/vendor/github.com/ceph/go-ceph/cephfs/admin/subvolume.go index 8a43597f6..6cd8e550f 100644 --- a/vendor/github.com/ceph/go-ceph/cephfs/admin/subvolume.go +++ b/vendor/github.com/ceph/go-ceph/cephfs/admin/subvolume.go @@ -1,6 +1,3 @@ -//go:build !luminous && !mimic -// +build !luminous,!mimic - package admin // this is the internal type used to create JSON for ceph. diff --git a/vendor/github.com/ceph/go-ceph/cephfs/admin/subvolumegroup.go b/vendor/github.com/ceph/go-ceph/cephfs/admin/subvolumegroup.go index ed6228b7b..b8320e48f 100644 --- a/vendor/github.com/ceph/go-ceph/cephfs/admin/subvolumegroup.go +++ b/vendor/github.com/ceph/go-ceph/cephfs/admin/subvolumegroup.go @@ -1,6 +1,3 @@ -//go:build !luminous && !mimic -// +build !luminous,!mimic - package admin // this is the internal type used to create JSON for ceph. diff --git a/vendor/github.com/ceph/go-ceph/cephfs/admin/timestamp.go b/vendor/github.com/ceph/go-ceph/cephfs/admin/timestamp.go index 48efb12ed..8860e5a64 100644 --- a/vendor/github.com/ceph/go-ceph/cephfs/admin/timestamp.go +++ b/vendor/github.com/ceph/go-ceph/cephfs/admin/timestamp.go @@ -1,6 +1,3 @@ -//go:build !luminous && !mimic -// +build !luminous,!mimic - package admin import ( diff --git a/vendor/github.com/ceph/go-ceph/cephfs/admin/volume.go b/vendor/github.com/ceph/go-ceph/cephfs/admin/volume.go index cd8e7ca04..3131892c2 100644 --- a/vendor/github.com/ceph/go-ceph/cephfs/admin/volume.go +++ b/vendor/github.com/ceph/go-ceph/cephfs/admin/volume.go @@ -1,6 +1,3 @@ -//go:build !luminous && !mimic -// +build !luminous,!mimic - package admin import ( diff --git a/vendor/github.com/ceph/go-ceph/internal/cutil/aliases.go b/vendor/github.com/ceph/go-ceph/internal/cutil/aliases.go index 309c19dab..610ead916 100644 --- a/vendor/github.com/ceph/go-ceph/internal/cutil/aliases.go +++ b/vendor/github.com/ceph/go-ceph/internal/cutil/aliases.go @@ -23,6 +23,9 @@ const ( SizeTSize = C.sizeof_size_t ) +// Compile-time assertion ensuring that Go's `int` is at least as large as C's. +const _ = unsafe.Sizeof(int(0)) - C.sizeof_int + // SizeT wraps size_t from C. type SizeT C.size_t diff --git a/vendor/github.com/ceph/go-ceph/rados/omap.go b/vendor/github.com/ceph/go-ceph/rados/omap.go index e71f84b67..c2756ce32 100644 --- a/vendor/github.com/ceph/go-ceph/rados/omap.go +++ b/vendor/github.com/ceph/go-ceph/rados/omap.go @@ -99,8 +99,8 @@ type GetOmapStep struct { // C returned data: iter C.rados_omap_iter_t - more C.uchar - rval C.int + more *C.uchar + rval *C.int // internal state: @@ -116,6 +116,8 @@ func newGetOmapStep(startAfter, filterPrefix string, maxReturn uint64) *GetOmapS maxReturn: maxReturn, cStartAfter: C.CString(startAfter), cFilterPrefix: C.CString(filterPrefix), + more: (*C.uchar)(C.malloc(C.sizeof_uchar)), + rval: (*C.int)(C.malloc(C.sizeof_int)), } runtime.SetFinalizer(gos, opStepFinalizer) return gos @@ -127,8 +129,10 @@ func (gos *GetOmapStep) free() { C.rados_omap_get_end(gos.iter) } gos.iter = nil - gos.more = 0 - gos.rval = 0 + C.free(unsafe.Pointer(gos.more)) + gos.more = nil + C.free(unsafe.Pointer(gos.rval)) + gos.rval = nil C.free(unsafe.Pointer(gos.cStartAfter)) gos.cStartAfter = nil C.free(unsafe.Pointer(gos.cFilterPrefix)) @@ -136,7 +140,7 @@ func (gos *GetOmapStep) free() { } func (gos *GetOmapStep) update() error { - err := getError(gos.rval) + err := getError(*gos.rval) gos.canIterate = (err == nil) return err } @@ -168,7 +172,7 @@ func (gos *GetOmapStep) Next() (*OmapKeyValue, error) { func (gos *GetOmapStep) More() bool { // tad bit hacky, but go can't automatically convert from // unsigned char to bool - return gos.more != 0 + return *gos.more != 0 } // removeOmapKeysStep is a write operation step used to track state, especially diff --git a/vendor/github.com/ceph/go-ceph/rados/read_op.go b/vendor/github.com/ceph/go-ceph/rados/read_op.go index 4f95e630c..74f2eb2bd 100644 --- a/vendor/github.com/ceph/go-ceph/rados/read_op.go +++ b/vendor/github.com/ceph/go-ceph/rados/read_op.go @@ -77,8 +77,8 @@ func (r *ReadOp) GetOmapValues(startAfter, filterPrefix string, maxReturn uint64 gos.cFilterPrefix, C.uint64_t(gos.maxReturn), &gos.iter, - &gos.more, - &gos.rval, + gos.more, + gos.rval, ) return gos } diff --git a/vendor/github.com/ceph/go-ceph/rados/write_op_preview.go b/vendor/github.com/ceph/go-ceph/rados/write_op_preview.go new file mode 100644 index 000000000..2a01411a6 --- /dev/null +++ b/vendor/github.com/ceph/go-ceph/rados/write_op_preview.go @@ -0,0 +1,63 @@ +//go:build ceph_preview +// +build ceph_preview + +package rados + +// #cgo LDFLAGS: -lrados +// #include +// #include +// +import "C" + +import ( + "unsafe" +) + +// WriteOpCmpExtStep holds result of the CmpExt write operation. +// Result is valid only after Operate() was called. +type WriteOpCmpExtStep struct { + // C returned data: + prval *C.int + + // Result of the CmpExt write operation. + Result int +} + +func (s *WriteOpCmpExtStep) update() error { + s.Result = int(*s.prval) + return nil +} + +func (s *WriteOpCmpExtStep) free() { + C.free(unsafe.Pointer(s.prval)) + s.prval = nil +} + +func newWriteOpCmpExtStep() *WriteOpCmpExtStep { + return &WriteOpCmpExtStep{ + prval: (*C.int)(C.malloc(C.sizeof_int)), + } +} + +// CmpExt ensures that given object range (extent) satisfies comparison. +// PREVIEW +// +// Implements: +// void rados_write_op_cmpext(rados_write_op_t write_op, +// const char * cmp_buf, +// size_t cmp_len, +// uint64_t off, +// int * prval); +func (w *WriteOp) CmpExt(b []byte, offset uint64) *WriteOpCmpExtStep { + oe := newWriteStep(b, 0, offset) + cmpExtStep := newWriteOpCmpExtStep() + w.steps = append(w.steps, oe, cmpExtStep) + C.rados_write_op_cmpext( + w.op, + oe.cBuffer, + oe.cDataLen, + oe.cOffset, + cmpExtStep.prval) + + return cmpExtStep +} diff --git a/vendor/github.com/ceph/go-ceph/rados/write_step.go b/vendor/github.com/ceph/go-ceph/rados/write_step.go index 7ece03f12..3774a6e9f 100644 --- a/vendor/github.com/ceph/go-ceph/rados/write_step.go +++ b/vendor/github.com/ceph/go-ceph/rados/write_step.go @@ -25,7 +25,7 @@ type writeStep struct { func newWriteStep(b []byte, writeLen, offset uint64) *writeStep { return &writeStep{ b: b, - cBuffer: (*C.char)(unsafe.Pointer(&b[0])), + cBuffer: (*C.char)(unsafe.Pointer(&b[0])), // TODO: must be pinned cDataLen: C.size_t(len(b)), cWriteLen: C.size_t(writeLen), cOffset: C.uint64_t(offset), diff --git a/vendor/github.com/ceph/go-ceph/rbd/admin/imagespec.go b/vendor/github.com/ceph/go-ceph/rbd/admin/imagespec.go index 857fc8be2..f2994d99a 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/admin/imagespec.go +++ b/vendor/github.com/ceph/go-ceph/rbd/admin/imagespec.go @@ -1,5 +1,5 @@ -//go:build !nautilus && ceph_preview -// +build !nautilus,ceph_preview +//go:build !nautilus +// +build !nautilus package admin @@ -10,14 +10,12 @@ import ( // ImageSpec values are used to identify an RBD image wherever Ceph APIs // require an image_spec/image_id_spec using image name/id and optional // pool and namespace. -// PREVIEW type ImageSpec struct { spec string } // NewImageSpec is used to construct an ImageSpec given an image name/id // and optional namespace and pool names. -// PREVIEW // // NewImageSpec constructs an ImageSpec to identify an RBD image and thus // requires image name/id, whereas NewLevelSpec constructs LevelSpec to @@ -37,7 +35,6 @@ func NewImageSpec(pool, namespace, image string) ImageSpec { // NewRawImageSpec returns a ImageSpec directly based on the spec string // argument without constructing it from component values. -// PREVIEW // // This should only be used if NewImageSpec can not create the imagespec value // you want to pass to ceph. diff --git a/vendor/github.com/ceph/go-ceph/rbd/admin/task.go b/vendor/github.com/ceph/go-ceph/rbd/admin/task.go index d2f445bd2..750668e5e 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/admin/task.go +++ b/vendor/github.com/ceph/go-ceph/rbd/admin/task.go @@ -1,5 +1,5 @@ -//go:build !nautilus && ceph_preview -// +build !nautilus,ceph_preview +//go:build !nautilus +// +build !nautilus package admin @@ -9,19 +9,16 @@ import ( ) // TaskAdmin encapsulates management functions for ceph rbd task operations. -// PREVIEW type TaskAdmin struct { conn ccom.MgrCommander } // Task returns a TaskAdmin type for managing ceph rbd task operations. -// PREVIEW func (ra *RBDAdmin) Task() *TaskAdmin { return &TaskAdmin{conn: ra.conn} } // TaskRefs contains the action name and information about the image. -// PREVIEW type TaskRefs struct { Action string `json:"action"` PoolName string `json:"pool_name"` @@ -31,7 +28,6 @@ type TaskRefs struct { } // TaskResponse contains the information about the task added on an image. -// PREVIEW type TaskResponse struct { Sequence int `json:"sequence"` ID string `json:"id"` @@ -58,7 +54,6 @@ func parseTaskResponseList(res commands.Response) ([]TaskResponse, error) { // AddFlatten adds a background task to flatten a cloned image based on the // supplied image spec. -// PREVIEW // // Similar To: // rbd task add flatten @@ -73,7 +68,6 @@ func (ta *TaskAdmin) AddFlatten(img ImageSpec) (TaskResponse, error) { // AddRemove adds a background task to remove an image based on the supplied // image spec. -// PREVIEW // // Similar To: // rbd task add remove @@ -88,7 +82,6 @@ func (ta *TaskAdmin) AddRemove(img ImageSpec) (TaskResponse, error) { // AddTrashRemove adds a background task to remove an image from the trash based // on the supplied image id spec. -// PREVIEW // // Similar To: // rbd task add trash remove @@ -102,7 +95,6 @@ func (ta *TaskAdmin) AddTrashRemove(img ImageSpec) (TaskResponse, error) { } // List pending or running asynchronous tasks. -// PREVIEW // // Similar To: // rbd task list @@ -115,7 +107,6 @@ func (ta *TaskAdmin) List() ([]TaskResponse, error) { } // GetTaskByID returns pending or running asynchronous task using id. -// PREVIEW // // Similar To: // rbd task list @@ -129,7 +120,6 @@ func (ta *TaskAdmin) GetTaskByID(taskID string) (TaskResponse, error) { } // Cancel a pending or running asynchronous task. -// PREVIEW // // Similar To: // rbd task cancel diff --git a/vendor/github.com/ceph/go-ceph/rbd/features_nautilus.go b/vendor/github.com/ceph/go-ceph/rbd/features_nautilus.go index 44e1031a7..be12e497c 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/features_nautilus.go +++ b/vendor/github.com/ceph/go-ceph/rbd/features_nautilus.go @@ -1,6 +1,3 @@ -//go:build !luminous && !mimic -// +build !luminous,!mimic - package rbd // #include diff --git a/vendor/github.com/ceph/go-ceph/rbd/namespace_nautilus.go b/vendor/github.com/ceph/go-ceph/rbd/namespace_nautilus.go index 7cb2c3f73..8a44b3752 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/namespace_nautilus.go +++ b/vendor/github.com/ceph/go-ceph/rbd/namespace_nautilus.go @@ -1,6 +1,3 @@ -//go:build !luminous && !mimic -// +build !luminous,!mimic - // // Ceph Nautilus is the first release that includes rbd_namespace_create(), // rbd_namespace_remove(), rbd_namespace_exists() and rbd_namespace_list(). diff --git a/vendor/github.com/ceph/go-ceph/rbd/pool_nautilus.go b/vendor/github.com/ceph/go-ceph/rbd/pool_nautilus.go index a45326c65..42b428293 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/pool_nautilus.go +++ b/vendor/github.com/ceph/go-ceph/rbd/pool_nautilus.go @@ -1,6 +1,3 @@ -//go:build !luminous && !mimic -// +build !luminous,!mimic - // // Ceph Nautilus is the first release that includes rbd_pool_metadata_get(), // rbd_pool_metadata_set() and rbd_pool_metadata_remove(). diff --git a/vendor/github.com/ceph/go-ceph/rbd/rbd.go b/vendor/github.com/ceph/go-ceph/rbd/rbd.go index 7d5b1ce65..e7cd6c7cf 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/rbd.go +++ b/vendor/github.com/ceph/go-ceph/rbd/rbd.go @@ -951,6 +951,11 @@ func (image *Image) GetId() (string, error) { } +// GetName returns the image name. +func (image *Image) GetName() string { + return image.name +} + // SetSnapshot updates the rbd image (not the Snapshot) such that the snapshot // is the source of readable data. // diff --git a/vendor/github.com/ceph/go-ceph/rbd/rbd_nautilus.go b/vendor/github.com/ceph/go-ceph/rbd/rbd_nautilus.go index 4359fbf4f..b97dc9fb6 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/rbd_nautilus.go +++ b/vendor/github.com/ceph/go-ceph/rbd/rbd_nautilus.go @@ -1,6 +1,3 @@ -//go:build !luminous && !mimic -// +build !luminous,!mimic - // // Ceph Nautilus is the first release that includes rbd_list2() and // rbd_get_create_timestamp(). diff --git a/vendor/github.com/ceph/go-ceph/rbd/snapshot_namespace.go b/vendor/github.com/ceph/go-ceph/rbd/snapshot_namespace.go index eeec8c262..17c675426 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/snapshot_namespace.go +++ b/vendor/github.com/ceph/go-ceph/rbd/snapshot_namespace.go @@ -1,6 +1,3 @@ -//go:build !luminous -// +build !luminous - // // Ceph Mimic introduced rbd_snap_get_namespace_type(). diff --git a/vendor/github.com/ceph/go-ceph/rbd/snapshot_nautilus.go b/vendor/github.com/ceph/go-ceph/rbd/snapshot_nautilus.go index 512a72c22..c5ca4eb11 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/snapshot_nautilus.go +++ b/vendor/github.com/ceph/go-ceph/rbd/snapshot_nautilus.go @@ -1,6 +1,3 @@ -//go:build !luminous && !mimic -// +build !luminous,!mimic - // // Ceph Nautilus introduced rbd_get_parent() and deprecated rbd_get_parent_info(). // Ceph Nautilus introduced rbd_list_children3() and deprecated rbd_list_children(). diff --git a/vendor/modules.txt b/vendor/modules.txt index 4961a503d..e9bbb4a31 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -69,7 +69,7 @@ github.com/cenkalti/backoff/v3 ## explicit; go 1.16 github.com/ceph/ceph-csi/api/deploy/kubernetes/rbd github.com/ceph/ceph-csi/api/deploy/ocp -# github.com/ceph/go-ceph v0.12.0 +# github.com/ceph/go-ceph v0.13.0 ## explicit; go 1.12 github.com/ceph/go-ceph/cephfs/admin github.com/ceph/go-ceph/common/commands