diff --git a/.github/workflows/pr-filepath-check.yml b/.github/workflows/pr-filepath-check.yml new file mode 100644 index 000000000..2e4b3d6ea --- /dev/null +++ b/.github/workflows/pr-filepath-check.yml @@ -0,0 +1,93 @@ +name: Pull Request File Path Check +on: [pull_request] +jobs: + + filepath-check: + name: Check for invalid characters in file paths + runs-on: ubuntu-latest + steps: + + - name: Check out the code + uses: actions/checkout@v6 + + - name: Validate file paths for Go module compatibility + run: | + # Go's module zip rejects filenames containing certain characters. + # See golang.org/x/mod/module fileNameOK() for the full specification. + # + # Allowed ASCII: letters, digits, and: !#$%&()+,-.=@[]^_{}~ and space + # Allowed non-ASCII: unicode letters only + # Rejected: " ' * < > ? ` | / \ : and any non-letter unicode (control + # chars, format chars like U+200E LEFT-TO-RIGHT MARK, etc.) + # + # This check catches issues like the U+200E incident in PR #9552. + + EXIT_STATUS=0 + + git ls-files -z | python3 -c " + import sys, unicodedata + + data = sys.stdin.buffer.read() + files = data.split(b'\x00') + + # Characters explicitly rejected by Go's fileNameOK + # (path separators / and \ are inherent to paths so we check per-element) + bad_ascii = set('\"' + \"'\" + '*<>?\`|:') + + allowed_ascii = set('!#$%&()+,-.=@[]^_{}~ ') + + def is_ok(ch): + if ch.isascii(): + return ch.isalnum() or ch in allowed_ascii + return ch.isalpha() + + bad_files = [] # list of (original_path, clean_path, char_desc) + for f in files: + if not f: + continue + try: + name = f.decode('utf-8') + except UnicodeDecodeError: + print(f'::error::Non-UTF-8 bytes in filename: {f!r}') + bad_files.append((repr(f), None, 'non-UTF-8 bytes')) + continue + + # Check each path element (split on /) + for element in name.split('/'): + for ch in element: + if not is_ok(ch): + cp = ord(ch) + char_name = unicodedata.name(ch, f'U+{cp:04X}') + char_desc = f'U+{cp:04X} ({char_name})' + # Build cleaned path by stripping invalid chars + clean = '/'.join( + ''.join(c for c in elem if is_ok(c)) + for elem in name.split('/') + ) + print(f'::error file={name}::File \"{name}\" contains invalid char {char_desc}') + bad_files.append((name, clean, char_desc)) + break + + if bad_files: + print() + print('The following files have characters that are invalid in Go module zip archives:') + print() + for original, clean, desc in bad_files: + print(f' {original} — {desc}') + print() + print('To fix, rename the files to remove the problematic characters:') + print() + for original, clean, desc in bad_files: + if clean: + print(f' mv \"{original}\" \"{clean}\" && git add \"{clean}\"') + print(f' # or: git mv \"{original}\" \"{clean}\"') + else: + print(f' # {original} — cannot auto-suggest rename (non-UTF-8)') + print() + print('See https://github.com/vmware-tanzu/velero/pull/9552 for context.') + sys.exit(1) + else: + print('All file paths are valid for Go module zip.') + " || EXIT_STATUS=1 + + exit $EXIT_STATUS diff --git a/Dockerfile b/Dockerfile index 6ce46ca3b..9b1e04a20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.25-bookworm AS velero-builder +FROM --platform=$BUILDPLATFORM golang:1.25-trixie AS velero-builder ARG GOPROXY ARG BIN @@ -48,30 +48,6 @@ RUN mkdir -p /output/usr/bin && \ -ldflags "${LDFLAGS}" ${PKG}/cmd/velero-helper && \ go clean -modcache -cache -# Restic binary build section -FROM --platform=$BUILDPLATFORM golang:1.25-bookworm AS restic-builder - -ARG GOPROXY -ARG BIN -ARG TARGETOS -ARG TARGETARCH -ARG TARGETVARIANT -ARG RESTIC_VERSION - -ENV CGO_ENABLED=0 \ - GO111MODULE=on \ - GOPROXY=${GOPROXY} \ - GOOS=${TARGETOS} \ - GOARCH=${TARGETARCH} \ - GOARM=${TARGETVARIANT} - -COPY . /go/src/github.com/vmware-tanzu/velero - -RUN mkdir -p /output/usr/bin && \ - export GOARM=$(echo "${GOARM}" | cut -c2-) && \ - /go/src/github.com/vmware-tanzu/velero/hack/build-restic.sh && \ - go clean -modcache -cache - # Velero image packing section FROM paketobuildpacks/run-jammy-tiny:latest @@ -79,7 +55,4 @@ LABEL maintainer="Xun Jiang " COPY --from=velero-builder /output / -COPY --from=restic-builder /output / - USER cnb:cnb - diff --git a/Dockerfile-Windows b/Dockerfile-Windows index ac22531dc..757da8f80 100644 --- a/Dockerfile-Windows +++ b/Dockerfile-Windows @@ -15,7 +15,7 @@ ARG OS_VERSION=1809 # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.25-bookworm AS velero-builder +FROM --platform=$BUILDPLATFORM golang:1.25-trixie AS velero-builder ARG GOPROXY ARG BIN diff --git a/Makefile b/Makefile index 82129623d..59f767afc 100644 --- a/Makefile +++ b/Makefile @@ -105,8 +105,6 @@ see: https://velero.io/docs/main/build-from-source/#making-images-and-updating-v endef # comma cannot be escaped and can only be used in Make function arguments by putting into variable comma=, -# The version of restic binary to be downloaded -RESTIC_VERSION ?= 0.15.0 CLI_PLATFORMS ?= linux-amd64 linux-arm linux-arm64 darwin-amd64 darwin-arm64 windows-amd64 linux-ppc64le linux-s390x BUILD_OUTPUT_TYPE ?= docker @@ -260,7 +258,6 @@ container-linux: --build-arg=GIT_SHA=$(GIT_SHA) \ --build-arg=GIT_TREE_STATE=$(GIT_TREE_STATE) \ --build-arg=REGISTRY=$(REGISTRY) \ - --build-arg=RESTIC_VERSION=$(RESTIC_VERSION) \ --provenance=false \ --sbom=false \ -f $(VELERO_DOCKERFILE) . diff --git a/Tiltfile b/Tiltfile index 7f2029f6d..8bfa2ac2f 100644 --- a/Tiltfile +++ b/Tiltfile @@ -103,11 +103,6 @@ local_resource( deps = ["internal", "pkg/cmd"], ) -local_resource( - "restic_binary", - cmd = 'cd ' + '.' + ';mkdir -p _tiltbuild/restic; BIN=velero GOOS=linux GOARCH=amd64 GOARM="" RESTIC_VERSION=0.13.1 OUTPUT_DIR=_tiltbuild/restic ./hack/build-restic.sh', -) - # Note: we need a distro with a bash shell to exec into the Velero container tilt_dockerfile_header = """ FROM ubuntu:22.04 as tilt @@ -118,7 +113,6 @@ WORKDIR / COPY --from=tilt-helper /start.sh . COPY --from=tilt-helper /restart.sh . COPY velero . -COPY restic/restic /usr/bin/restic """ dockerfile_contents = "\n".join([ diff --git a/changelogs/unreleased/9516-shubham-pampattiwar b/changelogs/unreleased/9516-shubham-pampattiwar new file mode 100644 index 000000000..14f518c41 --- /dev/null +++ b/changelogs/unreleased/9516-shubham-pampattiwar @@ -0,0 +1 @@ +Fix VolumeGroupSnapshot restore failure with Ceph RBD CSI driver by creating stub VolumeGroupSnapshotContent during restore and looking up VolumeSnapshotClass by driver for credential support diff --git a/changelogs/unreleased/9528-Lyndon-Li b/changelogs/unreleased/9528-Lyndon-Li new file mode 100644 index 000000000..52bb4a8f3 --- /dev/null +++ b/changelogs/unreleased/9528-Lyndon-Li @@ -0,0 +1 @@ +Add block data mover design for block level incremental backup by integrating with Kubernetes CBT \ No newline at end of file diff --git a/changelogs/unreleased/9533-Lyndon-Li‎‎ b/changelogs/unreleased/9533-Lyndon-Li similarity index 100% rename from changelogs/unreleased/9533-Lyndon-Li‎‎ rename to changelogs/unreleased/9533-Lyndon-Li diff --git a/changelogs/unreleased/9560-Lyndon-Li‎‎ b/changelogs/unreleased/9560-Lyndon-Li similarity index 100% rename from changelogs/unreleased/9560-Lyndon-Li‎‎ rename to changelogs/unreleased/9560-Lyndon-Li diff --git a/changelogs/unreleased/9561-Lyndon-Li‎‎ b/changelogs/unreleased/9561-Lyndon-Li similarity index 100% rename from changelogs/unreleased/9561-Lyndon-Li‎‎ rename to changelogs/unreleased/9561-Lyndon-Li diff --git a/changelogs/unreleased/9634-Lyndon-Li‎‎ b/changelogs/unreleased/9634-Lyndon-Li similarity index 100% rename from changelogs/unreleased/9634-Lyndon-Li‎‎ rename to changelogs/unreleased/9634-Lyndon-Li diff --git a/changelogs/unreleased/9663-Lyndon-Li‎‎ b/changelogs/unreleased/9663-Lyndon-Li similarity index 100% rename from changelogs/unreleased/9663-Lyndon-Li‎‎ rename to changelogs/unreleased/9663-Lyndon-Li diff --git a/changelogs/unreleased/9676-Lyndon-Li b/changelogs/unreleased/9676-Lyndon-Li new file mode 100644 index 000000000..2fb765e29 --- /dev/null +++ b/changelogs/unreleased/9676-Lyndon-Li @@ -0,0 +1 @@ +Fix issue #9470, remove restic from repository \ No newline at end of file diff --git a/changelogs/unreleased/9677-Lyndon-Li b/changelogs/unreleased/9677-Lyndon-Li new file mode 100644 index 000000000..f722008e9 --- /dev/null +++ b/changelogs/unreleased/9677-Lyndon-Li @@ -0,0 +1 @@ +Fix issue #9469, remove restic for uploader \ No newline at end of file diff --git a/changelogs/unreleased/9682-adam-jian-zhang b/changelogs/unreleased/9682-adam-jian-zhang new file mode 100644 index 000000000..0cb724f5b --- /dev/null +++ b/changelogs/unreleased/9682-adam-jian-zhang @@ -0,0 +1 @@ +Fix issue #9681, fix restores and podvolumerestores list options to only list in installed namespace diff --git a/changelogs/unreleased/9683-Lyndon-Li b/changelogs/unreleased/9683-Lyndon-Li new file mode 100644 index 000000000..25b247bc1 --- /dev/null +++ b/changelogs/unreleased/9683-Lyndon-Li @@ -0,0 +1 @@ +Fix issue #9428, increase repo maintenance history queue length from 3 to 25 \ No newline at end of file diff --git a/changelogs/unreleased/9693-priyansh17 b/changelogs/unreleased/9693-priyansh17 new file mode 100644 index 000000000..0023a3c18 --- /dev/null +++ b/changelogs/unreleased/9693-priyansh17 @@ -0,0 +1 @@ +Enhance backup deletion logic to handle tarball download failures \ No newline at end of file diff --git a/changelogs/unreleased/9695-shubham-pampattiwar b/changelogs/unreleased/9695-shubham-pampattiwar new file mode 100644 index 000000000..53deadee3 --- /dev/null +++ b/changelogs/unreleased/9695-shubham-pampattiwar @@ -0,0 +1 @@ +Bump external-snapshotter to v8.4.0 and migrate VolumeGroupSnapshot API from v1beta1 to v1beta2 for Kubernetes 1.34+ compatibility diff --git a/changelogs/unreleased/9700-priyansh17 b/changelogs/unreleased/9700-priyansh17 new file mode 100644 index 000000000..b3cb5af68 --- /dev/null +++ b/changelogs/unreleased/9700-priyansh17 @@ -0,0 +1 @@ +Fix issue #9699, add a 2-second gap between temporary CSI VolumeSnapshotContent create and delete operations \ No newline at end of file diff --git a/changelogs/unreleased/9701-emirot b/changelogs/unreleased/9701-emirot new file mode 100644 index 000000000..585c1c42a --- /dev/null +++ b/changelogs/unreleased/9701-emirot @@ -0,0 +1 @@ +Update Debian base image from bookworm to trixie \ No newline at end of file diff --git a/changelogs/unreleased/9704-adam-jian-zhang b/changelogs/unreleased/9704-adam-jian-zhang new file mode 100644 index 000000000..59ae81e9a --- /dev/null +++ b/changelogs/unreleased/9704-adam-jian-zhang @@ -0,0 +1 @@ +Fix issue #9703, fix CSI PVC Backup Plugin list options to only list in installed namespace diff --git a/changelogs/unreleased/9705-emirot b/changelogs/unreleased/9705-emirot new file mode 100644 index 000000000..3bd8117bc --- /dev/null +++ b/changelogs/unreleased/9705-emirot @@ -0,0 +1 @@ +perf: better string concatenation diff --git a/changelogs/unreleased/9724-Lyndon-Li b/changelogs/unreleased/9724-Lyndon-Li new file mode 100644 index 000000000..5eea82187 --- /dev/null +++ b/changelogs/unreleased/9724-Lyndon-Li @@ -0,0 +1 @@ +Fix issue #9723, extend Unified Repo Interface to support block uploader \ No newline at end of file diff --git a/changelogs/unreleased/9728-blackpiglet b/changelogs/unreleased/9728-blackpiglet new file mode 100644 index 000000000..a0a9c897f --- /dev/null +++ b/changelogs/unreleased/9728-blackpiglet @@ -0,0 +1 @@ +Remove Restic build from Dockerfile, Makefile and Tiltfile. \ No newline at end of file diff --git a/config/crd/v1/bases/velero.io_backuprepositories.yaml b/config/crd/v1/bases/velero.io_backuprepositories.yaml index 19e4ce0dc..a7a2510bd 100644 --- a/config/crd/v1/bases/velero.io_backuprepositories.yaml +++ b/config/crd/v1/bases/velero.io_backuprepositories.yaml @@ -69,9 +69,7 @@ spec: - "" type: string resticIdentifier: - description: |- - ResticIdentifier is the full restic-compatible string for identifying - this repository. This field is only used when RepositoryType is "restic". + description: Deprecated type: string volumeNamespace: description: |- diff --git a/config/crd/v1/crds/crds.go b/config/crd/v1/crds/crds.go index d26e9cfd8..032a1ac84 100644 --- a/config/crd/v1/crds/crds.go +++ b/config/crd/v1/crds/crds.go @@ -29,7 +29,7 @@ import ( ) var rawCRDs = [][]byte{ - []byte("\x1f\x8b\b\x00\x00\x00\x00\x00\x00\xff\xccXK\x8f۶\x13\xbf\xfbS\f\xf6\x7f\xfd\xcbnP\xb4(|K\xdc\x06\b\x9a\x04\v{\x91;-\x8dlf)\x92%\x87N\xdd\xc7w/\x86\x94lY\xa2\xad\xf5\x1e\x8a\xf2&r\u07bfy\xd9EQ̄\x95_\xd0yi\xf4\x12\x84\x95\xf8;\xa1\xe6/?\x7f\xfe\xc9ϥY\x1c\xde̞\xa5\xae\x96\xb0\n\x9eL\xb3Fo\x82+\xf1g\xac\xa5\x96$\x8d\x9e5H\xa2\x12$\x963\x00\xa1\xb5!\xc1מ?\x01J\xa3\xc9\x19\xa5\xd0\x15;\xd4\xf3\xe7\xb0\xc5m\x90\xaaB\x17\x85w\xaa\x0f\xdf\xcd\xdf\xfc8\xffa\x06\xa0E\x83K؊\xf29X\x87\xd6xI\xc6I\xf4\xf3\x03*tf.\xcd\xcc[,Y\xfaΙ`\x97p~Hܭ\xe6d\xf5\xbb(h\xdd\t:\xc6'%=\xfd\x9a}\xfe(=E\x12\xab\x82\x13*gH|\xf6R\xef\x82\x12nD\xc0\n|i,.\xe13\xdbbE\x89\xd5\f\xa0\xf54\xdaV\x80\xa8\xaa\x18;\xa1\x1e\x9dԄneTh\xba\x98\x15\xf0\xd5\x1b\xfd(h\xbf\x84y\x17\xddy\xe90\x06\xf6I6\xe8I46\xd2v\x01{\xbb\xc3\xf6\x9b\x8e\xac\xbc\x12\x84ca\x1c\xb9\xf9\xd9֧\xa3\xc5\v)\xe7@@\xef-I\xf4\xe4\xa4\xde\xcd\xceć7)\x14\xe5\x1e\x1b\xb1li\x8dE\xfd\xf6\xf1×\xef7\x17\xd7\x00\xd6\x19\x8b\x8ed\aO:\xbd\xf4\xeb\xdd\x02T\xe8K'-\xc5\xe4\xf8\xab\xb8x\x03`\x05\x89\v*\xceC\xf4@{\xecb\x8cUk\x13\x98\x1ah/=8\xb4\x0e=ꔙ|-4\x98\xedW,i>\x10\xbdA\xc7b\xc0\xefMP\x15\xa7\xef\x01\x1d\x81\xc3\xd2\xec\xb4\xfc\xe3$\xdb\x03\x99\xa8T\tBO\x10Q\xd4B\xc1A\xa8\x80\xff\a\xa1\xab\x81\xe4F\x1c\xc1!넠{\xf2\"\x83\x1f\xda\xf1\xc98\x04\xa9k\xb3\x84=\x91\xf5\xcb\xc5b'\xa9+\xca\xd24MВ\x8e\x8bX_r\x1b\xc88\xbf\xa8\xf0\x80j\xe1\xe5\xae\x10\xae\xdcK\u0092\x82Å\xb0\xb2\x88\x8e\xe8X\x98\xf3\xa6\xfa\x9fk\xcb\xd8_\xa8\x1d\x01\x9dN\xac\xa4;\xe0\xe1\xd2\x02\xe9A\xb4\xa2\x92\x8bg\x14\xf8\x8aC\xb7\xfee\xf3\x04\x9d%\t\xa9\x04ʙt\x14\x97\x0e\x1f\x8e\xa6\xd45\xba\xc4W;\xd3D\x99\xa8+k\xa4\xa6\xf8Q*\x89\x9a\xc0\x87m#\x89\xd3ව\x9e\x18\xba\xa1\xd8Ul\\\xb0E\b\x96K\xa7\x1a\x12|а\x12\r\xaa\x95\xf0\xf8/cŨ\xf8\x82Ax\x11Z\xfdv<$N\xe1\xed=t\xad\xf4\n\xb4\xc3\xf6\xb8\xb1X2\xb2\x1c\\f\x95\xb5,SM\xd5Ɓ\x18\xd1_F*\xdf\x02\xf8\xa4&\xba!\xe3\xc4\x0e?\x9a$sH4\x95v|\xde\xe5\x04u\x16s\xdbJ=\x01\xf3\x84\x19\x81\xb4\x17\xd4k\x06$\xa4>\xf5\x94\xac\x937\x90\x89\xe8\b\xee\x14Z\xe8\x12\xdf\xc7|\xd4\xe5q\xc2\xd1O\x19\x16vio\xbe\x81\xa9\tu_hkkƓ-\x82\v\xfa.c\xcf>\xae\x8c\xae\xe5nlh\x7f\x90]\x03wB\xc9\xc0\xdb\xf5@'{\xca\xc9u\xb6\xa5\xe82\x8f\x01\xa9\xe5.\xb8k\xe0\xd5\x12U5j!\x00:(%\xb6\n\x97@.\xe0\x95\x88\x8cj\xe52\"<\x1f'\x80[_\x10\x83\xd4\x15WK;\xacXI\x97\x8c\x9c\xfe\xa8+p\x97kJ\xff\xa0\x0e\xcdX]\x01\xcf\xc6J\x91\xb9w\xe8I\x96\x99\x87\x87\x87\xfb2\x80\xc5|\xa8\xb8\x1d\xd5\x12\xddkjr=\x90ѕc\x1d\x94j\x15\x14\xa5i\xac \xb9U\xd8\xcd\f\xc6\\&\x9ec.i`T\x86\xf0\x14'\x01c\xce*\x8cVG\b\x1e+\xf8\xb6G=\x02\xc3\xc3C\xd2\xfdpWI\x1cxQ\xc3\xd3j\xf7\x9ax|\xb9\x14\xd1\xefN\xe9\":\x96ZbϿ\xae\xfd\xf8\x8cHk\xaaֲ\x96/\xd6\xcc\x1d\x8eq_\x91\x0e\ac\xbe\xc87\xe6\x01M\xae\xa5\rH\x06Q{\xd1d\"A\xc1\xdf3\x9b\"C\x17\xcd28\x17g\x7f\xba\xe5\x95\xef\xd5\xd3I\tO\xbd&\xcc\v\xf8\x04\xee\x1f\xc7\x1c\x9da,\f\x88/\x18\xda~\xf02\xb8\xfaP\x96\x88\xd5x\x1d\x01Ʒ\x11\x94\x16\xfd\x82彮\xcb\xe5\x87\x14z/vSN~JTi\xd3kY@lM\xa0+\b\xd0>\xe7\xe3mT&,\xb5{\xe1\xa7\xec|d\x9a\\^\f\x96\x81[&\\k\xbf\x9f\xf1[\xe6v\x8d\xa2\x1a\xb7\xf0\x02>\x1b\xca?\xdd\xec\xc0%\xea~2M\x0e\x9d\x01={~\x81A+r\x94\x7fc\xaf%a\x93\x1d\xe7\xd7k%\x1dn\xe7\n\tO\xbfU\xf3d\x03\xd3WC\xae\x13h\xe9\x81W\xb9X9Ws\xa9\vٔc\xe9L\x97P:\x13\x85\x94\xce\xcd\r\an\x15U&\x12\xf7\x96\xd6\xd5P$\xb8_\x16\x8eI\x0f\x1c\xfa\xa0\xe8E\x0e\xac#i\x87_b<\xa7\xdf\xcb\xec\xc9\xd7\\:\x05l\xba\xd6x\x95⽐\xea\xea\U000e4cde\x84\xa3\xfb\xf2ws\xc1r\xfa\x9dķ\xfd\xbc\xfdO\xe6獝\xb7{\x14Ή\xe3\xf4\xe8\x1e]z\xfe\xc9^\xf5\x8c\xf3i\x9d\xe8߄\xed\xe9\x1f\x89%\xfc\xf9\xf7\xec\x9f\x00\x00\x00\xff\xff\x18\xd9g\x90\x9b\x14\x00\x00"), + []byte("\x1f\x8b\b\x00\x00\x00\x00\x00\x00\xff\xccW͎\xdb6\x10\xbe\xfb)\x06鵲\x1b\x14-\n\xdf\x12\xa7\x01\x82&\xc1\xc2\x0e\xf6NSc\x99Y\x8adɡS\xf7\xe7\u074b!%[\x96dk\xbd\x87\xa2\xbc\x89\x9c\xffo\xe6#U\x14\xc5L8\xf5\x88>(k\x96 \x9c\xc2?\b\r\x7f\x85\xf9\xd3/a\xae\xec\xe2\xf0z\xf6\xa4L\xb9\x84U\fd\xeb5\x06\x1b\xbd\xc4w\xb8SF\x91\xb2fV#\x89R\x90X\xce\x00\x841\x96\x04o\a\xfe\x04\x90\u0590\xb7Z\xa3/*4\xf3\xa7\xb8\xc5mT\xbaD\x9f\x8c\xb7\xae\x0f?\xcc_\xff<\xffi\x06`D\x8dK\xd8\n\xf9\x14\x9dGg\x83\"\xeb\x15\x86\xf9\x015z;Wv\x16\x1cJ\xb6^y\x1b\xdd\x12\xce\aY\xbb\xf1\x9c\xa3~\x9b\f\xad[C\xc7t\xa4U\xa0\xdfF\x8f?\xaa@I\xc4\xe9\xe8\x85\x1e\v$\x1d\ae\xaa\xa8\x85\x1f\b\xb0\x83 \xad\xc3%|\xe6X\x9c\x90X\xce\x00\x9aLSl\x05\x88\xb2L\xb5\x13\xfa\xc1+C\xe8WVǺ\xadY\x01_\x835\x0f\x82\xf6K\x98\xb7՝K\x8f\xa9\xb0_T\x8d\x81D\xed\x92l[\xb07\x156\xdftd\xe7\xa5 \x1c\x1a\xe3\xca\xcdϱ~9:\xbc\xb0r.\x04tβ\xc5@^\x99jv\x16>\xbcΥ\x90{\xacŲ\x91\xb5\x0e͛\x87\x0f\x8f?n.\xb6\x01\x9c\xb7\x0e=\xa9\x16\x9e\xbc:\xed\xd7\xd9\x05(1H\xaf\x1c\xa5\xe6\xf8\xbb\xb88\x03`\aY\vJ\xeeC\f@{lk\x8ce\x13\x13\xd8\x1d\xd0^\x05\xf0\xe8<\x064\xb93y[\x18\xb0ۯ(i\xde3\xbdA\xcff \xecm\xd4%\xb7\xef\x01=\x81Gi+\xa3\xfe<\xd9\x0e@69Ղ0\x10$\x14\x8d\xd0p\x10:\xe2\xf7 Lٳ\\\x8b#xd\x9f\x10M\xc7^R\b\xfd8>Y\x8f\xa0\xcc\xce.aO\xe4\xc2r\xb1\xa8\x14\xb5C)m]G\xa3\xe8\xb8H\U000e5d91\xac\x0f\x8b\x12\x0f\xa8\x17AU\x85\xf0r\xaf\b%E\x8f\v\xe1T\x91\x121i0\xe7u\xf9\x9do\xc68\\\xb8\x1d\x00\x9dW\x9a\xa4;\xe0\xe1\xd1\x02\x15@4\xa6r\x8ag\x14x\x8bK\xb7\xfeu\xf3\x05\xdaH2R\x19\x94\xb3\xe8\xa0.->\\Mev\xe8\xb3\xde\xce\xdb:\xd9DS:\xab\f\xa5\x0f\xa9\x15\x1a\x82\x10\xb7\xb5\"n\x83\xdf#\x06b\xe8\xfafW\x89\xb8`\x8b\x10\x1d\x8fN\xd9\x17\xf8``%j\xd4+\x11\xf0?ƊQ\t\x05\x83\xf0,\xb4\xbat\xdc\x17\xce\xe5\xed\x1c\xb4Tz\x05\xda>=n\x1cJF\x96\x8b˪j\xa7d\x9e\xa9\x9d\xf5 \x06\xf2\x97\x95\x1a\xa7\x00^\x99D7d\xbd\xa8\xf0\xa3\xcd6\xfbBSm\xc7\xeb혡6b\xa6\xad\xcc\t8.8b\x90\xf6\x82:d@B\x99\x13\xa7\x8c&y\x03\x99\x84\x8e`\xa60\xc2H|\x9f\xfa\xd1\xc8\xe3D\xa2\x9fFT8\xa5\xbd\xfd\x06vGh\xbaF\x9bXG2\xd9\"\xf8h\xee\n\xf6\x9c\xe3ʚ\x9d\xaa\x86\x81v/\xb2k\xe0N8\xe9e\xbb\xee\xf9\xe4L\xb9\xb9α\x14m\xe71 ;UE\x7f\r\xbc\x9dB]\x0e(\x04\xc0D\xad\xc5V\xe3\x12\xc8G\xbcR\x91\xc1\xac\\V\x84\xef\xc7\t\xe0\xd6\x17\u00a0L\xc9\xd3\xd2\\V\xec\xa4mFn\x7f4%\xf8\xcbgJw\xa1\x89\xf5\xd0]\x01O\xd6)1\xb2\xef1\x90\x92#\a\xaf^\xdd\xd7\x01l\xe6C\xc9t\xb4S\xe8'2~Ǽ\xcd9\x0e\x1b\xf0\x86\x93\x03?~\xf0\xf4\\z\xc9\xdc?^\x9a\xe8N|\xdeH3\x9bi\xa6S\xe6v\xa4ÈIg\xcb&\xb2F/\xf5\xe1\x1d\xf3ó\xaa<\xf6\xae\xceb\x9c\xecz2c4\xd1\x13\xe9U\xedYlO\x82b\xb8\x87\xef\x93B[M\x19\xbdO\xf7i\xde\xe5gԋ\x19_\x8b@\x1db\xe3G\xed\x04\xee\x1f\x87\x1am`l\f\x887\x18\xdan\xf1Fp\rQJ\xc4rx\xc5\x03\xe3[\vʏ\xe7\x82\xed\xbd\x8c9Ɖ\x1fC\x10\xd5T\x92\x9f\xb2T~=5* \xb66\xd2\x15\x04h?\x96\xe3mT&\"u{\x11\xa6\xe2|`\x99\xb1\xbe\xe8]\xb0\xb7B\xb8Fi\x9f\xf1\xdb\xc8\xee\x1aE9\xa4\xc5\x02>[\x1a?\xba\xc9j\x12M\xb7\x99&\x89\xbc'ϙ_`И\x1c\xf4\xdf0kEX\x8f^\x91\xd7g%/ik\xa7\x91\xf0\xf4\xff7.\xd6\v}\xd5\xd7:\x81\x96\x0f\xf8y\x94&\xe7j/\xb5%\x9bJ,\xaf\xe9\x11\xcakb\x90\xf2\xba\xf9j\x80[C5R\x89{G\xebj)2\xdc\xcf+\xc7d\x06\x1eC\xd4\xf4\xac\x04\xd6I\xb4\xc5/+\x9e\xdb\xefy\xf1\x8c\xcf\\^\x05lZj\xbc*\xf1^(}\xf5x2\xd9@\xc2\xd3}\xfd\xbb\xb9P9\xfd{\xf0n\xb7o\xff\x97\xfdy\xe3\x1d\xd9\x1e\n\xef\xc5q\xfa\xea\x1el\x06\xfe\r.;\xc1\x85\xfc\x9c\xe8\xee\xc4\xed\xe9/\x7f\t\x7f\xfd3\xfb7\x00\x00\xff\xff\x96֥5\xef\x13\x00\x00"), []byte("\x1f\x8b\b\x00\x00\x00\x00\x00\x00\xff\xec=]s\xdb8\x92\xef\xf9\x15(\xdd\xc3\xecnI\xf6\xa6\ue8ee\xfc\x96q\x92\x1d\xd5\xcc$\xde\xd8\xe3}\x86Ȗ\x841\bp\x00P\xb6\xf6\xee\xfe\xfb\x15\x1a\x00?DP\x04eٓ\xdd\r_\x12\x8b`\x03\xfd\xddh4\x80\xc5b\xf1\x86\x96\xec\x1e\x94fR\\\x11Z2x2 \xec_\xfa\xe2\xe1\xbf\xf5\x05\x93\x97\xbb\xb7o\x1e\x98ȯ\xc8u\xa5\x8d,\xbe\x80\x96\x95\xca\xe0=\xac\x99`\x86I\xf1\xa6\x00Csj\xe8\xd5\x1bB\xa8\x10\xd2P\xfb\xb3\xb6\x7f\x12\x92Ia\x94\xe4\x1c\xd4b\x03\xe2\xe2\xa1Z\xc1\xaab<\a\x85\xc0C\u05fb?_\xbc\xfd\xaf\x8b\xff|C\x88\xa0\x05\\\x91\x15\xcd\x1e\xaaR_쀃\x92\x17L\xbe\xd1%d\x16\xe4Fɪ\xbc\"\xcd\v\xf7\x89\xef\xce\r\xf5{\xfc\x1a\x7f\xe0L\x9b\x1f[?\xfeĴ\xc1\x17%\xaf\x14\xe5uO\xf8\x9bfbSq\xaa¯o\bљ,\xe1\x8a|\xb2]\x944\x83\xfc\r!~\xd4\xd8\xe5\xc2\x0fx\xf7\xd6AȶPP7\x16Bd\t\xe2\xdd\xcd\xf2\xfe\xdfo;?\x13\x92\x83\xce\x14+\r\xe2\xfe\xbf\x8b\xfaw\xe2GI\x98&\x94\xdc#\x8eDy\x92\x13\xb3\xa5\x86((\x15h\x10F\x13\xb3\x05\x92\xd1\xd2T\n\x88\\\x93\x1f\xab\x15(\x01\x06t\v^\xc6+m@\x11m\xa8\x01B\r\xa1\xa4\x94L\x18\xc2\x041\xac\x00\xf2\x87w7K\"W\xbfBf4\xa1\"'Tk\x991j ';ɫ\x02ܷ\x7f\xbc\xa8\xa1\x96J\x96\xa0\f\vDwOK\x92Z\xbf\x1e\xc3\xd5>\x96<\xee+\x92[\x91\x02\x87\x96'1䞢\x16?\xb3e\xbaA\x1f\x85\xcc\xfeL\x85\x1f\xfe\xc5\x01\xe8[P\x16\f\xd1[Y\xf1\xdcJ\xe2\x0e\x94%`&7\x82\xfd\xbd\x86\xad\x89\x91\xd8)\xa7\x06\xb4\xa5\x8c\x01%(';\xca+\x98[\xa2\x1c@.\xe8\x9e(\xb0}\x92J\xb4\xe0\xe1\a\xfap\x1c?K\x05\x84\x89\xb5\xbc\"[cJ}uy\xb9a&\xe8W&\x8b\xa2\x12\xcc\xec/QUت2R\xe9\xcb\x1cv\xc0/5\xdb,\xa8ʶ\xcc@f\xd9|IK\xb6@D\x04\xea\xd8E\x91\xff[\x10\x0f\xdd\xe9\xd6\xec\xad\xd8j\xa3\x98ش^\xa0~L`\x8fU\x1d'\x8c\x0e\x94C\xb1\xe1\x82\xfdɒ\xeeˇۻ\xb6\xa02\xed\x99Ғ\xd7!\xfeXj2\xb1\x06\xe5\xbe[+Y L\x10\xb9\x13U\x94s\xce@\x18\xa2\xabU\xc1\x8c\x15\x83\xdf*\xd0V\a\xe4!\xd8k\xb4Ad\x05\xa4*s+Ƈ\r\x96\x82\\\xd3\x02\xf85\xd5\xf0ʼ\xb2\\\xd1\v˄$n\xb5-\xebacG\xde\u058b` \aX\xeb\f\xcbm\tYG\xd1\xecWl\xcd2\xa7Nk\xa9\x1a\xbb\xe3l`\x97BqշO\xa6٭\xa0\xa5\xdeJs\xc7\n\x90\x959l1&kȼ\xdb\xe5\x01\x940B?^\xb4Y\x95\x86\xdc*\xed#e\x06\xc7|}\xbb$\xf7h\xac\xc2\xd7h\xb4*ML\xa5\x84\x95\x92H__\x80\xe6\xfb;\xf9\x8b\x06\x92W(ܙ\x02\xa4Ü\xac`m%A\x81\xfd\u07be\x02\xa5,m4\x0e@V=cc\x9f\xbb-X\xdaҊ\x1b\xaf'L\x93\xb7\x7f&\x05\x13\x95\xe9\x89\xda בR\xd4\xd0B\xee@\x9dB\xc4\xf7\xd4П\xed\xc7\a\xb4\xb3@\tB\xb5\xc4[y:\xae\xf6\xf82\xc6m\xf7,\xd7-\x88L\x93ٌHEf\xce\x03\xcf\xe6\xee\xeb\x8aq\xb3`\xa2\xdd\xc7#\xe3<\xf42\ryGC\xc7P}'?j'\xbc'\xd1b\x00V\x8b4\x8f[0[P\xa4\x94\xb5\xc7[3\x0eD﵁\xc2\x13&x\x11\x8fO\xa4'\xd4\x1d\xce=\bm\xe9\xea\x11\xe9#/*\xce\xe9\x8a\xc3\x151\xaa\x82\x01ڬ\xa4\xe4@\xc5\bq\xbe\x806,;\ai\x1c\xa4\ba\x94\x7fѡ\x00:M\xfa\x00\x84F@{\x9aY\xef\xccy\x8b\xb0]\xaaD\xc7T*Ȭվ\xf2ހ\x01G\x0f$$\xe1Rl@\xb9\xdem\xa4\x12\x04L\x81\x15\xb8\x9cXC\xab\x80[oB֕\xb5\xc1\x17\xc4j\xf7\xa0\f0\xa1\rЈp>\x83?\xf0\x94\xf1*\x87\xfc\xda\x05^\xb76~\xccC\xd4ܳ\x9a)|\xfap\x14\xa2\xf7Μe\x18\x04\xfaxo\x81qkLL\x1b'\xbd/\xc1\x85Ζ\x95~؍\xf7=j\x0f4\x18\xfb\xd1\xecO\xb39r\xb8\xdbk\xb7\x0fM\xa8\x82\x9a,\xc9v\x13\x8a\xd2\xec\xfb\xad\x99\x81\"Bţ\xf6$\x91\x9fT)\xba\x1f\xe0f\x1d\xff\x9f\x91\x9fC0\x0f8*B\xb3W\xe6\xe9a\xbf\xff\xcc\\=\x0f\x1f5\xcev)\x13\x96\x7fv\xe2\xd9a\x9fv\xf37K6!M\x04\x1e\x13\x0e\x1eN͎p\xebw\"\xd6Yd~H\xc8k\xd9\xf2\xc2\xfb\x0fI\xa9\xad\x94\x0fc\xd4\xf9\xc1\xb6i&E$ì\nY\xc1\x96\xee\x98T\x1e\xf5\xc6\xd5\xc2\x13d\x95\x89j=5$g\xeb5(\v\xa7\xdcR\r\xdaM\x93\x87\t2\x1c\xbe\x93\x96\x19\x89\xbe<\xc0\xa3a\xa4e\x13b>4t\x1bG\x1cz\xc9\xf0\u0601\xda\xf0\x1a\x9dq\xcev,\xaf(G\xbfLE\xe6\xf0\xa1\xf5\xb8bV\xe6\b\x93{c\x8eJ\xa6{\\@\x10\x90\xb2L\xea̔\xa4\x00\x1b\xf3\x16vN\xd0o:\x8c\xf9\x8a\xdaXE\x0eaO\x90Y\xaa\xe2\xa0}W9\x86\x91\x8d͘7L\xc1D\x04\xe1t\x05\x9ch\xe0\x90\x19\xa9\xe2\x14\x19\xe3\xb3{R\x8c\xe0\x00!#\x96\xaf;\xd3h\x108\x02\x92\xe0\x14n˲\xad\v\xf5\xac\x10!\x1c\x92K\xb0\x01\x9f!\xb4,y\xc4]4\xcfQ\xe6\xfbN\x8e\xe9z\xf3\x8ch\xfd!\xbc\x98\xfe7O\x82\xcdl\x9e(i\x1b\xfd\xeaR\xb6\x16\x87\xf8\x9c\xb6y\xfe9\t\x1b,\xff\tB{D\xfb\tf\x85\x92ezPn-U\x19\xe8\v\x1bNa\xa43'̄_\xc74\xa1\x13s\xf5\x92e\x1d\"|ݼ\x99.\xf4\x89\xacIщ\x17bL\xdd\xc5? _\xd0e\xdcz\x8f\x91̓\x9f\xda_\xcd\t[\xd7D\xcf\xe7d\u0378\x01u@\xfd\x93L}\xe0\xcc9\x88\x91\xe2\xf5\b\xa6\xefM\xb6\xfd\xf0dC0ݬT%\xd2\xe5\xf0c\x17Ȇh\xbf\xeb\x9eG\xe0\x12Lc3\x05\x05\xa6\xc7q\xc6\xd4\xfe\x05C\xabw\x9f\xde\xc7\xe7W\xed'A\xf2z\x88\x8c(\x9d{\xde\x1d`\xd4\x1e\x9f\x0f\xe1\xc3\x1b\x8c\x81\xea\t\x90[\n\x99\x13J\x1e`\xefB\x17*\x88\xe5\x0f\r\x8d\x13\xbaW\x80k2(g\x0f\xb0G0\xf1E\x96\xfe\x93*\r\xeey\x80}J\xb3\x03\x1a\xda11\xed\x17\x8f,\x9d\xec\x0fH\b̭\xa7\x8a\x81{\xbc*D\x964\xe2O\xa2-\tO\xa0\xfd\th&\x89J\xbb\x8f\xf6*%J\xc0w\xda\xf1\xd2j̖\x95hV1\xe3 \xd7\xc9\fu\xcf=\xe5,\xaf;r:\xb2\x14s\xf2I\x1a\xfbχ'\xa6\xfdB\xe6{\t\xfa\x934\xf8ˋP\xd4\r\xfc%\xe9\xe9z@E\x13\xce\xca[\x82\xb5\x97\xe2\x9cO\xb3\xd2VӞi\xb2\x14v\xba\xe2H\x92\xd8\x15\xae\xba\xba\xee\\GE\xa5q\x15MH\xb1pi\x9bXO\x9e\xdeRu\xc8\xfd\xecN}\x87w\xd6Y\xb87n\xed\x97\xd3\f\xf2\xb0\\\x83\x8b\x92\xd4\xc0\x86e\x89\xfd\x15\xa06@Jk\xc2\xd3$\"Ѱzl\xa6\x89O\x9a\xf7n?O\x8b\x87z\x8d\x7fa]\xce\xc2C0\xb2H\xa0\x81\xb7\xdd\xf98>\v\xab\xb3\t\xad\x82$\x8c6\x1dX\xb3\x1cn\x9aB\x94g\x90\x03\xbd8\x868\xa3ܥy\x8eu.\x94\xdfL\xf0(\x13da\xaaih\x8dݹ\xe0\x82\xe2R\xcb\xffXO\x8b\xda\xf4\x7f\xa4\xa4L\xe9\v\xf2\x0eKZ8t\xde\xf9\xa4Y\vLB\x97X\x92b\xe5gG\xb9\xf5\xfdր\v\x02\xdcE\x02r\u074b\x8b\xe6\xe4q+\xb5s\xdb\xf5\"\xce\xec\x01\xf6n\xc5p\xb4˶\x91\x99-\xc5\xcc\xc5\x10=\x83Q\a\x1cR\xf0=\x99\xe1\xbb\xd9sB\xa9DIMl\xd6\x11т\x96i\x12\x8a%E\xa9\x81\xba\x9d\xb0\x86 \xc4~X\x97\xca\xd8 \xfb\x18\xb6I\"ZJ\x1dY\xc8\x1f\x18ʈ\xf0\xdeHm\\\xbe\xac\x133G\x13j2$\xd1\b]\xbb\xfa%\xa9B\xb1\x895\xcac\xa9\xdf\xf6s\xb7\x05\r~\xbd\xc2'\xe6\x1cP;\xb3\x9b5\xfa\xed\xac\xfḓ\x97`'4È\x05\xbf-\x95\xcc@Gײ\x9b'\xc1_D\xaa2ڸ\xd79G\xeafI\xae$\xe3x\n4<\xe9!\xaf%\xc4\xc4\xf9\u0087\xa7VB\xd4\xea\xbe\xfd{LƦ\x8e\x8b`\xc9`Q\xd0\xc32\xa5\xa4!^\xbb/\x836x@n\xf2\xa16\x15Z\x82T_^\v\xe0\xd7\x10(\x14L,\xb1\x03\xf2\xf6\x05\x02\voCc\xc5&\xb1\xe7\xb4P\xf6:t\xd2p\xa7\xfe\xc1\xa9r)q\xa9@A\x87y\xfd\xac:ơB\x9aVBbB\xb8Y\xca\xfc;M\xd6Li\xd3\x1e\x82\x1e(S\x89\x82\x998\xf1\x12\x1f\x94:i\xde\xf5\xd9}\xd9Jwm\xe5c(\xcfr\x84I\xc4\x1cח\x80\xb05a\x86\x80\xc8d%0\x81c\xf5\x18\xbbp\xc4u\x16\x96\xa5*I\x9a\xf6\xdb\aDU\xa4\x11`\x81\x92\xc2\xc4\xd1LO\xbb\xf9G\xca\xf8K\xb0\xcd\fU\xb1Ş\xd3t\"\x94\xb8\xb5\v\xf2\n\xfaĊ\xaa \xb4\xb0\x1f\xc0\xb0\x8c\x0f\xa1\xdd+\xc5\xc8E\xc5\r+9.\xa4\xeeX\x1eM6\x98-\xec\xeb\x034~\x95\xb8\xf5ԟ\x04\xf3\xf9K-\xb5\x17\a\x91>\xd5\xe4\x118'4\xa6W=\xcc3w\x12S&\x17`\xfd\x91\xd5N\x7f0\x88?\xbei\xee\xc4\x1dwעW+b)&*\x86O\x91\x19t\x1c)\xf6\xa6\x17\xc1\xba8\x1c\x7f\xfb\xad\x02\xb5'x\x8eM\x1d\xe74\x9b\xc0\xbcbj;\x11\v\xa6\u009b\xad\xa1\xfcy/\xe8oT\x99\xbc\x13\xce\xeb\x1e\x8e\a\xbf\xb16\xa2\x99\xd4X\xc3g\xe7+\xd1>\x06>\x17\xb2\xfe:\xf2\xd9X\x80\x9c\xba[\xeae\xa78\xd3'9\xa3QEz\xe4\xf7;\xed\x82:e\xf7SZ\x01\xc0\xe8n\xa7\x97\x9a\xf2\x8cMz\x92㼴\xddL\xd3\x16\v_p\xf7\xd2K\xecZJ\xa4T\xca.\xa5itz\x85]I\xaf\xba\x1b\xe9\xb5v!%\xef>J*qI^\x05N-Q9q;\xcd\xf8\x1a\xef\xf1\xddD\t\xbb\x88\x12V\x7fǑ<\x01\xbd\x84]B\xd3v\a%\xf0,U\x15_q\x17\xd0+\xee\xfey\xed]?#\x925\xf2z\xda\ue793\x97,\xa4\xcaA\x1d]\xf6I\x95£\xf2\x972\xb7\xe9\x0e\xe4`\xbd#\x9c\xfag[u\xe2et\x0f\xfe\xa0Q\x97G\xb3\xa2\xe4{;C!\xb3\xf6\a\xa7I@T\xdaBo7\x92\xb3,\x12\xbbE\xcffr\x8d{\x87e\xe0\x89QY\xbbd\xa0\xb4\r\xe3\xa1\x1b\x86y\xdd#0גs\xf98q\xeeOK\xf6\x17<\xb9\xfb\x19١w7K\x84\x11\xc4\x03\x8f\x02\xaf\x8b\xb3jlV`\xddr\x83\xe7\x90\xee/\xd7\x1d\x88\xdd:\xc7\xf6Ḑ\xbbs\x90CX\xe0Mg&\xadu\xb9Y\xbaq\f\xf5be\x86\x8a=\x91XQc\xb6L勒*\xb3w\x85\x1a\xf3\xce\x18\x82/=\x96\xdd\x19\xf4\x1e\xfd\xb3\x9d\xa3\xe4\rG:\xe3\n\xe5\xbe\xec.\xfa\x1e\xd2\xee\x94q\f\xef^\x1cݷx\xc6q\f\x87%\v\xa4T\xe4\xe7h\xe5\xd7ٲfڟL\xfc\xb3\xdc\xc1\xfbh\xf6\xacC\x9eۃ\xe6\x91\xf2\xac\x00\xd1\x1d\xba;X\xa5\xba\x02<\x90\xb7\xff\xea\x19\xf5V\xa1k\x7f\xa6\xea)\x89\xb2\xdb.\x88\b~\xe1\x84\xd9\xd0Y\xcc>\xe1\x01\xf0{rs\x8fs\xb4ڴy\x15\xf5s\xb4\x90*\v\x8b\xc1\x118\xfe\x83\xef\xcf_\x9a\xa6\x8dTt\x03?Iw\xc6\xf6\x18ۻ\xad;g\xaf\xfb\xa8'ԏ\x06\xa5\x89\x1d\xc0\xebO\xfb>\x00\xd6\xd4|\xf7\x0e5\xb6\xa3\x9cxL\xb31\xfc\x14\xbe\xdf\xdd\xfd\xe4\xb02\xac\x80\x8b\xf7\x95+w\xb06Q\x83%q\xc0\xd6AZ\xd9\xffn\xe5#\x1e\xfe\x1b\xcfc\x86;\x13\x1ad\x14`\xb19\x96 NB\xa9*\xb9\xa49\xa8k)\xd6l3\x82\xdd/\x9d\xc6\an6\xc3\x1f=r\xb5\x8f\n\xf0\xcf\\\x83`c\x1e\u0381\x7fd\x1c\xb4\x1bV\x82\x01\xbe\xe9\x7fU\xdb\xe3\xaaX\xb9\x18nm_\xd6\x1d\f\xf88\x87\x16\xa6\xa2KP6\x8arI\xebJ\aY\x1dF\xbc\xe1\b\x13\x066П\x05\x1e\xb1\xc0\xeeTit\x9f\xc1\x9c\xe0\\\xe6\xc7X~\xab\x83\xfc\xfd\xf0\x97\a\x9cl\xa5\xbcb'\xee\xb9 \xe4\xe6\xfeZ\x93J\xe4\x98.\xbe\xff\xcb\xed$\xa9\xdbuN\xae\x0f\xda:fT\xef\xe3_\xb5\x82㖽pѱ\\G\x10\x18\x82Ӻ\a\xe4\x91\x19\x7fp\xd7yOZ\x1d\x9a\xf2\f\xddp\x80G\xfa\x8f\xdfq\xe0N\xfe\xf77\xa3xu\xac\x14\x1e\x93\xeao\x05\xc0cEO\xba\xe6`U\x17l\xd5\xc5_\xfa\x9d1P\x94&\x16k\x8c\x9b\xc3\xef\x8f\x01\xac\xe34i(oi%\r\rb\x91\xb6ދ\xecXa\x99\xb7FG\xb8yL\x1fc\x04\xb8\xf6\xfb!\xceF\x80\x1a\xe0\x10\x01t\x95e\xa0\xf5\xba\xe2|_o\xc7\xf8J\xa8\xf1\x912~>R8h\x83\x82`\xd1;\ni\x14a_\xee\r\"\x0f\x9a\x1e\xb6*M#\x85炯\x86Ԇ\x16']\xd8p\xdd\a\x83W\xf6\xa8\xbcUTI\xeb\xb1Sݰ?\xe6\\\x1ap\xeeK\x9cdYh\x90\x13\u0601 \xd6;;\x12\x87;\xa7&B\xf1;\\\x9d\x87\v\xfe.\xa4B\xa2\x17\x13\x11\x9f\xed\xd0x\x01\xcew\xba\x86\x89\xb5\xa2x\x9fI\x9f\b\xfd\xe0\xd7e+\xael\xf4\x0f\v\v\u2d285j\x9b3ͺ~\xe1yF\xee\xfav9\x04\xee\x14\x13\u05ff\xee\xe5\x99j\xdcG\xf7Y&\xad\x8f\xee$\x83\x16\x81X\xcb\xf8\xf9qGU?\xedPw\xfc\xd2\x05\x1cY\xd8CG9\xf7\x1b\x1d\vКn\xc2i\xee\x8fv\xea\xb1\x01\x01.=\xe7\x16O\"@\x9b]qݳ̝\xca\xd0\xccT\xd4w\x10\n|[\xad\xbeӄ\xcb\x18T\xbcЅ\x85\x9b\xc2\u009cl\"\xa1\x9eJ\xa6R\xe6p\x1fꆖ6\x18\t#w\x9a\xbb݀\xb3\r\xb3s\x1d˹\rU+\xba\x81E&9\a\xb4\xd6\xfdq\xbd\xa4\xae\xfb\xbd\x87_\x80\xeaQ\xd4>\xb6\xdb\xfa\x15@\xc7m\xb7\xf0M]\xb9;\xde\xdee\x98\x82\xe6\"\xbdހ$v<)PvT\x88\xde2\xd7\x1fi\xbbm\xd0:o\x96}\x9e\xd7_27\xf7y\x81\xb8<\x16\xf4W\xa9\xe6\xa4`\xc2\xfeCE\xee\x16\xf0\xc2Ǔƿ\x95\xf2\xe16\x12\xc4\xf6\x06\xffCݰY\xea`\xc2\r\x1b7\x8c\xaed\xe5W\xdf\xeb\x806\xbe\xac\x82'\xf3\x9fy\xba\x890\x8f\xf8\x83\x1e:\x83\x19\xdd\x1f:\x90F]\x81\xeby\x00\xd6m\xb8Ɍ\xf3\xfd\xfc\x10\xf2\xc1\xad\x89\r\xec\xd6\xcd\x05>\fh\xce#\x18\xe8(\xacHE\x81\xd4\a_\xb4\r\xfa)\xb3^O\xe6\xa1`\xb2G\xe3\x1f\x9a\xd6Ctt\xc3l\x85{\x03\bv\x82\xc0\xf3N\xd8\xf1\x9a\x8a\x11\u1ff1m\xea\xb3\vZ\x13\xb7P%6\x98\xa5\x8b\xef}_\x90O\xd0_\xaeX\x90\xbfVPEh\xb0\b\x17\xc3\xdd\x1a\xaa\xfa)_\xb7\r\x1er\xac\xe8@m\x8c4Y\x8a\x1b%7\nt_X\x17\xe4o\x94\x19&6\x1f\xa5\xba\xe1Ն\x89\xcf\xc3[~\x8e5\xbe\xa1\xca0+\xecn<\xb1\x812A9\xfb{̮\xb5_\x8e\x03\xba\x1e\x9c`-H\xc20\x86^\xbc\a\x1b\xe3\x0e\xe6\x05\xa2&\xb4\xf4t=%^\t<\x19\xb3\xa9u,\xd1\xc4\"\xa1\xdb\v\xf2IF\r\x83/\x87b]\x986$\x03m\x16\xb0^Ke\xdcj\xf5bA\xd8:$\x1f\xac\xcd\xc1\xbc\x99\xbb\xab\x92\xb0\xd82s]hҸ/Lz+\xf4\xc2x\x94}A\xf7ne\x8afYe#\xacKm(\x8f\x048\xcf2\xfc\x98\xe5\xb1\xca\a\xf9/\xcfZ\xc9[\xb6\x01\xf5\x93\x8e؏#)\x1e\xa6\xe1\xa2>nQ\x04A\x1e\x153\xc6\xc6T\xf2H)\x81'\x95\xb1\xb1\x15\xe7D[R\x9f\x94}$Ό.\x87Kr\xd2P\xbe\xab\xa1\f\x99g\x8f5\xde̸B\xda\x10\x1b\xf7b\xf5\x91oeٜm\xa9\xd8\f\x9eP\xb0U\xb2\xdal\x83$\x0f\x04\xd3$\xaf\x00\x93\xb5hRt\xb8X\xd8TJ\xb4J\t\x8el\xfb&A\x18p\xb84{ U9\xf7\x17\xf7\xfa{\x99/\xfd\x1d(\x8b\xb5\x92\xc5\xc2\xf7\x8b\xb9Թ_\xc9WL\xda\xc8\xc5l\xa3T'.j\xf7\xd7\f\xa0$\x94%\bB\xb5\xef9ᤨ\x93\xdd\xd4o\xd65\xdcH\xcd\x12\xa2\xfd(\xc7\xff\xda\x06\x10\x18^\x86\xbf\xbb\xcc\xf03\x18\xec3\x86\xc7g\xbf\x05\x1fvT\x187\x9d\xa8]\xe4\xcc9\xb1٤\x89\x8c\xb6\x8e\xedYI\x9a\xdb\x0e\x84\x91\xfc\fv\x17gѭ/\xd7p\a\x81]\xfb\xebWk\xc0s\xa2\x99\b\x17_\xbb\xd2\x0f'\xfdѕ@\x81\x17UJ\x15\xaf\xc6<\x9ep\xe9\"\xf4\xba\xb9\x96]\x1dI|8y*~\x7f\x00\xe3`S7\xdeKZ7\t\xd3\xe7?\xb0\xd8z\x00\x96\xf1f\x16\x95?\xfe\ue6f5wIS\xbd8E\x8e\xcd\xfcpR7<\x85\xeb\xdeCz\xc3\xc1j\x9b\x06\xe8N*'\xe9\xdc\xee\x8cٴs\xa6\xd2\xc2\x15\xef\xe7\xc9%\xedΘD{\xb1\f\xdayQ~\xa4xA\xf4IZ\xfb7\xffm$\x85\xe6\xc1\x9e;\x89\xd6ʡ\x85\x81\xbfj\x16-\xeas{?\xa2\x9d\xce[\xd6\xc2\xf7\xe4\x7f\xf9\xff\x00\x00\x00\xff\xff<\x82OF\xb8\x82\x00\x00"), []byte("\x1f\x8b\b\x00\x00\x00\x00\x00\x00\xff\xccZK\x93۸\x11\xbe\xebWt\xed\x1e\xf6\xb2\x94줒J\xe96\x96\x93*W\xc6\xf1\xd4hvr]\bhJ\xb0@\x80\x01@\xc9\xca㿧\x1a\x0f\x89\xe2C\x0f;q\u008b-\x12h\xf4\xf3\xeb\x0f\xc0\x14E1a\xb5|E\xeb\xa4\xd1s`\xb5\xc4/\x1e5\xfdr\xd3\xed\x1f\xdcT\x9a\xd9\xee\xedd+\xb5\x98âq\xdeT\xcf\xe8Lc9\xbe\xc7Rj\xe9\xa5ѓ\n=\x13̳\xf9\x04\x80im<\xa3\u05ce~\x02p\xa3\xbd5J\xa1-֨\xa7\xdbf\x85\xabF*\x816\b\xcfK\xef\xdeL\xdf\xfe~\xfa\xbb\t\x80f\x15\xcea\xc5\xf8\xb6\xa9\x9d7\x96\xadQ\x19\x1eENw\xa8К\xa94\x13W#\xa7\x15\xd6\xd64\xf5\x1cN\x1f\xa2\x84\xb4z\xd4\xfc]\x10\xb6\x8c\xc2\x1e\x93\xb0\xf0]I\xe7\xff<>\xe6Q:\x1f\xc6ժ\xb1L\x8d\xa9\x15\x86\xb8\x8d\xb1\xfe/\xa7\xa5\vX9\x15\xbfH\xbdn\x14\xb3#\xd3'\x00\x8e\x9b\x1a\xe7\x10f\u05cc\xa3\x98\x00$\xd7\x04i\x050!\x82\xb3\x99z\xb2R{\xb4\v\xa3\x9aJ\x1f\xd7\x12踕\xb5\x0fΌ\xb6@2\x06\xb25\xe0<\xf3\x8d\x03\xd7\xf0\r0\a\x0f;&\x15[)\x9c\xfd\xa2Y\xfe\x7f\x90\a\xf0\xd9\x19\xfd\xc4\xfcf\x0e\xd38kZo\x98\xcb_c\x8c\x9eZo\xfc\x81\fp\xdeJ\xbd\x1eR\xe9\x919\xffʔ\x14A\x93\x17Y!H\a~\x83\xa0\x98\xf3\xe0\xe9\x05\xfd\x8a\x1e\x02r\x11B\xf6\x10\xec\x99K\xeb\x00좔\xe0\xa3aMUo\xad3\xb5I\x15x\xedH\x89\xfaӛ\xa4}Kl\xce\xef)\xb7x\x14\xe9<\xab\xea3\xb9\x0fk\x1c\x13v\xe6\x8a\xf7X\xb2F\xf9\xb6\xa9\x14%\xd5\xce\xcbs\xb3j\xe4S\x11g\x9d\xad\xf8\xfe\xec]\\ue\x8cB\x16\xa5\xc4Q\xbb\xb71\v\xf9\x06+6O\x83M\x8d\xfa\xe1\xe9\xc3\xebo\x97g\xafa(\x91:EA\x81c\xad\xd8l\xd0\"\xbc\x86\xfa\x8bqsɴ\xa3L\x00\xb3\xfa\x8cܟ\x82X[S\xa3\xf52\x17K|ZX\xd4z\xdb\xd1\xe9\x9f\xc5\xd97\x002#\xce\x02A\xa0\x841\xafR\xfd\xa0H\x96\x83)\xc1o\xa4\x03\x8b\xb5E\x87:\xc2\x14\xbdf:)8\xed\x88^\xa2%1Tۍ\x12\x84e;\xb4\x1e,r\xb3\xd6\xf2\xefG\xd9\x0e\xbcI\xc9\xec\xd1y\b\x15\xaa\x99\xa2dm\xf0g`Zt$W\xec\x00\x16iMhtK^\x98\xe0\xbaz|\xa4j\x90\xba4s\xd8x_\xbb\xf9l\xb6\x96>#47U\xd5h\xe9\x0f\xb3\x00\xb6r\xd5xc\xddL\xe0\x0e\xd5\xcc\xc9u\xc1,\xdfH\x8f\xdc7\x16g\xac\x96E0DGH\xadď6a\xba;[\xb6W\xd2\xf1\t\x90zGx\b^c\xcaDQ\xd1\xc4S\x14\xe8\x15\xb9\xee\xf9\x8f\xcb\x17Ț\xc4HŠ\x9c\x86\xf6\xfc\x92\xe3Cޔ\xbaD\x1b\xe7\x95\xd6TA&jQ\x1b\xa9}\xf8\xc1\x95D\xed\xc15\xabJzJ\x83\xbf5\xe8<\x85\xae+v\x11\xba\x18\xac\x10\x9a:\x80Dw\xc0\a\r\vV\xa1Z0\x87\xdf9V\x14\x15WP\x10n\x8aV\xbb7w\aG\xf7\xb6>\xe4\x9e:\x12\xdaA4X\xd6\xc8\xcf\xeaN\xa0\x93\x96*\xc33\x8f\xa1\xba:\x0eJP1ޔ\xf33\f\x12\xf40\xceѹ\x8fF`\xf7KG\xe5\x87\xe3\xc03\x1dk\xb4\x95t\xa1\xbdBil\xb7\xf3\xb0#\x92\xb7\x9f\x8cx݀\x03\xa0n\xaa\xbe\"\x05<#\x13\x9f\xb4:\x8c|\xfa\xab\x95\xbe\xbf\xd0H \xe9\x89*.\x0f\x9a?\xa1\x95F\\1\xfe]g\xf8\xd1\x05\x1b\xb3\x872\xe4\xbf\xf6\xea@\xd8\xe5\x0e\x9a\xf7Q;?\x0fO\x1f2\x82\xc7\xdaJ\x85\x99|5\x85\x87TԦ\x847 \xa4#\"\xe1\x82о\xb3t\xa3\x02ј\x83\xb7\xcd]\xe6s\xa3K\xb9\xee\x1b\xdd\xe6Fc\x19sEt\xc7s\x8b\xb0\x12\xa1\x16eGm\xcdN\n\xb4\x05Շ,%O\x9a46v\x90R\xa2\x12=l\x1a\xad\xb2`\x8aEAE\xcdԕ\x18.\x8e\x03\x03\x93fR\xc7\f>\t\bXc\xabԚ\xb5G-\xb0\xdbm\x826&\x00\x9aC\x01{\xe97\x11)\xd5P\xdd\xc1\xc5ڣg\x8b\x87\xa1\xd7\x1d\xdd_6H#c\xe3Ep\xc8-\xfa\x90m\xa8(}(\x95\xa6\x00\x1f\x1b\x17\xb0\xb6\x8b\x13\xf9\t\x84/\xcf\xde\xe2\xa1\xefh\xb8\x16\xdcD\x85FT\x0e$j\x0e?\xfcpݤ^w\xcb\x0fQ\xf7l\xa8\xc5\x12-\xea\x1e\x9b\xc8\xcfK\xe8Q\x944\x94aX\x96Ƚܡ:\x84\x9eD\xe0\xf93\xac\x1a\x0f\xa2\xc1\x105Ʒ{f\x85\x03n\xaa\x9ay\xb9\x92J\xfa\x03H7\"\x9f)e\xf6(Rı\xaa\xfda\n\x1f\xb4\xf3LstG\x1eD\x1e\x8b\xa9\xc0t\x1c\x95\xaa8\x10:f\x8700\x8a\xaf\x8c\xf3\xc0\xd1R:\xaa\x03\xec\xad\xd1\xeb1c\a\xda!\xed\x01\xadF\x8f\xa1#\n\xc3\x1d5C\x8e\xb5w3\xb3C\xbb\x93\xb8\x9f\xed\x8d\xddJ\xbd.H\xc1\"\x81\xcf,\xec\xecf?\x86\x7f\xbe&\vL\x1dq\xe2\x86\xe4]\x86Z?\x10\xbd\xf5\x1b\x8c-b\x19s\xd0X \x02A\xa9]\xa5܍\xc8:TvC\xbc\xbc\xfd\xe4\x90\x0f\xf5\x8f-\xf6[\xc7\x05P\x01\xf8R\x9c|[T\xac.\xe2h\xe6M%\xf9\xa4km\xcc\xfb\xcb\xf8\x937+R\vɉܞ\xe3F\xdeĉ\xb3=̀\x1b\xba\xbb\x9c1\xb4\x1cvS47q\x85+\x1a\x7fj\x8f=m}#t\xa7\xfe\xef\xd0\x13\xeft\xa0\x91\xf8\x01\xb3}?\a\xc0\xe4FkB*o\x80\x1d\xdb\xc0O\xae\xdb\xff\xeeD\xcfU÷8\xe0\xf8\x9e)\xef\xc2\xc0\xec\xe38\x8dti\x1c\x86\xc6tM\r\xb8^\x11\x9c-\xd0ޢ\xcb(\xf2-\x1eH\u0091[0X<\xc0\xaa\xd1BaVu\xbfAM\xdb1Y\x1e\x88\xec\xbf<.\xb3c\x03\x01K[\xa7\xec\xde1 yO\xbb\x00JA1\x87_\x1c\xa6u\x9f\xb1\x04\xa9\x9dG\xd6#\xe9\xf1\x89\xbdq\x0e\xab\xc3\x00\u05fa\xd9A\xcfX~\xbb\x8f\x82\xae\xe4\xa1\xd4 8\xc6\xc4J\xb0\x92\xfa{\xde\x0f-\x1e\x02\xc4\x12\xdf \"}\xe6ґe\xeetth\xd0i\xf1\fdR\xc7\x02a\xd5\xd8\":\x1fR\x01\x8by9H䇃q\xb9.\xe0\x12\xb3\xe89\xfb>v1*\x13\x80\xdd\xc80\xe0z\xb2\xc0E\xa6\x017\xb0\x8d\x9e\x99\xa39\x05w\xb2\x0e\xf8\x0e\xcc\x03\xfe\xfb\xec\x03\xeef \xf0\xddY\bܖ)\x97\xd9\b|\x13#\xb9\xe0\x8bK\\\x05\xae\xf2\x15\xb8\xc8Y`\x94\xb7\xc05\xee\x02w\xf2\x17\bx\x82\xa5\xfcr\x032?\x85\x81\xb9\x93\xd6\xcco\xa8kH\x81\xc0\x06\xfaj<\xa1\x18q\xd0q\xd3\xfb)\x85\xef+\xfa\xee%\xd2\x17չ\x87\xf7e@\xbfB\x8c\x9eҰ\xa3\x17\xf2\xef\x04 \xe7\a c\x04mТ\xdd\xf1\xb4\xfdO\xf1X\x81\x0f\xa0\xf8\x992\xaf\xfd\x19\x17\x8e'\xf2\x99\xff\x10K\xa3Ͱ\xb1\x16]m\xb4\xa0\xb6w\xdb\xe1\xc4I\xe5\xff\xdc\x11\xc5pX\x8bs\xfa\xda\xf9\x96\xa3p\xd3\xf9\\\xb8߸\xfb\x84.\xde\xfa\xb4Ͽ\xccʡݵ\x0e\xe9:6~\x97\xb3\xb9\xc1\xce\xd6:\xb0#\xaa\xa4\xa1\xd1\xe1\xc8\"4\xad\xe9d`F\x9b\x17\xfa\xd0<\xa4\x03m\xf64\xb9%-v=\x13\xe9M8\xb4dZ\xa4\xe3b\xfa4 y/\x95\xa2\x1ef\xb12\xe4,\xd4^Zj\x96,\xb4\xb1\xddo\xa6o\xfewg\x81\x8a9\xbf\xc6Qq\xff\x99\xa6\x00[\x99\xc6\x0f\xf4\xfeV\xc2\x0f\xd6t\xb8e\xbfG\xc7\xf0\xb7\x03\xd7\xe8\t\x8d\xc9\x11፵\xe1\xb2._\"ݱ\xd1\x1cC\xe0\x87Ο8\xb4\xbf\xf5\xff\x00\xe2\x06\xbb\x06\xbbt\xefe촭\xb8&'\xb7\xdf4\xab\xe3\x15\xec\x1c\xfe\xf1\xafɿ\x03\x00\x00\xff\xff%\xff\\)\x99#\x00\x00"), []byte("\x1f\x8b\b\x00\x00\x00\x00\x00\x00\xff\xbcVMo\x1b7\x10\xbd\xebW\f\xd0kwU\xa3hQ\xec\xadqr0\xda\x06\x82\x1d\xe4N\x91#-c.\xc9\xce\f\xe5\xba\x1f\xff\xbd \xb9+K\xab\x95\x93\\\xb27\x91Ù\xc7\xf7f\x1e\xd54\xcdJE\xfb\x11\x89m\xf0\x1d\xa8h\xf1/A\x9f\x7fq\xfb\xf8\v\xb76\xac\x0f7\xabG\xebM\a\xb7\x89%\f\xf7\xc8!\x91Ʒ\xb8\xb3ފ\r~5\xa0(\xa3Du+\x00\xe5}\x10\x95\x979\xff\x04\xd0\xc1\v\x05琚=\xfa\xf61mq\x9b\xac3H%\xf9T\xfa\xf0C{\xf3s\xfb\xd3\n\xc0\xab\x01;0\xe8Pp\xab\xf4c\x8a\x84\x7f&d\xe1\xf6\x80\x0e)\xb46\xac8\xa2\xce\xf9\xf7\x14R\xec\xe0e\xa3\x9e\x1fkW\xdcoK\xaa7%\xd5}MUv\x9de\xf9\xedZ\xc4\xefv\x8c\x8a.\x91rˀJ\x00[\xbfON\xd1b\xc8\n\x80u\x88\xd8\xc1\xfb\f+*\x8df\x050^\xbb\xc0l@\x19S\x88TnC\xd6\v\xd2mpi\x98\bl\xc0 k\xb2Q\nQ\x1fz,W\x84\xb0\x03\xe9\x11j9\x90\x00[\x1c\x11\x98r\x0e\xe0\x13\a\xbfQ\xd2w\xd0f\xbe\xda\x1a\x9a\x81\x8c\x01\x95\xea7\xf3ey\u0380Y\xc8\xfa\xfd5\b,J\x12O J]\x1b<\xd0\t\xbf\xe7\x00J|\x1b{\xc5\xe7\xd5\x1f\xcaƵ\xca5\xe6pS\x99\xd6=\x0e\xaa\x1bcCD\xff\xeb\xe6\xee\xe3\x8f\x0fg\xcbp\x8euAZ\xb0\fjB\x9a\x89\xab\xacA\xf0\b\x81`\b4\xb1\xca\xed1i\xa4\x10\x91\xc4N\xadU\xbf\x93\xe19Y\x9dA\xf8\xb79\xdb\x03Ȩ\xeb)0y\x8a\x90\v\x89cS\xa0\x19/Zɵ\f\x84\x91\x90\xd1\u05f9\xca\xcb\xcaC\xd8~B-\xed,\xf5\x03RN\x03܇\xe4L\x1e\xbe\x03\x92\x00\xa1\x0e{o\xff>\xe6\xe6|\xef\\\xd4))\x94\xe4\xb6\xf3\xca\xc1A\xb9\x84߃\xf2f\x96yP\xcf@\x98kB\xf2'\xf9\xca\x01\x9e\xe3\xf8#\x93h\xfd.tЋD\xee\xd6뽕\xc9Rt\x18\x86\xe4\xad<\xaf\x8b;\xd8m\x92@\xbc6x@\xb7f\xbbo\x14\xe9\xde\njI\x84k\x15mS.⋭\xb4\x83\xf9\x8eF\x13Ⳳ\x17\xddS\xbf\xe2\x02_!O\xf6\x84\xda#5U\xbd\xe2\x8b\ny)Sw\xff\xee\xe1\x03LH\xaaRU\x94\x97\xd0\v^&}2\x9b\xd6\xef\x90\xea\xb9\x1d\x85\xa1\xe4Dob\xb0^\xca\x0f\xed,z\x01N\xdb\xc1\nO\x1d\x9b\xa5\x9b\xa7\xbd-\xb6\x9b\x1d E\xa3\x04\xcd<\xe0\xceí\x1a\xd0\xdd*\xc6o\xacUV\x85\x9b,\xc2\x17\xa9u\xfa\x98̃+\xbd'\x1b\xd33pEڅ\xe1\x7f\x88\xa8\xb3\xb8\x99\xdf|\xda\ueb2ec\xb5\v\x04O\xbd\xd5\xfd4\xfc3\x9a\x8eFq\xce߲1\xe4\xef\xc5n\xe7;W/\x0fEdK8k\xd8\x06.\xbc\xfbu^\x8a\xa9~%3\xd5\xd1Gnt\"*\xcdw\xf4y\xb5t\xe8K\xb9@\xa2@\x17\xab3P\xefJP\xf9Ǡ\xacgP\xfey<\b\xd2+\x81'\xa4\r\x97\x95\x1ax\x8fO\v\xabw~CaO\xc8\xf3\x96ϛ\x9b\xca\x1e\xce߃WXZlʋE\xceVhNXd\t\xa4\xf6\xa7\xbcr\xda\x1e\x9d\xbe\x83\x7f\xfe[\xfd\x1f\x00\x00\xff\xff\xbeM\x1a\xea\xb1\n\x00\x00"), diff --git a/design/block-data-mover/backup-architecture.png b/design/block-data-mover/backup-architecture.png new file mode 100644 index 000000000..a5a50fe82 Binary files /dev/null and b/design/block-data-mover/backup-architecture.png differ diff --git a/design/block-data-mover/block-data-mover.md b/design/block-data-mover/block-data-mover.md new file mode 100644 index 000000000..bc386a3a2 --- /dev/null +++ b/design/block-data-mover/block-data-mover.md @@ -0,0 +1,551 @@ +# Block Data Mover Design + +## Glossary & Abbreviation + +**Backup Storage**: The storage to store the backup data. Check [Unified Repository design][1] for details. +**Backup Repository**: Backup repository is layered between BR data movers and Backup Storage to provide BR related features that is introduced in [Unified Repository design][1]. +**Velero Generic Data Path (VGDP)**: VGDP is the collective of modules that is introduced in [Unified Repository design][1]. Velero uses these modules to finish data transfer for various purposes (i.e., PodVolume backup/restore, Volume Snapshot Data Movement). VGDP modules include uploaders and the backup repository. +**Velero Built-in Data Mover (VBDM)**: VBDM, which is introduced in [Volume Snapshot Data Movement design][2] and [Unified Repository design][1], is the built-in data mover shipped along with Velero, it includes Velero data mover controllers and VGDP. +**Data Mover Pods**: Intermediate pods which hold VGDP and complete the data transfer. See [VGDP Micro Service for Volume Snapshot Data Movement][3] for details. +**Change Block Tracking (CBT)**: CBT is the mechanism to track changed blocks, so that backups could back up the changed data only. CBT usually provides by the computing/storage platform. +**TCO**: Total Cost of Ownership. This is a general criteria for products/solutions, but also means a lot for BR solutions. For example, this means what kind of backup storage (and its cost) it requires, the retention policy of backup copies, the ways to remove backup data redundancy, etc. +**PodVolume Backup**: This is the Velero backup method which accesses the data from live file system, see [Kopia Integration design][1] for how it works. +**CAOS and CABS**: Content-Addressable Object Storage and Content-Addressable Block Storage, they are the parts from Kopia repository, see [Kopia Architecture][5]. + +## Background +Kubernetes supports two kinds of volume mode, `FileSystem` and `Block`, for persistent volumes. Underlyingly, the storage could use a block storage to provision either `FileSystem` mode or `Block` mode volumes; and the storage could use a file storage to provision `FileSystem` mode volumes. +For volumes provisioned by block storage, they could be backed up/restored from the block level, regardless the volume mode of the persistent volume. +On the other hand, as long as the data could be accessed from the file system, a backup/restore could be conducted from the file system level. That is to say `FileSystem` mode volumes could be backed up/restored from the file system level, regardless of the backend storage type. +Then if a `FileSystem` mode volume is provisioned by a block storage, the volume could be backed up/restored either from the file system level or block level. + +For Velero, [CSI Snapshot Data Movement][2] which is implemented by VBDM, ships a file system uploader, so the backup/restore is done from file system only. + +Once possible, block level backup/restore is better than file system level backup/restore: +- Block level backup could leverage CBT to process minimal size of data, so it significantly reduces the overhead to network, backup repository and backup storage. As a result, TCO is significantly reduced. +- Block level backup/restore is performant in throughput and resource consumption, because it doesn't need to handle the complexity of the file system, especially for the case that huge number of small files in the file system. +- Block level backup/restore is less OS dependent because the uploader doesn't need the OS to be aware of the file system in the volume. + +At present, [Kubernetes CBT API][4] is mature and close to Beta stage. Many platform/storage has supported/is going to support it. + +Therefore, it is very important for Velero to deliver the block level backup/restore and recommend users to use it over the file system data mover as long as: +- The volume is backed by block storage so block level access is possible +- The platform supports CBT + +Meanwhile, file system level backup/restore is still valuable for below scenarios: +- The volume is backed by file storage, e.g., AWS EFS, Azure File, CephFS, VKS File Volume, etc. +- The volume is backed by block storage but CBT is not available +- The volume doesn't support CSI snapshot, so Velero PodVolume Backup method is used + +There are rich features delivered with VGDP, VBDM and [VGDP micro service][3], to reuse these features, block data mover should be built based on these modules. + +Velero VBDM supports linux and Windows nodes, however, Windows container doesn't support block mode volumes, so backing up/restoring from Windows nodes is not supported until Windows container removes this limitation. As a result, if there are both linux and Windows nodes in the cluster, block data mover can only run in linux nodes. + +Both the Kubernetes CBT service and Velero work in the boundary of the cluster, even though the backend storage may be shared by multiple clusters, Velero can only protection workloads in the same cluster where it is running. + +## Goals + +Add a block data mover to VBDM and support block level backup/restore for [CSI Snapshot Data Movement][2], which includes: +- Support block level full backup for both `FileSystem` and `Block` mode volumes +- Support block level incremental backup for both `FileSystem` and `Block` mode volumes +- Support block level restore from full/incremental backup for both `FileSystem` and `Block` mode volumes +- Support block level backup/restore for both linux and Windows workloads from linux cluster nodes +- Support all existing features, i.e., load concurrency, node selection, cache volume, deduplication, compression, encryption, etc. for the block data mover +- Support volumes processed from file system level and block level in the same backup/restore + +## Non-Goals + +- PodVolume Backup does the backup/restore from file system level only, so block level backup/restore is not supported +- Volumes that are backed by file system storages, can only be backed up/restored from file system level, so block level backup/restore is not supported +- Backing up/restoring from Windows nodes is not supported +- Block level incremental backup requires special capabilities of the backup repository, and Velero [Unified Repository][1] supports multiple kinds of backup repositories. The current design focus on Kopia repository only, block level incremental backup support of other repositories will be considered when the specific backup repository is integrated to [Velero Unified Repository][1] + +## Architecture + +### Data Path + +Below shows the architecture of VGDP when integrating to Unified Repository (implemented by Kopia repository). +A new block data mover will be added besides the existing file system data mover, the both data movers read/write data from/to the same backup repository through Unified Repo interface. +Unified Repo interface and the backup repository needs to be enhanced to support incremental backups. + +![Data path overview](data-path-overview.png) + +For more details of VGDP architecture, see [Unified Repository design][1], [Volume Snapshot Data Movement design][2] and [VGDP Micro Service for Volume Snapshot Data Movement][3]. + +### Backup + +Below is the architecture for block data mover backup which is developed based on the existing VBDM: + +![Backup architecture](backup-architecture.png) + +The existing VBDM is reused, below are the major changes based on the existing VBDM: +**Exposer**: Exposer needs to create block mode backupPVC all the time regardless of the sourcePVC mode. +**CBT**: This is a new layer to retrieve, transform and store the changed blocks, it interacts with CSI SnapshotMetadataService through gRPC. +**Uploader**: A new block uploader is added. It interacts with CBT layer, holds special logics to make performant data read from block devices and holds special logics to write incremental data to Unified Repository. +**Extended Kopia repo**: A new Incremental Aware Object Extension is added to Kopia's CAOS, so as to support incremental data write. Other parts of Kopia repository, including the existing CAOS and CABS, are not changed. + +### Restore + +Below is architecture for block data mover restore which is developed based on the existing VBDM: + +![Restore architecture](restore-architecture.png) + +The existing VBDM is reused, below are the major changes based on the existing VBDM: +**Exposer**: While the restorePV is in block mode, exposer needs to rebind the restorePV to a targetPVC in either file system mode or block mode. +**Uploader**: The same block uploader holds special logics to make performant data write to block devices and holds special logics to read data from the backup chain in Unified repository. + +For more details of VBDM, see [Volume Snapshot Data Movement design][2]. + +## Detailed Design + +### Selectable Data Mover Type + +#### Per Backup Selection +At present, the backup accepts a `DataMover` parameter and when its value is empty or `velero`, VBDM is used. +After block data mover is introduced, VBDM will have two types of data movers, Velero file system data mover and Velero block data mover. +A new type string `velero-block` is introduced for Velero block data mover, that is, when `DataMover` is set as `velero-block`, Velero block data mover is used. +Another new value `velero-fs` is introduced for Velero file system data mover, that is, when `DataMover` is set as `velero-fs`, Velero file system data mover is used. +For backwards compatibility consideration, `velero` is preserved a valid value, it refers to the default data mover, and the default data mover may change among releases. At present, Velero file system data mover is the default data mover; we can change the default one to Velero block data mover in future releases. + +#### Volume Policy +It is a valid case that users have multiple volumes in a single backup, while they want to use Velero file system data mover for some of the volumes and use Velero block data mover for some others. +To meet this requirement, a combined solution of Per Backup Selection and Volume Policy is used. + +Here are the data structs for VolumePolicy: +```go +type volPolicy struct { + action Action + conditions []volumeCondition +} + +type volumeCondition interface { + match(v *structuredVolume) bool + validate() error +} + +type structuredVolume struct { + capacity resource.Quantity + storageClass string + nfs *nFSVolumeSource + csi *csiVolumeSource + volumeType SupportedVolume + pvcLabels map[string]string + pvcPhase string +} + +type Action struct { + Type VolumeActionType `yaml:"type"` + Parameters map[string]any `yaml:"parameters,omitempty"` +} + +const ( + ConfigmapRefType string = "configmap" + Skip VolumeActionType = "skip" + FSBackup VolumeActionType = "fs-backup" + Snapshot VolumeActionType = "snapshot" +) +``` + +`action.parameters` is used to provide extra information of the action. This is an ideal place to differentiate Velero file system data mover and Velero block data mover. +Therefore, Velero built-in data mover will support `dataMover` key in `parameters`, with the value either `velero-fs` or `velero-block`. While `velero-fs` and `velero-block` are with the same meaning with Per Backup Selection. + +As an example, here is how a user might use both `velero-block` and `velero-fs` in a single backup: +- Users set `DataMover` parameter for the backup as `velero-block` +- Users add a record into Volume Policy, make `conditions` to filter the volumes they want to backup through Velero file system data mover, make `action.type` as `snapshot` and insert a record into `action.parameter` as `dataMover:velero-fs` + +In this way, all volumes matched by `conditions` will be backed up with Velero file system data mover; while the others will fallback to the per backup method Velero block data mover. + +Vice versa, users could set the per backup method as file system data mover and select volumes for Velero block data mover. + +The selected data mover for each volume should be recorded to `volumeInfo.json`. + +### Controllers +Backup controller and Restore controller are kept as is, async operations are still used to interact with VBDM with block data mover. +DataUpload controller and DataDownload controller are almost kept as is, with some minor changes to handle the data mover type and backup type appropriately and convey it to the exposers. With [VGDP Micro Service][3], the controllers are almost isolated from VGDP, so no major changes are required. + +### Exposer + +#### CSI Snapshot Exposer +The existing CSI Snapshot Exposer is reused with some changes to decide the backupPVC volume mode by access mode. Specifically, for Velero block data mover, access mode is always `Block`, so the backupPVC volume mode is always `Block`. +Once the backupPVC is created with correct volume mode, the existing code could create the backupPod and mount the backupPVC appropriately. + +#### Generic Restore Exposer +The existing Generic Restore Exposer is reused, but the workflow needs some changes. +For block data mover, the restorePV is in Block mode all the time, whereas, the targetPVC may be in either file system mode or block mode. +However, Kubernetes doesn't allow to bound a PV to a PVC with mismatch volume mode. + +Therefore, the workflow of ***Finish Volume Readiness*** as introduced in [Volume Snapshot Data Movement design][2] is changed as below: +- When restore completes and restorePV is created, set restorePV's `deletionPolicy` to `Retain` +- Create another rebindPV and copy restorePV's `volumeHandle` but the `volumeMode` matches to the targetPVC +- Delete restorePV +- Set the rebindPV's claim reference (the ```claimRef``` filed) to targetPVC +- Add the ```velero.io/dynamic-pv-restore``` label to the rebindPV + +In this way, the targetPVC will be bound immediately by Kubernetes to rebindPV. + +These changes work for file system data mover as well, so the old workflow will be replaced, only the new workflow is kept. + +### VGDP + +Below is the VGDP workflow during backup: + +![VGDP Backup](vgdp-backup.png) + +Below is the VGDP workflow during restore: + +![VGDP Restore](vgdp-restore.png) + +#### Unified Repo +For block data mover, one Unified Repo Object is created for each volume, and some metadata is also saved into Unified Repo to describe the volume. +During the backup, the write conducts a skippable-write manner: +- For the data range that the write does not skip, object is written with the real data +- For the data range that is skipped, the data is either filled as ZERO or cloned from the parent object. Specifically, for a full backup, data is filled as ZERO; for an incremental backup, data is cloned from the parent object + +To support incremental backup, `ObjectWriter` interface needs to extend to support `io.WriterAt`, so that uploader could conduct a skippable-write manner: +```go +type ObjectWriter interface { + io.WriteCloser + io.WriterAt + + // Seeker is used in the cases that the object is not written sequentially + io.Seeker + + // Checkpoint is periodically called to preserve the state of data written to the repo so far. + // Checkpoint returns a unified identifier that represent the current state. + // An empty ID could be returned on success if the backup repository doesn't support this. + Checkpoint() (ID, error) + + // Result waits for the completion of the object write. + // Result returns the object's unified identifier after the write completes. + Result() (ID, error) +} +``` + +To clone data from parent object, the caller needs to specify the parent object. To support this, `ObjectWriteOptions` is extended with `ParentObject`. +The existing `AccessMode` could be used to indicate the data access type, either file system or block: + +```go +// ObjectWriteOptions defines the options when creating an object for write +type ObjectWriteOptions struct { + FullPath string // Full logical path of the object + DataType int // OBJECT_DATA_TYPE_* + Description string // A description of the object, could be empty + Prefix ID // A prefix of the name used to save the object + AccessMode int // OBJECT_DATA_ACCESS_* + BackupMode int // OBJECT_DATA_BACKUP_* + AsyncWrites int // Num of async writes for the object, 0 means no async write + ParentObject ID // the parent object based on which incremental write will be done +} +``` + +To support non-Kopia uploader to save snapshots to Unified Repo, snapshot related methods will be added to `BackupRepo` interface: +```go + // SaveSnapshot saves a repo snapshot + SaveSnapshot(ctx context.Context, snapshot Snapshot) (ID, error) + + // GetSnapshot returns a repo snapshot from snapshot ID + GetSnapshot(ctx context.Context, id ID) (Snapshot, error) + + // DeleteSnapshot deletes a repo snapshot + DeleteSnapshot(ctx context.Context, id ID) error + + // ListSnapshot lists all snapshots in repo for the given source (if specified) + ListSnapshot(ctx context.Context, source string) ([]Snapshot, error) +``` + +To support non-Kopia uploader to save metadata, which is used to describe the backed up objects, some metadata related methods will be added to `BackupRepo` interface: +```go + // WriteMetadata writes metadata to the repo, metadata is used to describe data, e.g., file system + // dirs are saved as metadata + WriteMetadata(ctx context.Context, meta *Metadata, opt ObjectWriteOptions) (ID, error) + + // ReadMetadata reads a metadata from repo by the metadata's object ID + ReadMetadata(ctx context.Context, id ID) (*Metadata, error) +``` + +kopia-lib for Unified Repo will implement these interfaces by calling the corresponding Kopia repository functions. + +### Kopia Repository +CAOS of Kopia repository implements Unified Repo's Objects. However, CAOS supports full and sequential write only. +To make it support skippable write, a new Incremental Aware Object Extension is created based on the existing CAOS. + +#### Block Address Table +Kopia CAOS uses Block Address Table (BAT) to track objects. It will be reused for both full backups and incremental backups. + +![Incremental Aware Object Extension](caos-extension.png) + +For Incremental Aware Object Extension, one object represents one volume. +For full backup, the skipped areas will be written as all ZERO by Incremental Aware Object Extension, since Kopia repository's interface doesn't support skippable write. But it is fine, the ZERO data will be deduplicated by Kopia repository so nothing is actually written to the backup storage. +For incremental backup, Incremental Aware Object Extension clones the table entries from the parent object for the skipped areas; for the written area, Incremental Aware Object Extension writes the data to Kopia repository and generate new entries. Finally, Incremental Aware Object Extension generates a new block address table for the incremental object which covers its entire logical space. + +Incremental Aware Object Extension is automatically activated for block mode data access as set by `AccessMode` of `ObjectWriteOptions`. + +#### Deduplication +The Incremental Aware Object Extension uses fix-sized splitter for deduplication, this is good enough for block level backup, reasons: +- Not like a file, a disk write never inserts data to the middle of the disk, it only does in-place update or append. So the data never shifts between two disks or the same disk of two different backups +- File system IO to disk general aligned to a specific size, e.g., 4KB for NTFS and ext4, as long as the chunk size is a multiply of this size, it effectively reduces the case that one IO kills two deduplication chunks +- For the usage cases that the disk is used as raw block device without a file system, the IO is still conducted by aligning to a specific boundary + +The chunk size is intentionally chosen as 1MB, reasons: +- 1MB is a multiply of 4KB for file systems or common block sizes for raw block device usages +- 1MB is the start boundary of partitions for modern operating systems, for both MBR and GPT, so partition metadata could be isolated to a separate chunk +- The more chunks are there, the more indexes in the repository, 1MB is a moderate value regarding to the overhead of indexes for Kopia repository + +#### Benefits +Since the existing block address table(BAT) of CAOS is reused and kept as is, it brings below benefits: +- All the entries are still managed by Kopia CAOS, so Velero doesn't need to keep an extra data +- The objects written by Velero block uploader is still recognizable by Kopia, for both full backup and incremental backup +- The existing data management in Kopia repository still works for objects generated by Velero block uploader, e.g., snapshot GC, repository maintenance, etc. + +Most importantly, this solution is super performant: +- During incremental write, it doesn't copy any data from the parent object, instead, it only clones object block address entries +- During backup deletion, it doesn't need to move any data, it only deletes the BAT for the object + +#### Uploader behavior +The block uploader's skippable write must also be aligned to this 1MB boundary, because Incremental Aware Object Extension needs to clone the entries that have been skipped from the parent object. +File system uploader is still using variable-sized deduplication, it is fine to keep data from the two uploaders into the same Kopia repository, though normally they won't be mutually deduplicated. +Volume could be resized; and volume size may not be aligned to 1MB boundary. The uploader need to handle the resize appropriately since Incremental Aware Object Extension cannot copy a BAT entry partially. + +#### CBT Layer +CBT provides below functionalities: +1. For a full backup, it provides the allocated data ranges. E.g., for a 1TB volume, there may be only 1MB of files, with this functionality, the uploader could skip the ranges without real data +2. For an incremental backup, it provides the changed data ranges based on the provided parent snapshot. In this way, the uploader could skip the unchanged data and achieves an incremental backup + +For case 1, the uploader calls Unified Repo Object's `WriteAt` method with the offset for the allocated data, ranges ahead of the offset will be filled as ZERO by unified repository. +For case 2, the uploader calls Unified Repo Object's `WriteAt` method with the offset for the changed data, ranges ahead of the offset will be cloned from the parent object unified repository. + +A changeId is stored with each backup, the next backup will retrieve the parent snapshot's changeId and use it to retrieve the CBT. + +The CBT retrieved from Kubernetes API are a list of `BlockMetadata`, each of range could be with fixed size or variable size. +Block uploader needs to maintain its own granularity that is friendly to its backup repository and uploader, as mentioned above. + +From Kubernetes API, `GetMetadataAllocated` or `GetMetadataDelta` are called looply until all `BlockMetadata` are retrieved. +On the other hand, considering the complexity in uploader, e.g., multiple stream between read and write, the workflow should be driven by the uploader instead of the CBT iterator, therefore, in practice, all the allocated/changed blocks should be retrieved and preserved before passing it to the uploader. + +As another fact, directly saving `BlockMetadata` list will be memory consuming. + +With all the above considerations, the `Bitmap` data structure is used to save the allocated/changed blocks, calling CBT Bitmap. +CBT Bitmap chunk size could be set as 1MB or a multiply of it, but a larger chunk size would amplify the backup size, so 1MB size will be use. + +Finally, interactions among CSI Snapshot Metadata Service, CBT Layer and Uploader is like below: + +![CBT Layer](cbt.png) + +In this way, CBT layer and uploader are decoupled and CBT bitmap plays as a north bound parameter of the uploader. + +#### Block Uploader +Block uploader consists of the reader and writer which are running asynchronously. +During backup, reader reads data from the block device and also refers to CBT Bitmap for allocated/changed blocks; writer writes data to the Unified Repo. +During restore, reader reads data from the Unified Repo; writer writes data to the block device. + +Reader and writer connects by a ring buffer, that is, reader pushes the block data to the ring buffer and writer gets data from the ring buffer and write to the target. + +To improve performance, block device is opened with direct IO, so that no data is going through the system cache unnecessarily. + +During restore, to optimize the write throughput and storage usage, zero blocks should be either skipped (for restoring to a new volume) or unmapped (for restoring to an existing volume). To cover the both cases in a unified way, the SCSI command `WRITE_SAME` is used. Logics are as below: +- Detect if a block read from the backup is with all zero data +- If true, the uploader sends `WRITE_SAME` SCSI command by calling `BLKZEROOUT` ioctl +- If the call fails, the uploader fallbaks to use the conservative way to write all zero bytes to the disk + +Uploader implementation is OS dependent, but since Windows container doesn't support block volumes, the current implementation is for linux only. + +#### ChangeId +ChangeId identifies the base that CBT is generated from, it must strictly map to the parent snapshot in the repository. Otherwise, there will be data corruption in the incremental backup. +Therefore, ChangeId is saved together with the repository snapshot. +The data mover always queries parent snapshot from Unified Repo together with the ChangeId. In this way, no mismatch would happen. +Inside the uploader, the upper layer (DataUpload controller) could also provide the ChangeId as a mechanism of double confirmation. The received ChangeId would be re-evaluated against the one in the provided snapshot. + +For Kubernetes API, changeId is represented by `BaseSnapshotId`. +changeId retrieval is storage specific, generally, it is retrieved from the `SnapshotHandle` of the VolumeSnapshotContent object; however, storages may also refer to other places to retrieve the changeId. +That is, `SnapshotHandle` and changeId may be two different values, in this case, the both values need to be preserved. + +#### Volume Snapshot Retention +Storages/CSI drivers may support the changeId differently based on the storage's capabilities: +1. In order to calculate the changes, some storages require the parent snapshot mapping to the changeId always exists at the time of `GetMetadataDelta` is called, then the parent snapshot can NOT be deleted as long as there are incremental backups based on it. +2. Some storages don't require the parent snapshot itself at the time of calculating changes, then parent snapshot could be deleted immediately after the parent backup completes. + +The existing exposer works perfectly with Case 1, that is, the snapshot is always deleted when the backup completes. +However, for Case 2, since the snapshot must be retained, the exposer needs changes as below: +- At the end of each backup, keep the current VolumeSnapshot's `deletionPolicy` as `Retain`, then when the VolumeSnapshot is deleted at the end of the backup, the current snapshot is retained in the storage +- `GetMetadataDelta` is called with `BaseSnapshotId` set as the preserved changeId +- When deleting a backup, a VolumeSnapshot-VolumeSnapshotContent pair is rebuilt with `deletionPolicy` as `delete` and `snapshotHandle` as the preserved one +- Then the rebuilt VolumeSnapshot is deleted so that the volume snapshot is deleted from the storage + +There is no way to automatically detect which way a specific volume support, so an interface is exposed to users to set the volume snapshot retention method. +The interface could be added to the `Action.Parameters` of Volume Policy. By default, Velero block data mover takes Way 1, so volume snapshot is never retained; if users specify `RetainSnapshot` parameter, Way 2 will be taken. +```go +type Action struct { + Type VolumeActionType `yaml:"type"` + Parameters map[string]any `yaml:"parameters,omitempty"` +} +``` +In this way, users could specify --- for storage class "xxx" or CSI driver "yyy", backup through CSI snapshot with Velero block data mover and retain the snapshot. + +#### Incremental Size +By the end of the backup, incremental size is also returned by the uploader, as same as Velero file system uploader. The size indicates how much data are unique so processed by the uploader, based on the provided CBT. + +### Fallback to Full Backup +There are some occasions that the incremental backup won't continue, so the data mover fallbacks to full backup: +- `GetMetadataAllocated` or `GetMetadataDelta` returns error +- ChangeId is missing +- Parent snapshot is missing + +When the fallback happens, the volume will be fully backed up from block level, but since because of the data deduplication from the backup repository, the unallocated/unchanged data would be probably deduplicated. +During restore, the volume will also be fully restored. The zero blocks handling as mentioned above is still working, so that write IO for unallocated data would be probably eliminated. + +Fallback is to handle the exceptional cases, for most of the backups/restores, fallback is never expected. + +### Irregular Volume Size +As mentioned above, during incremental backup, block uploader IO should be restricted to be aligned to the deduplication chunk size (1MB); on the other hand, there is no hard limit for users' volume size to be aligned. +To support volumes with irregular size, below measures are taken: +- Volume objects in the repository is always aligned to 1MB +- If the volume size is irregular, zero bytes will be padded to the tail of the volume object +- A real size is recorded in the repository snapshot +- During restore, the real size of data is restored + +The padding must be always with zero bytes. + +### Volume Size Change +Incremental backup could continue when volume is resized. +Block uploader supports to write disk with arbitrary size. +The volume resize cases don't need to be handled case by case. + +Instead, when volume resize happens, block uploader needs to handle it appropriately in below ways: +- Loop with CBT +- Read data between RoundDownTo1M(newSize) and newSize to get the tail data +- If there is no tail data, which means the volume size is aligned to 1MB, then call `WriteAt(newSize, nil)` +- Otherwise, call `WriteAt(RoundDownTo1M(newSize), taildata)`, `taildata` is also padded to 1MB + +That is to say: +- If CBT covers the tail of the volume, loop with CBT is enough for both shrink and expand case +- Otherwise, if volume is expanded, `WriteAt` guarantees to clone appropriate objects entries from the parent object and append zero data for the expanded areas. Particularly, if the parent volume is not in regular size, the zero padding bytes is also reused. Therefore, the parent object's padding bytes must be zero +- In the case the volume is shrunk, writing the tail data makes sure zero bytes are padding to the new volume object instead of inheriting non-zero data from the parent object + +### Cancellation +The existing Cancellation mechanism is reused, so there is no change outside of the block uploader. +Inside the uploader, cancellation checkpoints are embedded to the uploader reader and writer, so that the execution could quit in a reasonable time once cancellation happens. + +### Parallelism +Parallelism among data movers will reuse the existing mechanism --- load concurrency. +Inside the data mover, uploader reader and writer are always running in parallel. The number of reader and writer is always 1. +Sequential read/write of the volume is always optimized, there is no prove that multiple readers/writers are beneficial. + +### Progress Report +Progress report outside of the data mover will reuse the existing mechanism. +Inside the data mover, progress update is embedded to the uploader writer. +The progress struct is kept as is, Velero block data mover still supports `TotalBytes` and `BytesDone`: +```go +type Progress struct { + TotalBytes int64 `json:"totalBytes,omitempty"` + BytesDone int64 `json:"doneBytes,omitempty"` +} +``` +By the end of the backup, the progress for block data mover provides the same `GetIncrementalSize` which reports the incremental size of the backup, so that the incremental size is reported to users in the same way as the file system data mover. + +### Selectable Backup Type +For many reasons, a periodical full backup is required: +- From user experience, a periodical full is required to make sure the data integrity among the incremental backups, e.g., every 1 week or 1 month + +Therefore, backup type (full/incremental) should be supported in Velero's manual backup and backup schedule. +Backup type will also be added to `volumeInfo.json` to support observability purposes. + +Backup TTL is still used for users to specify a backup's retention time. By default, both full and incremental backups are with 30 days retention, even though this is not so reasonable for the full backups. This could be enhanced when Velero supports sophisticated retention policy. +As a workaround, users could create two schedules for the same scope of backup, one is for full backups, with less frequency and longer backup TTL; the other one is for incremental backups, with normal frequency and shorter backup TTL. + +#### File System Data Mover +At present, Velero file system data mover doesn't support selectable backup type, instead, incremental backups are always conducted once possible. +From user experience this is not reasonable. + +Therefore, to solve this problem and to make it align with Velero block data mover, Velero file system data mover will support backup type as well. + +At present, the data path for Velero file system data mover has already supported it, we only need to expose this functionality to users. + +### Backup Describe +Backup type should be added to backup description, there are two appearances: +- The `backupType` in the Backup CR. This is the selected backup type by users +- The backup type recorded in `volumeInfo.json`, which is the actual type taken by the backup +With these two values, users are able to know the actual backup type and also whether a fallback happens. + +The `DataMover` item in the existing backup description should be updated to reflect the actual data mover completing the backup, this information could be retrieved from `volumeInfo.json`. + +### Backup Sync +No more data is required for sync, so Backup Sync is kept as is. + +### Backup Deletion +As mentioned above, no data is moved when deleting a repo snapshot for Velero block data mover, so Backup Deletion is kept as is regarding to repo snapshot; and for volume snapshot retention case, backup deletion logics will be modified accordingly to delete the retained snapshots. + +### Restarts +Restarts mechanism is reused without any change. + +### Logging +Logging mechanism is not changed. + +### Backup CRD +A `backupType` field is added to Backup CRD, two values are supported `full` or `incremental`. +`full` indicates the data mover to take a full backup. +`incremental` which is the default value, indicates the data mover to take an incremental backup. + +```yaml + spec: + description: BackupSpec defines the specification for a Velero backup. + properties: + backupType: + description: BackupType indicates the type of the backup + enum: + - full + - incremental + type: string +``` + +### DataUpload CRD +A `parentSnapshot` field is added to the DataUpload CRD, below values are supported: +- `""`: it fallbacks to `auto` +- `auto`: it means the data mover finds the recent snapshot of the same volume from Unified Repository and use it as the parent +- `none`: it means the data mover is not assigned with a parent snapshot, so it runs a full backup +- a specific snapshotID: it means the data mover use the specific snapshotID to find the parent snapshot. If it cannot be found, the data mover fallbacks to a full backup + +The last option is for a backup plan, it will not be used for now and may be useful when Velero supports sophisticated retention policy. This means, Velero always finds the recent backup as the parent. + +When `backupType` of the Backup is `full`, the data mover controller sets `none` to `parentSnapshot` of DataUpload. +When `backupType` of the Backup is `incremental`, the data mover controller sets `auto` to `parentSnapshot` of DataUpload. And `""` is just kept for backwards compatibility consideration. + +```yaml + spec: + description: DataUploadSpec is the specification for a DataUpload. + properties: + parentSnapshot: + description: |- + ParentSnapshot specifies the parent snapshot that current backup is based on. + If its value is "" or "auto", the data mover finds the recent backup of the same volume as parent. + If its value is "none", the data mover will do a full backup + If its value is a specific snapshotID, the data mover finds the specific snapshot as parent. + type: string +``` + +### DataDownload CRD +No change is required to DataDownload CRD. + +## Plugin Data Movers +The current design doesn't break anything for plugin data movers. +The enhancement in VolumePolicy could also be used for plugin data movers. That is, users could select a plugin data mover through VolumePolicy as same as Velero built-in data movers. + +## Installation +No change to Installation. + +## Upgrade +No impacts to Upgrade. The new fields in the CRDs are all optional fields and have backwards compatible values. + +## CLI +Backup type parameter is added to Velero CLI as below: +``` +velero backup create --full +velero schedule create --full +``` +When the parameter is not specified, by default, Velero goes with incremental backups. + + + +[1]: ../Implemented/unified-repo-and-kopia-integration/unified-repo-and-kopia-integration.md +[2]: ../Implemented/volume-snapshot-data-movement/volume-snapshot-data-movement.md +[3]: ../Implemented/vgdp-micro-service/vgdp-micro-service.md +[4]: https://kubernetes.io/blog/2025/09/25/csi-changed-block-tracking/ +[5]: https://kopia.io/docs/advanced/architecture/ \ No newline at end of file diff --git a/design/block-data-mover/caos-extension.png b/design/block-data-mover/caos-extension.png new file mode 100644 index 000000000..928c1e352 Binary files /dev/null and b/design/block-data-mover/caos-extension.png differ diff --git a/design/block-data-mover/cbt.png b/design/block-data-mover/cbt.png new file mode 100644 index 000000000..f20d287c2 Binary files /dev/null and b/design/block-data-mover/cbt.png differ diff --git a/design/block-data-mover/data-path-overview.png b/design/block-data-mover/data-path-overview.png new file mode 100644 index 000000000..a68880485 Binary files /dev/null and b/design/block-data-mover/data-path-overview.png differ diff --git a/design/block-data-mover/restore-architecture.png b/design/block-data-mover/restore-architecture.png new file mode 100644 index 000000000..c0b259028 Binary files /dev/null and b/design/block-data-mover/restore-architecture.png differ diff --git a/design/block-data-mover/vgdp-backup.png b/design/block-data-mover/vgdp-backup.png new file mode 100644 index 000000000..b9ebb7764 Binary files /dev/null and b/design/block-data-mover/vgdp-backup.png differ diff --git a/design/block-data-mover/vgdp-restore.png b/design/block-data-mover/vgdp-restore.png new file mode 100644 index 000000000..fefb40dbe Binary files /dev/null and b/design/block-data-mover/vgdp-restore.png differ diff --git a/go.mod b/go.mod index 0fa1566f5..1c06544ac 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/hashicorp/go-plugin v1.6.0 github.com/joho/godotenv v1.3.0 github.com/kopia/kopia v0.16.0 - github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0 + github.com/kubernetes-csi/external-snapshotter/client/v8 v8.4.0 github.com/onsi/ginkgo/v2 v2.22.0 github.com/onsi/gomega v1.36.1 github.com/petar/GoLLRB v0.0.0-20210522233825-ae3b015fd3e9 diff --git a/go.sum b/go.sum index a51994d2a..13f6dc2c1 100644 --- a/go.sum +++ b/go.sum @@ -507,8 +507,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0 h1:Q3jQ1NkFqv5o+F8dMmHd8SfEmlcwNeo1immFApntEwE= -github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0/go.mod h1:E3vdYxHj2C2q6qo8/Da4g7P+IcwqRZyy3gJBzYybV9Y= +github.com/kubernetes-csi/external-snapshotter/client/v8 v8.4.0 h1:bMqrb3UHgHbP+PW9VwiejfDJU1R0PpXVZNMdeH8WYKI= +github.com/kubernetes-csi/external-snapshotter/client/v8 v8.4.0/go.mod h1:E3vdYxHj2C2q6qo8/Da4g7P+IcwqRZyy3gJBzYybV9Y= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index 0a60e6a16..25a162a82 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=$TARGETPLATFORM golang:1.25-bookworm +FROM --platform=$TARGETPLATFORM golang:1.25-trixie ARG GOPROXY diff --git a/hack/build-restic.sh b/hack/build-restic.sh deleted file mode 100755 index d6a233f4a..000000000 --- a/hack/build-restic.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -# Copyright 2020 the Velero contributors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o errexit -set -o nounset -set -o pipefail - -# Use /output/usr/bin/ as the default output directory as this -# is the path expected by the Velero Dockerfile. -output_dir=${OUTPUT_DIR:-/output/usr/bin} -restic_bin=${output_dir}/restic -build_path=$(dirname "$PWD") - -if [[ -z "${BIN}" ]]; then - echo "BIN must be set" - exit 1 -fi - -if [[ "${BIN}" != "velero" ]]; then - echo "${BIN} does not need the restic binary" - exit 0 -fi - -if [[ -z "${GOOS}" ]]; then - echo "GOOS must be set" - exit 1 -fi -if [[ -z "${GOARCH}" ]]; then - echo "GOARCH must be set" - exit 1 -fi -if [[ -z "${RESTIC_VERSION}" ]]; then - echo "RESTIC_VERSION must be set" - exit 1 -fi - -mkdir ${build_path}/restic -git clone -b v${RESTIC_VERSION} https://github.com/restic/restic.git ${build_path}/restic -pushd ${build_path}/restic -git apply /go/src/github.com/vmware-tanzu/velero/hack/fix_restic_cve.txt -go run build.go --goos "${GOOS}" --goarch "${GOARCH}" --goarm "${GOARM}" -o ${restic_bin} -chmod +x ${restic_bin} -popd diff --git a/hack/fix_restic_cve.txt b/hack/fix_restic_cve.txt deleted file mode 100644 index eeee2ecc6..000000000 --- a/hack/fix_restic_cve.txt +++ /dev/null @@ -1,274 +0,0 @@ -diff --git a/go.mod b/go.mod -index 5f939c481..f6205aa3c 100644 ---- a/go.mod -+++ b/go.mod -@@ -24,32 +24,31 @@ require ( - github.com/restic/chunker v0.4.0 - github.com/spf13/cobra v1.6.1 - github.com/spf13/pflag v1.0.5 -- golang.org/x/crypto v0.5.0 -- golang.org/x/net v0.5.0 -- golang.org/x/oauth2 v0.4.0 -- golang.org/x/sync v0.1.0 -- golang.org/x/sys v0.4.0 -- golang.org/x/term v0.4.0 -- golang.org/x/text v0.6.0 -- google.golang.org/api v0.106.0 -+ golang.org/x/crypto v0.45.0 -+ golang.org/x/net v0.47.0 -+ golang.org/x/oauth2 v0.28.0 -+ golang.org/x/sync v0.18.0 -+ golang.org/x/sys v0.38.0 -+ golang.org/x/term v0.37.0 -+ golang.org/x/text v0.31.0 -+ google.golang.org/api v0.114.0 - ) - - require ( -- cloud.google.com/go v0.108.0 // indirect -- cloud.google.com/go/compute v1.15.1 // indirect -- cloud.google.com/go/compute/metadata v0.2.3 // indirect -- cloud.google.com/go/iam v0.10.0 // indirect -+ cloud.google.com/go v0.110.0 // indirect -+ cloud.google.com/go/compute/metadata v0.3.0 // indirect -+ cloud.google.com/go/iam v0.13.0 // indirect - github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect - github.com/dnaeon/go-vcr v1.2.0 // indirect - github.com/dustin/go-humanize v1.0.0 // indirect - github.com/felixge/fgprof v0.9.3 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect -- github.com/golang/protobuf v1.5.2 // indirect -+ github.com/golang/protobuf v1.5.3 // indirect - github.com/google/pprof v0.0.0-20230111200839-76d1ae5aea2b // indirect - github.com/google/uuid v1.3.0 // indirect -- github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect -- github.com/googleapis/gax-go/v2 v2.7.0 // indirect -+ github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect -+ github.com/googleapis/gax-go/v2 v2.7.1 // indirect - github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/cpuid/v2 v2.2.3 // indirect -@@ -63,11 +62,13 @@ require ( - go.opencensus.io v0.24.0 // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/appengine v1.6.7 // indirect -- google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect -- google.golang.org/grpc v1.52.0 // indirect -- google.golang.org/protobuf v1.28.1 // indirect -+ google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect -+ google.golang.org/grpc v1.56.3 // indirect -+ google.golang.org/protobuf v1.33.0 // indirect - gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect - ) - --go 1.18 -+go 1.24.0 -+ -+toolchain go1.24.11 -diff --git a/go.sum b/go.sum -index 026e1d2fa..4a37e7ac7 100644 ---- a/go.sum -+++ b/go.sum -@@ -1,23 +1,24 @@ - cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= --cloud.google.com/go v0.108.0 h1:xntQwnfn8oHGX0crLVinvHM+AhXvi3QHQIEcX/2hiWk= --cloud.google.com/go v0.108.0/go.mod h1:lNUfQqusBJp0bgAg6qrHgYFYbTB+dOiob1itwnlD33Q= --cloud.google.com/go/compute v1.15.1 h1:7UGq3QknM33pw5xATlpzeoomNxsacIVvTqTTvbfajmE= --cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA= --cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= --cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= --cloud.google.com/go/iam v0.10.0 h1:fpP/gByFs6US1ma53v7VxhvbJpO2Aapng6wabJ99MuI= --cloud.google.com/go/iam v0.10.0/go.mod h1:nXAECrMt2qHpF6RZUZseteD6QyanL68reN4OXPw0UWM= --cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+CamDs= -+cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= -+cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= -+cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= -+cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= -+cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= -+cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= -+cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= -+cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo= - cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI= - cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y= - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.3.0 h1:VuHAcMq8pU1IWNT/m5yRaGqbK0BiQKHT8X4DTp9CHdI= - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.3.0/go.mod h1:tZoQYdDZNOiIjdSn0dVWVfl0NEPGOJqVLzSrcFk4Is0= - github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0 h1:QkAcEIAKbNL4KoFr4SathZPhDhF4mVwpBMFlYjyAqy8= -+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0/go.mod h1:bhXu1AjYL+wutSL/kpSq6s7733q2Rb0yuot9Zgfqa/0= - github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 h1:+5VZ72z0Qan5Bog5C+ZkgSqUbeVUd9wgtHOrIKuc5b8= - github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w= - github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.5.1 h1:BMTdr+ib5ljLa9MxTJK8x/Ds0MbBb4MfuW5BL0zMJnI= - github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.5.1/go.mod h1:c6WvOhtmjNUWbLfOG1qxM/q0SPvQNSVJvolm+C52dIU= - github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1 h1:BWe8a+f/t+7KY7zH2mqygeUD0t8hNFXe08p1Pb3/jKE= -+github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4= - github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= - github.com/Julusian/godocdown v0.0.0-20170816220326-6d19f8ff2df8/go.mod h1:INZr5t32rG59/5xeltqoCJoNY7e5x/3xoY9WSWVWg74= - github.com/anacrolix/fuse v0.2.0 h1:pc+To78kI2d/WUjIyrsdqeJQAesuwpGxlI3h1nAv3Do= -@@ -54,6 +55,7 @@ github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNu - github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= - github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= - github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c= -+github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= - github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= -@@ -70,8 +72,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq - github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= - github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= - github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= --github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= --github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= - github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= - github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= - github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -@@ -82,17 +84,18 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ - github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= - github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= - github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= --github.com/google/martian/v3 v3.2.1 h1:d8MncMlErDFTwQGBK1xhv026j9kqhvw1Qv9IbWT1VLQ= -+github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= -+github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= - github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= - github.com/google/pprof v0.0.0-20230111200839-76d1ae5aea2b h1:8htHrh2bw9c7Idkb7YNac+ZpTqLMjRpI+FWu51ltaQc= - github.com/google/pprof v0.0.0-20230111200839-76d1ae5aea2b/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= - github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= - github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= - github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= --github.com/googleapis/enterprise-certificate-proxy v0.2.1 h1:RY7tHKZcRlk788d5WSo/e83gOyyy742E8GSs771ySpg= --github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= --github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= --github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= -+github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= -+github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= -+github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A= -+github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= - github.com/hashicorp/golang-lru/v2 v2.0.1 h1:5pv5N1lT1fjLg2VQ5KWc7kmucp2x/kvFOnxuVTqZ6x4= - github.com/hashicorp/golang-lru/v2 v2.0.1/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= - github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= -@@ -114,6 +117,7 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= - github.com/kurin/blazer v0.5.4-0.20211030221322-ba894c124ac6 h1:nz7i1au+nDzgExfqW5Zl6q85XNTvYoGnM5DHiQC0yYs= - github.com/kurin/blazer v0.5.4-0.20211030221322-ba894c124ac6/go.mod h1:4FCXMUWo9DllR2Do4TtBd377ezyAJ51vB5uTBjt0pGU= - github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= -+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= - github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= - github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= - github.com/minio/minio-go/v7 v7.0.46 h1:Vo3tNmNXuj7ME5qrvN4iadO7b4mzu/RSFdUkUhaPldk= -@@ -129,6 +133,7 @@ github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3P - github.com/ncw/swift/v2 v2.0.1 h1:q1IN8hNViXEv8Zvg3Xdis4a3c4IlIGezkYz09zQL5J0= - github.com/ncw/swift/v2 v2.0.1/go.mod h1:z0A9RVdYPjNjXVo2pDOPxZ4eu3oarO1P91fTItcb+Kg= - github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 h1:Qj1ukM4GlMWXNdMBuXcXfz/Kw9s1qm0CLY32QxuSImI= -+github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ= - github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= - github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= - github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA= -@@ -172,8 +177,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk - golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= - golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= - golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= --golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= --golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= -+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= - golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= - golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= - golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -@@ -189,17 +194,17 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL - golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= - golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= - golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= --golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= --golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= -+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= -+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= - golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= --golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M= --golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec= -+golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc= -+golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= - golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= --golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= -+golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= - golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -@@ -214,17 +219,17 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc - golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= --golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= -+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= - golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= --golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg= --golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= -+golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU= -+golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= - golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= - golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= --golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= --golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= -+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= - golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= - golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= - golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -@@ -237,8 +242,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T - golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= --google.golang.org/api v0.106.0 h1:ffmW0faWCwKkpbbtvlY/K/8fUl+JKvNS5CVzRoyfCv8= --google.golang.org/api v0.106.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= -+google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE= -+google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= - google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= - google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= - google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -@@ -246,15 +251,15 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID - google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= - google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= - google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= --google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w= --google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -+google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= -+google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= - google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= - google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= - google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= - google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= - google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= --google.golang.org/grpc v1.52.0 h1:kd48UiU7EHsV4rnLyOJRuP/Il/UHE7gdDAQ+SZI7nZk= --google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= -+google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= -+google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= - google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= - google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= - google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -@@ -266,14 +271,15 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD - google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= - google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= - google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= --google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= --google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= - gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= - gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= - gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= - gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= - gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/delete/actions/csi/volumesnapshotcontent_action.go b/internal/delete/actions/csi/volumesnapshotcontent_action.go index 98e0fc03b..9473686e0 100644 --- a/internal/delete/actions/csi/volumesnapshotcontent_action.go +++ b/internal/delete/actions/csi/volumesnapshotcontent_action.go @@ -18,6 +18,7 @@ package csi import ( "context" + "time" "github.com/google/uuid" snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" @@ -40,6 +41,10 @@ type volumeSnapshotContentDeleteItemAction struct { crClient crclient.Client } +const tempVSCCreateDeleteGap = 2 * time.Second + +var sleepBetweenTempVSCCreateAndDelete = time.Sleep + // AppliesTo returns information indicating // VolumeSnapshotContentRestoreItemAction action should be invoked // while restoring VolumeSnapshotContent.snapshot.storage.k8s.io resources @@ -123,6 +128,9 @@ func (p *volumeSnapshotContentDeleteItemAction) Execute( } p.log.Infof("Created temp VolumeSnapshotContent %s with DeletionPolicy=Delete to trigger cloud snapshot cleanup", snapCont.Name) + // Add a small delay before delete to avoid create/delete race conditions in CSI controllers. + sleepBetweenTempVSCCreateAndDelete(tempVSCCreateDeleteGap) + // Delete the temp VSC immediately to trigger cloud snapshot removal. // The CSI driver will handle the actual cloud snapshot deletion. if err := p.crClient.Delete( diff --git a/internal/delete/actions/csi/volumesnapshotcontent_action_test.go b/internal/delete/actions/csi/volumesnapshotcontent_action_test.go index 114bd752f..e8a0b5865 100644 --- a/internal/delete/actions/csi/volumesnapshotcontent_action_test.go +++ b/internal/delete/actions/csi/volumesnapshotcontent_action_test.go @@ -20,6 +20,7 @@ import ( "context" "fmt" "testing" + "time" snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" "github.com/sirupsen/logrus" @@ -46,6 +47,21 @@ type fakeClientWithErrors struct { deleteError error } +type fakeClientWithCallTracking struct { + crclient.Client + events *[]string +} + +func (c *fakeClientWithCallTracking) Create(ctx context.Context, obj crclient.Object, opts ...crclient.CreateOption) error { + *c.events = append(*c.events, "create") + return c.Client.Create(ctx, obj, opts...) +} + +func (c *fakeClientWithCallTracking) Delete(ctx context.Context, obj crclient.Object, opts ...crclient.DeleteOption) error { + *c.events = append(*c.events, "delete") + return c.Client.Delete(ctx, obj, opts...) +} + func (c *fakeClientWithErrors) Get(ctx context.Context, key crclient.ObjectKey, obj crclient.Object, opts ...crclient.GetOption) error { if c.getError != nil { return c.getError @@ -325,6 +341,39 @@ func TestTryDeleteOriginalVSC(t *testing.T) { }) } +func TestVSCExecute_CreateSleepDeleteOrder(t *testing.T) { + snapshotHandleStr := "test" + vsc := builder.ForVolumeSnapshotContent("bar"). + ObjectMeta(builder.WithLabelsMap(map[string]string{velerov1api.BackupNameLabel: "backup"})). + Status(&snapshotv1api.VolumeSnapshotContentStatus{SnapshotHandle: &snapshotHandleStr}). + Result() + + vscMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(vsc) + require.NoError(t, err) + + events := make([]string, 0, 3) + realClient := velerotest.NewFakeControllerRuntimeClient(t) + trackingClient := &fakeClientWithCallTracking{Client: realClient, events: &events} + + originalSleep := sleepBetweenTempVSCCreateAndDelete + t.Cleanup(func() { + sleepBetweenTempVSCCreateAndDelete = originalSleep + }) + + sleepBetweenTempVSCCreateAndDelete = func(d time.Duration) { + require.Equal(t, tempVSCCreateDeleteGap, d) + events = append(events, "sleep") + } + + p := volumeSnapshotContentDeleteItemAction{log: logrus.StandardLogger(), crClient: trackingClient} + err = p.Execute(&velero.DeleteItemActionExecuteInput{ + Item: &unstructured.Unstructured{Object: vscMap}, + Backup: builder.ForBackup("velero", "backup").Result(), + }) + require.NoError(t, err) + require.Equal(t, []string{"create", "sleep", "delete"}, events) +} + func boolPtr(b bool) *bool { return &b } diff --git a/internal/volume/volumes_information.go b/internal/volume/volumes_information.go index 463b81f46..4d5961bdb 100644 --- a/internal/volume/volumes_information.go +++ b/internal/volume/volumes_information.go @@ -146,6 +146,10 @@ type CSISnapshotInfo struct { // The VolumeSnapshot's Status.ReadyToUse value ReadyToUse *bool + + // The VolumeGroupSnapshotHandle from VSC status, used to create stub VGSC during restore + // for CSI drivers that populate this field (e.g., Ceph RBD). + VolumeGroupSnapshotHandle string `json:"volumeGroupSnapshotHandle,omitempty"` } // SnapshotDataMovementInfo is used for displaying the snapshot data mover status. @@ -456,6 +460,10 @@ func (v *BackupVolumesInformation) generateVolumeInfoForCSIVolumeSnapshot() { if volumeSnapshotContent.Status.SnapshotHandle != nil { snapshotHandle = *volumeSnapshotContent.Status.SnapshotHandle } + volumeGroupSnapshotHandle := "" + if volumeSnapshotContent.Status != nil && volumeSnapshotContent.Status.VolumeGroupSnapshotHandle != nil { + volumeGroupSnapshotHandle = *volumeSnapshotContent.Status.VolumeGroupSnapshotHandle + } if pvcPVInfo := v.pvMap.retrieve("", *volumeSnapshot.Spec.Source.PersistentVolumeClaimName, volumeSnapshot.Namespace); pvcPVInfo != nil { volumeInfo := &BackupVolumeInfo{ BackupMethod: CSISnapshot, @@ -466,12 +474,13 @@ func (v *BackupVolumesInformation) generateVolumeInfoForCSIVolumeSnapshot() { SnapshotDataMoved: false, PreserveLocalSnapshot: true, CSISnapshotInfo: &CSISnapshotInfo{ - VSCName: *volumeSnapshot.Status.BoundVolumeSnapshotContentName, - Size: size, - Driver: volumeSnapshotContent.Spec.Driver, - SnapshotHandle: snapshotHandle, - OperationID: operation.Spec.OperationID, - ReadyToUse: volumeSnapshot.Status.ReadyToUse, + VSCName: *volumeSnapshot.Status.BoundVolumeSnapshotContentName, + Size: size, + Driver: volumeSnapshotContent.Spec.Driver, + SnapshotHandle: snapshotHandle, + OperationID: operation.Spec.OperationID, + ReadyToUse: volumeSnapshot.Status.ReadyToUse, + VolumeGroupSnapshotHandle: volumeGroupSnapshotHandle, }, PVInfo: &PVInfo{ ReclaimPolicy: string(pvcPVInfo.PV.Spec.PersistentVolumeReclaimPolicy), diff --git a/pkg/apis/velero/v1/backup_repository_types.go b/pkg/apis/velero/v1/backup_repository_types.go index 621ffcfcc..8e2b3b715 100644 --- a/pkg/apis/velero/v1/backup_repository_types.go +++ b/pkg/apis/velero/v1/backup_repository_types.go @@ -35,8 +35,7 @@ type BackupRepositorySpec struct { // +optional RepositoryType string `json:"repositoryType"` - // ResticIdentifier is the full restic-compatible string for identifying - // this repository. This field is only used when RepositoryType is "restic". + // Deprecated // +optional ResticIdentifier string `json:"resticIdentifier,omitempty"` @@ -58,8 +57,7 @@ const ( BackupRepositoryPhaseReady BackupRepositoryPhase = "Ready" BackupRepositoryPhaseNotReady BackupRepositoryPhase = "NotReady" - BackupRepositoryTypeRestic string = "restic" - BackupRepositoryTypeKopia string = "kopia" + BackupRepositoryTypeKopia string = "kopia" ) // BackupRepositoryStatus is the current status of a BackupRepository. diff --git a/pkg/apis/velero/v1/labels_annotations.go b/pkg/apis/velero/v1/labels_annotations.go index 85d8b05aa..921af498e 100644 --- a/pkg/apis/velero/v1/labels_annotations.go +++ b/pkg/apis/velero/v1/labels_annotations.go @@ -141,6 +141,7 @@ const ( VolumeSnapshotRestoreSize = "velero.io/csi-volumesnapshot-restore-size" DriverNameAnnotation = "velero.io/csi-driver-name" VSCDeletionPolicyAnnotation = "velero.io/csi-vsc-deletion-policy" + VolumeGroupSnapshotHandleAnnotation = "velero.io/csi-volumegroupsnapshot-handle" VolumeSnapshotClassSelectorLabel = "velero.io/csi-volumesnapshot-class" VolumeSnapshotClassDriverBackupAnnotationPrefix = "velero.io/csi-volumesnapshot-class" VolumeSnapshotClassDriverPVCAnnotation = "velero.io/csi-volumesnapshot-class" diff --git a/pkg/backup/actions/csi/pvc_action.go b/pkg/backup/actions/csi/pvc_action.go index ac5f71a98..7f5fd2afa 100644 --- a/pkg/backup/actions/csi/pvc_action.go +++ b/pkg/backup/actions/csi/pvc_action.go @@ -24,7 +24,7 @@ import ( "k8s.io/client-go/util/retry" - volumegroupsnapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta1" + volumegroupsnapshotv1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -467,7 +467,7 @@ func (p *pvcBackupItemAction) Progress( return progress, biav2.InvalidOperationIDError(operationID) } - dataUpload, err := getDataUpload(context.Background(), p.crClient, operationID) + dataUpload, err := getDataUpload(context.Background(), p.crClient, backup.Namespace, operationID) if err != nil { p.log.Errorf( "fail to get DataUpload for backup %s/%s by operation ID %s: %s", @@ -512,7 +512,7 @@ func (p *pvcBackupItemAction) Cancel(operationID string, backup *velerov1api.Bac return biav2.InvalidOperationIDError(operationID) } - dataUpload, err := getDataUpload(context.Background(), p.crClient, operationID) + dataUpload, err := getDataUpload(context.Background(), p.crClient, backup.Namespace, operationID) if err != nil { p.log.Errorf( "fail to get DataUpload for backup %s/%s: %s", @@ -605,10 +605,12 @@ func createDataUpload( func getDataUpload( ctx context.Context, crClient crclient.Client, + namespace string, operationID string, ) (*velerov2alpha1.DataUpload, error) { dataUploadList := new(velerov2alpha1.DataUploadList) err := crClient.List(ctx, dataUploadList, &crclient.ListOptions{ + Namespace: namespace, LabelSelector: labels.SelectorFromSet( map[string]string{velerov1api.AsyncOperationIDLabel: operationID}, ), @@ -765,7 +767,7 @@ func (p *pvcBackupItemAction) getVolumeSnapshotReference( } // Re-fetch latest VGS to ensure status is populated after VGSC binding - latestVGS := &volumegroupsnapshotv1beta1.VolumeGroupSnapshot{} + latestVGS := &volumegroupsnapshotv1beta2.VolumeGroupSnapshot{} if err := p.crClient.Get(ctx, crclient.ObjectKeyFromObject(newVGS), latestVGS); err != nil { return nil, errors.Wrapf(err, "failed to re-fetch VolumeGroupSnapshot %s after VGSC binding wait", newVGS.Name) } @@ -913,7 +915,7 @@ func (p *pvcBackupItemAction) determineVGSClass( } // 3. Fallback to label-based default - vgsClassList := &volumegroupsnapshotv1beta1.VolumeGroupSnapshotClassList{} + vgsClassList := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotClassList{} if err := p.crClient.List(ctx, vgsClassList); err != nil { return "", errors.Wrap(err, "failed to list VolumeGroupSnapshotClasses") } @@ -942,22 +944,22 @@ func (p *pvcBackupItemAction) createVolumeGroupSnapshot( backup *velerov1api.Backup, pvc corev1api.PersistentVolumeClaim, vgsLabelKey, vgsLabelValue, vgsClassName string, -) (*volumegroupsnapshotv1beta1.VolumeGroupSnapshot, error) { +) (*volumegroupsnapshotv1beta2.VolumeGroupSnapshot, error) { vgsLabels := map[string]string{ velerov1api.BackupNameLabel: label.GetValidName(backup.Name), velerov1api.BackupUIDLabel: string(backup.UID), vgsLabelKey: vgsLabelValue, } - vgs := &volumegroupsnapshotv1beta1.VolumeGroupSnapshot{ + vgs := &volumegroupsnapshotv1beta2.VolumeGroupSnapshot{ ObjectMeta: metav1.ObjectMeta{ GenerateName: fmt.Sprintf("velero-%s-", vgsLabelValue), Namespace: pvc.Namespace, Labels: vgsLabels, }, - Spec: volumegroupsnapshotv1beta1.VolumeGroupSnapshotSpec{ + Spec: volumegroupsnapshotv1beta2.VolumeGroupSnapshotSpec{ VolumeGroupSnapshotClassName: &vgsClassName, - Source: volumegroupsnapshotv1beta1.VolumeGroupSnapshotSource{ + Source: volumegroupsnapshotv1beta2.VolumeGroupSnapshotSource{ Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ vgsLabelKey: vgsLabelValue, @@ -985,7 +987,7 @@ func (p *pvcBackupItemAction) createVolumeGroupSnapshot( func (p *pvcBackupItemAction) waitForVGSAssociatedVS( ctx context.Context, groupedPVCs []corev1api.PersistentVolumeClaim, - vgs *volumegroupsnapshotv1beta1.VolumeGroupSnapshot, + vgs *volumegroupsnapshotv1beta2.VolumeGroupSnapshot, timeout time.Duration, ) (map[string]*snapshotv1api.VolumeSnapshot, error) { expected := len(groupedPVCs) @@ -1028,10 +1030,10 @@ func (p *pvcBackupItemAction) waitForVGSAssociatedVS( return vsMap, nil } -func hasOwnerReference(obj metav1.Object, vgs *volumegroupsnapshotv1beta1.VolumeGroupSnapshot) bool { +func hasOwnerReference(obj metav1.Object, vgs *volumegroupsnapshotv1beta2.VolumeGroupSnapshot) bool { for _, ref := range obj.GetOwnerReferences() { if ref.Kind == kuberesource.VGSKind && - ref.APIVersion == volumegroupsnapshotv1beta1.GroupName+"/"+volumegroupsnapshotv1beta1.SchemeGroupVersion.Version && + ref.APIVersion == volumegroupsnapshotv1beta2.GroupName+"/"+volumegroupsnapshotv1beta2.SchemeGroupVersion.Version && ref.UID == vgs.UID { return true } @@ -1042,7 +1044,7 @@ func hasOwnerReference(obj metav1.Object, vgs *volumegroupsnapshotv1beta1.Volume func (p *pvcBackupItemAction) updateVGSCreatedVS( ctx context.Context, vsMap map[string]*snapshotv1api.VolumeSnapshot, - vgs *volumegroupsnapshotv1beta1.VolumeGroupSnapshot, + vgs *volumegroupsnapshotv1beta2.VolumeGroupSnapshot, backup *velerov1api.Backup, ) error { for pvcName, vs := range vsMap { @@ -1085,7 +1087,7 @@ func (p *pvcBackupItemAction) updateVGSCreatedVS( return nil } -func (p *pvcBackupItemAction) patchVGSCDeletionPolicy(ctx context.Context, vgs *volumegroupsnapshotv1beta1.VolumeGroupSnapshot) error { +func (p *pvcBackupItemAction) patchVGSCDeletionPolicy(ctx context.Context, vgs *volumegroupsnapshotv1beta2.VolumeGroupSnapshot) error { if vgs == nil || vgs.Status == nil || vgs.Status.BoundVolumeGroupSnapshotContentName == nil { return errors.New("VolumeGroupSnapshotContent name not found in VGS status") } @@ -1093,7 +1095,7 @@ func (p *pvcBackupItemAction) patchVGSCDeletionPolicy(ctx context.Context, vgs * vgscName := vgs.Status.BoundVolumeGroupSnapshotContentName return retry.RetryOnConflict(retry.DefaultBackoff, func() error { - vgsc := &volumegroupsnapshotv1beta1.VolumeGroupSnapshotContent{} + vgsc := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{} if err := p.crClient.Get(ctx, crclient.ObjectKey{Name: *vgscName}, vgsc); err != nil { return errors.Wrapf(err, "failed to get VolumeGroupSnapshotContent %s for VolumeGroupSnapshot %s/%s", *vgscName, vgs.Namespace, vgs.Name) } @@ -1112,9 +1114,9 @@ func (p *pvcBackupItemAction) patchVGSCDeletionPolicy(ctx context.Context, vgs * }) } -func (p *pvcBackupItemAction) deleteVGSAndVGSC(ctx context.Context, vgs *volumegroupsnapshotv1beta1.VolumeGroupSnapshot) error { +func (p *pvcBackupItemAction) deleteVGSAndVGSC(ctx context.Context, vgs *volumegroupsnapshotv1beta2.VolumeGroupSnapshot) error { if vgs.Status != nil && vgs.Status.BoundVolumeGroupSnapshotContentName != nil { - vgsc := &volumegroupsnapshotv1beta1.VolumeGroupSnapshotContent{ + vgsc := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{ ObjectMeta: metav1.ObjectMeta{ Name: *vgs.Status.BoundVolumeGroupSnapshotContentName, }, @@ -1139,11 +1141,11 @@ func (p *pvcBackupItemAction) deleteVGSAndVGSC(ctx context.Context, vgs *volumeg func (p *pvcBackupItemAction) waitForVGSCBinding( ctx context.Context, - vgs *volumegroupsnapshotv1beta1.VolumeGroupSnapshot, + vgs *volumegroupsnapshotv1beta2.VolumeGroupSnapshot, timeout time.Duration, ) error { return wait.PollUntilContextTimeout(ctx, time.Second, timeout, true, func(ctx context.Context) (bool, error) { - vgsRef := &volumegroupsnapshotv1beta1.VolumeGroupSnapshot{} + vgsRef := &volumegroupsnapshotv1beta2.VolumeGroupSnapshot{} if err := p.crClient.Get(ctx, crclient.ObjectKeyFromObject(vgs), vgsRef); err != nil { return false, err } @@ -1156,8 +1158,8 @@ func (p *pvcBackupItemAction) waitForVGSCBinding( }) } -func (p *pvcBackupItemAction) getVGSByLabels(ctx context.Context, namespace string, labels map[string]string) (*volumegroupsnapshotv1beta1.VolumeGroupSnapshot, error) { - vgsList := &volumegroupsnapshotv1beta1.VolumeGroupSnapshotList{} +func (p *pvcBackupItemAction) getVGSByLabels(ctx context.Context, namespace string, labels map[string]string) (*volumegroupsnapshotv1beta2.VolumeGroupSnapshot, error) { + vgsList := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotList{} if err := p.crClient.List(ctx, vgsList, crclient.InNamespace(namespace), crclient.MatchingLabels(labels), diff --git a/pkg/backup/actions/csi/pvc_action_test.go b/pkg/backup/actions/csi/pvc_action_test.go index efcb0b0ab..9ffe20be5 100644 --- a/pkg/backup/actions/csi/pvc_action_test.go +++ b/pkg/backup/actions/csi/pvc_action_test.go @@ -25,7 +25,7 @@ import ( "github.com/vmware-tanzu/velero/pkg/kuberesource" - volumegroupsnapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta1" + volumegroupsnapshotv1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" "github.com/stretchr/testify/assert" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" @@ -307,6 +307,28 @@ func TestProgress(t *testing.T) { operationID: "testing", expectedErr: "not found DataUpload for operationID testing", }, + { + name: "DataUpload in different namespace is not found", + backup: builder.ForBackup("velero", "test").Result(), + dataUpload: &velerov2alpha1.DataUpload{ + TypeMeta: metav1.TypeMeta{ + Kind: "DataUpload", + APIVersion: "v2alpha1", + }, + ObjectMeta: metav1.ObjectMeta{ + Namespace: "other-namespace", + Name: "testing", + Labels: map[string]string{ + velerov1api.AsyncOperationIDLabel: "testing", + }, + }, + Status: velerov2alpha1.DataUploadStatus{ + Phase: velerov2alpha1.DataUploadPhaseFailed, + }, + }, + operationID: "testing", + expectedErr: "not found DataUpload for operationID testing", + }, { name: "DataUpload is found", backup: builder.ForBackup("velero", "test").Result(), @@ -375,15 +397,15 @@ func TestCancel(t *testing.T) { tests := []struct { name string backup *velerov1api.Backup - dataUpload velerov2alpha1.DataUpload + dataUpload *velerov2alpha1.DataUpload operationID string - expectedErr error + expectedErr string expectedDataUpload velerov2alpha1.DataUpload }{ { name: "Cancel DataUpload", backup: builder.ForBackup("velero", "test").Result(), - dataUpload: velerov2alpha1.DataUpload{ + dataUpload: &velerov2alpha1.DataUpload{ TypeMeta: metav1.TypeMeta{ Kind: "DataUpload", APIVersion: velerov2alpha1.SchemeGroupVersion.String(), @@ -414,6 +436,31 @@ func TestCancel(t *testing.T) { }, }, }, + { + name: "DataUpload cannot be found", + backup: builder.ForBackup("velero", "test").Result(), + operationID: "testing", + expectedErr: "not found DataUpload for operationID testing", + }, + { + name: "DataUpload in different namespace is not found", + backup: builder.ForBackup("velero", "test").Result(), + dataUpload: &velerov2alpha1.DataUpload{ + TypeMeta: metav1.TypeMeta{ + Kind: "DataUpload", + APIVersion: velerov2alpha1.SchemeGroupVersion.String(), + }, + ObjectMeta: metav1.ObjectMeta{ + Namespace: "other-namespace", + Name: "testing", + Labels: map[string]string{ + velerov1api.AsyncOperationIDLabel: "testing", + }, + }, + }, + operationID: "testing", + expectedErr: "not found DataUpload for operationID testing", + }, } for _, tc := range tests { @@ -426,17 +473,23 @@ func TestCancel(t *testing.T) { crClient: crClient, } - err := crClient.Create(t.Context(), &tc.dataUpload) - require.NoError(t, err) + if tc.dataUpload != nil { + err := crClient.Create(t.Context(), tc.dataUpload) + require.NoError(t, err) + } - err = pvcBIA.Cancel(tc.operationID, tc.backup) - require.NoError(t, err) + err := pvcBIA.Cancel(tc.operationID, tc.backup) + if tc.expectedErr != "" { + require.EqualError(t, err, tc.expectedErr) + } else { + require.NoError(t, err) - du := new(velerov2alpha1.DataUpload) - err = crClient.Get(t.Context(), crclient.ObjectKey{Namespace: tc.dataUpload.Namespace, Name: tc.dataUpload.Name}, du) - require.NoError(t, err) + du := new(velerov2alpha1.DataUpload) + err = crClient.Get(t.Context(), crclient.ObjectKey{Namespace: tc.dataUpload.Namespace, Name: tc.dataUpload.Name}, du) + require.NoError(t, err) - require.True(t, cmp.Equal(tc.expectedDataUpload, *du, cmpopts.IgnoreFields(velerov2alpha1.DataUpload{}, "ResourceVersion"))) + require.True(t, cmp.Equal(tc.expectedDataUpload, *du, cmpopts.IgnoreFields(velerov2alpha1.DataUpload{}, "ResourceVersion"))) + } }) } } @@ -1121,7 +1174,7 @@ func TestDetermineVGSClass(t *testing.T) { name string backup *velerov1api.Backup pvc *corev1api.PersistentVolumeClaim - existingVGSClass []volumegroupsnapshotv1beta1.VolumeGroupSnapshotClass + existingVGSClass []volumegroupsnapshotv1beta2.VolumeGroupSnapshotClass expectError bool expectResult string }{ @@ -1153,7 +1206,7 @@ func TestDetermineVGSClass(t *testing.T) { name: "Default label-based match", pvc: &corev1api.PersistentVolumeClaim{}, backup: &velerov1api.Backup{}, - existingVGSClass: []volumegroupsnapshotv1beta1.VolumeGroupSnapshotClass{ + existingVGSClass: []volumegroupsnapshotv1beta2.VolumeGroupSnapshotClass{ { ObjectMeta: metav1.ObjectMeta{ Name: "default-class", @@ -1174,7 +1227,7 @@ func TestDetermineVGSClass(t *testing.T) { name: "Multiple matching VGS classes", pvc: &corev1api.PersistentVolumeClaim{}, backup: &velerov1api.Backup{}, - existingVGSClass: []volumegroupsnapshotv1beta1.VolumeGroupSnapshotClass{ + existingVGSClass: []volumegroupsnapshotv1beta2.VolumeGroupSnapshotClass{ { ObjectMeta: metav1.ObjectMeta{ Name: "class1", @@ -1204,7 +1257,7 @@ func TestDetermineVGSClass(t *testing.T) { client := velerotest.NewFakeControllerRuntimeClient(t, initObjs...) logger := logrus.New() - require.NoError(t, volumegroupsnapshotv1beta1.AddToScheme(client.Scheme())) + require.NoError(t, volumegroupsnapshotv1beta2.AddToScheme(client.Scheme())) action := &pvcBackupItemAction{crClient: client, log: logger} @@ -1263,13 +1316,13 @@ func TestCreateVolumeGroupSnapshot(t *testing.T) { assert.Equal(t, string(testBackup.UID), vgs.Labels[velerov1api.BackupUIDLabel]) // Check that it exists in fake client - retrieved := &volumegroupsnapshotv1beta1.VolumeGroupSnapshot{} + retrieved := &volumegroupsnapshotv1beta2.VolumeGroupSnapshot{} err = crClient.Get(t.Context(), crclient.ObjectKey{Name: vgs.Name, Namespace: vgs.Namespace}, retrieved) require.NoError(t, err) } func TestWaitForVGSAssociatedVS(t *testing.T) { - vgs := &volumegroupsnapshotv1beta1.VolumeGroupSnapshot{ + vgs := &volumegroupsnapshotv1beta2.VolumeGroupSnapshot{ ObjectMeta: metav1.ObjectMeta{ Name: "test-vgs", Namespace: "test-ns", @@ -1282,7 +1335,7 @@ func TestWaitForVGSAssociatedVS(t *testing.T) { if owned { refs = []metav1.OwnerReference{ { - APIVersion: "groupsnapshot.storage.k8s.io/v1beta1", + APIVersion: "groupsnapshot.storage.k8s.io/v1beta2", Kind: "VolumeGroupSnapshot", Name: vgs.Name, UID: vgs.UID, @@ -1429,7 +1482,7 @@ func TestUpdateVGSCreatedVS(t *testing.T) { }, } - vgs := &volumegroupsnapshotv1beta1.VolumeGroupSnapshot{ + vgs := &volumegroupsnapshotv1beta2.VolumeGroupSnapshot{ ObjectMeta: metav1.ObjectMeta{ Name: "test-vgs", Namespace: "ns", @@ -1442,7 +1495,7 @@ func TestUpdateVGSCreatedVS(t *testing.T) { if withVGSOwner { refs = []metav1.OwnerReference{ { - APIVersion: "groupsnapshot.storage.k8s.io/v1beta1", + APIVersion: "groupsnapshot.storage.k8s.io/v1beta2", Kind: "VolumeGroupSnapshot", Name: vgs.Name, UID: vgs.UID, @@ -1561,18 +1614,18 @@ func TestPatchVGSCDeletionPolicy(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - vgsc := &volumegroupsnapshotv1beta1.VolumeGroupSnapshotContent{ + vgsc := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{ ObjectMeta: metav1.ObjectMeta{Name: "test-vgsc"}, - Spec: volumegroupsnapshotv1beta1.VolumeGroupSnapshotContentSpec{ + Spec: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSpec{ DeletionPolicy: tt.initialPolicy, }, } - vgs := &volumegroupsnapshotv1beta1.VolumeGroupSnapshot{ + vgs := &volumegroupsnapshotv1beta2.VolumeGroupSnapshot{ ObjectMeta: metav1.ObjectMeta{ Name: "test-vgs", Namespace: "ns", }, - Status: &volumegroupsnapshotv1beta1.VolumeGroupSnapshotStatus{ + Status: &volumegroupsnapshotv1beta2.VolumeGroupSnapshotStatus{ BoundVolumeGroupSnapshotContentName: pointer.String("test-vgsc"), }, } @@ -1590,7 +1643,7 @@ func TestPatchVGSCDeletionPolicy(t *testing.T) { } require.NoError(t, err) - updated := &volumegroupsnapshotv1beta1.VolumeGroupSnapshotContent{} + updated := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{} err = client.Get(t.Context(), crclient.ObjectKey{Name: "test-vgsc"}, updated) require.NoError(t, err) require.Equal(t, tt.expectedPolicy, updated.Spec.DeletionPolicy) @@ -1599,20 +1652,20 @@ func TestPatchVGSCDeletionPolicy(t *testing.T) { } func TestDeleteVGSAndVGSC(t *testing.T) { - makeVGS := func(name, namespace string, boundVGSCName *string) *volumegroupsnapshotv1beta1.VolumeGroupSnapshot { - return &volumegroupsnapshotv1beta1.VolumeGroupSnapshot{ + makeVGS := func(name, namespace string, boundVGSCName *string) *volumegroupsnapshotv1beta2.VolumeGroupSnapshot { + return &volumegroupsnapshotv1beta2.VolumeGroupSnapshot{ ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: namespace, }, - Status: &volumegroupsnapshotv1beta1.VolumeGroupSnapshotStatus{ + Status: &volumegroupsnapshotv1beta2.VolumeGroupSnapshotStatus{ BoundVolumeGroupSnapshotContentName: boundVGSCName, }, } } - makeVGSC := func(name string) *volumegroupsnapshotv1beta1.VolumeGroupSnapshotContent { - return &volumegroupsnapshotv1beta1.VolumeGroupSnapshotContent{ + makeVGSC := func(name string) *volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent { + return &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{ ObjectMeta: metav1.ObjectMeta{ Name: name, }, @@ -1621,8 +1674,8 @@ func TestDeleteVGSAndVGSC(t *testing.T) { tests := []struct { name string - vgs *volumegroupsnapshotv1beta1.VolumeGroupSnapshot - existingVGSC *volumegroupsnapshotv1beta1.VolumeGroupSnapshotContent + vgs *volumegroupsnapshotv1beta2.VolumeGroupSnapshot + existingVGSC *volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent expectVGSCDelete bool expectVGSDelete bool }{ @@ -1668,13 +1721,13 @@ func TestDeleteVGSAndVGSC(t *testing.T) { // Check VGSC is deleted if tt.expectVGSCDelete { - got := &volumegroupsnapshotv1beta1.VolumeGroupSnapshotContent{} + got := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{} err = client.Get(t.Context(), crclient.ObjectKey{Name: "test-vgsc"}, got) assert.True(t, apierrors.IsNotFound(err), "expected VGSC to be deleted") } // Check VGS is deleted - gotVGS := &volumegroupsnapshotv1beta1.VolumeGroupSnapshot{} + gotVGS := &volumegroupsnapshotv1beta2.VolumeGroupSnapshot{} err = client.Get(t.Context(), crclient.ObjectKey{Name: "test-vgs", Namespace: "ns"}, gotVGS) assert.True(t, apierrors.IsNotFound(err), "expected VGS to be deleted") }) @@ -1769,8 +1822,8 @@ func TestFindExistingVSForBackup(t *testing.T) { } func TestWaitForVGSCBinding(t *testing.T) { - makeVGS := func(name string, withStatus bool) *volumegroupsnapshotv1beta1.VolumeGroupSnapshot { - vgs := &volumegroupsnapshotv1beta1.VolumeGroupSnapshot{ + makeVGS := func(name string, withStatus bool) *volumegroupsnapshotv1beta2.VolumeGroupSnapshot { + vgs := &volumegroupsnapshotv1beta2.VolumeGroupSnapshot{ ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: "ns", @@ -1778,7 +1831,7 @@ func TestWaitForVGSCBinding(t *testing.T) { } if withStatus { contentName := "vgsc-123" - vgs.Status = &volumegroupsnapshotv1beta1.VolumeGroupSnapshotStatus{ + vgs.Status = &volumegroupsnapshotv1beta2.VolumeGroupSnapshotStatus{ BoundVolumeGroupSnapshotContentName: &contentName, } } @@ -1787,7 +1840,7 @@ func TestWaitForVGSCBinding(t *testing.T) { tests := []struct { name string - vgs *volumegroupsnapshotv1beta1.VolumeGroupSnapshot + vgs *volumegroupsnapshotv1beta2.VolumeGroupSnapshot expectErr bool }{ { @@ -1830,8 +1883,8 @@ func TestGetVGSByLabels(t *testing.T) { labelVal := "backup-123" testLabels := map[string]string{labelKey: labelVal} - makeVGS := func(name string, labels map[string]string) *volumegroupsnapshotv1beta1.VolumeGroupSnapshot { - return &volumegroupsnapshotv1beta1.VolumeGroupSnapshot{ + makeVGS := func(name string, labels map[string]string) *volumegroupsnapshotv1beta2.VolumeGroupSnapshot { + return &volumegroupsnapshotv1beta2.VolumeGroupSnapshot{ ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: "test-ns", @@ -1916,7 +1969,7 @@ func (f *failingClient) List(ctx context.Context, list crclient.ObjectList, opts } func TestHasOwnerReference(t *testing.T) { - vgs := &volumegroupsnapshotv1beta1.VolumeGroupSnapshot{ + vgs := &volumegroupsnapshotv1beta2.VolumeGroupSnapshot{ ObjectMeta: metav1.ObjectMeta{ Name: "test-vgs", Namespace: "test-ns", @@ -1933,7 +1986,7 @@ func TestHasOwnerReference(t *testing.T) { name: "match kind, apiversion, uid", ownerRef: metav1.OwnerReference{ Kind: kuberesource.VGSKind, - APIVersion: volumegroupsnapshotv1beta1.GroupName + "/" + volumegroupsnapshotv1beta1.SchemeGroupVersion.Version, + APIVersion: volumegroupsnapshotv1beta2.GroupName + "/" + volumegroupsnapshotv1beta2.SchemeGroupVersion.Version, UID: vgs.UID, }, expect: true, @@ -1942,7 +1995,7 @@ func TestHasOwnerReference(t *testing.T) { name: "mismatch kind", ownerRef: metav1.OwnerReference{ Kind: "other-kind", - APIVersion: volumegroupsnapshotv1beta1.GroupName + "/" + volumegroupsnapshotv1beta1.SchemeGroupVersion.Version, + APIVersion: volumegroupsnapshotv1beta2.GroupName + "/" + volumegroupsnapshotv1beta2.SchemeGroupVersion.Version, UID: vgs.UID, }, expect: false, @@ -1960,7 +2013,7 @@ func TestHasOwnerReference(t *testing.T) { name: "mismatch uid", ownerRef: metav1.OwnerReference{ Kind: kuberesource.VGSKind, - APIVersion: volumegroupsnapshotv1beta1.GroupName + "/" + volumegroupsnapshotv1beta1.SchemeGroupVersion.Version, + APIVersion: volumegroupsnapshotv1beta2.GroupName + "/" + volumegroupsnapshotv1beta2.SchemeGroupVersion.Version, UID: "wrong-uid", }, expect: false, diff --git a/pkg/backup/actions/csi/volumesnapshot_action.go b/pkg/backup/actions/csi/volumesnapshot_action.go index b7283b628..0e0e9a840 100644 --- a/pkg/backup/actions/csi/volumesnapshot_action.go +++ b/pkg/backup/actions/csi/volumesnapshot_action.go @@ -151,6 +151,12 @@ func (p *volumeSnapshotBackupItemAction) Execute( annotations[velerov1api.VolumeSnapshotRestoreSize] = resource.NewQuantity( *vsc.Status.RestoreSize, resource.BinarySI).String() } + + // Capture VolumeGroupSnapshotHandle to create stub VGSC during restore + // for CSI drivers that populate this field (e.g., Ceph RBD). + if vsc.Status.VolumeGroupSnapshotHandle != nil { + annotations[velerov1api.VolumeGroupSnapshotHandleAnnotation] = *vsc.Status.VolumeGroupSnapshotHandle + } } p.log.Infof("Patching VolumeSnapshotContent %s with velero BackupNameLabel", diff --git a/pkg/client/factory.go b/pkg/client/factory.go index 4b3c8941e..51dfb62c3 100644 --- a/pkg/client/factory.go +++ b/pkg/client/factory.go @@ -19,7 +19,7 @@ package client import ( "os" - volumegroupsnapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta1" + volumegroupsnapshotv1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" @@ -168,7 +168,7 @@ func (f *factory) KubebuilderClient() (kbclient.Client, error) { if err := snapshotv1api.AddToScheme(scheme); err != nil { return nil, err } - if err := volumegroupsnapshotv1beta1.AddToScheme(scheme); err != nil { + if err := volumegroupsnapshotv1beta2.AddToScheme(scheme); err != nil { return nil, err } kubebuilderClient, err := kbclient.New(clientConfig, kbclient.Options{ @@ -207,7 +207,7 @@ func (f *factory) KubebuilderWatchClient() (kbclient.WithWatch, error) { if err := snapshotv1api.AddToScheme(scheme); err != nil { return nil, err } - if err := volumegroupsnapshotv1beta1.AddToScheme(scheme); err != nil { + if err := volumegroupsnapshotv1beta2.AddToScheme(scheme); err != nil { return nil, err } kubebuilderWatchClient, err := kbclient.NewWithWatch(clientConfig, kbclient.Options{ diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go index e744013e8..cb38a40d0 100644 --- a/pkg/cmd/server/server.go +++ b/pkg/cmd/server/server.go @@ -27,7 +27,7 @@ import ( "time" logrusr "github.com/bombsimon/logrusr/v3" - volumegroupsnapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta1" + volumegroupsnapshotv1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus/promhttp" @@ -247,7 +247,7 @@ func newServer(f client.Factory, config *config.Config, logger *logrus.Logger) ( cancelFunc() return nil, err } - if err := volumegroupsnapshotv1beta1.AddToScheme(scheme); err != nil { + if err := volumegroupsnapshotv1beta2.AddToScheme(scheme); err != nil { cancelFunc() return nil, err } diff --git a/pkg/cmd/server/server_test.go b/pkg/cmd/server/server_test.go index 1ea9d0022..c602f7c9e 100644 --- a/pkg/cmd/server/server_test.go +++ b/pkg/cmd/server/server_test.go @@ -204,9 +204,9 @@ func Test_newServer(t *testing.T) { }, logger) require.Error(t, err) - // invalid clientQPS Restic uploader + // invalid clientQPS Kopia uploader _, err = newServer(factory, &config.Config{ - UploaderType: uploader.ResticType, + UploaderType: uploader.KopiaType, ClientQPS: -1, }, logger) require.Error(t, err) diff --git a/pkg/controller/backup_deletion_controller.go b/pkg/controller/backup_deletion_controller.go index 5a791999c..5fe29c5f1 100644 --- a/pkg/controller/backup_deletion_controller.go +++ b/pkg/controller/backup_deletion_controller.go @@ -20,6 +20,7 @@ import ( "context" "encoding/json" "fmt" + "strings" "time" jsonpatch "github.com/evanphx/json-patch/v5" @@ -267,8 +268,17 @@ func (r *backupDeletionReconciler) Reconcile(ctx context.Context, req ctrl.Reque if err != nil { log.WithError(err).Errorf("Unable to download tarball for backup %s, skipping associated DeleteItemAction plugins", backup.Name) + // for backups which failed before tarball object could be uploaded we do offline cleanup log.Info("Cleaning up CSI volumesnapshots") r.deleteCSIVolumeSnapshotsIfAny(ctx, backup, log) + + // If the tarball simply does not exist (HTTP 404 / not found), the download + // failure is permanent and not retryable, so we let deletion proceed. + // For transient errors (throttling, auth failures, network issues), record + // the error to fail the deletion so it can be retried later. + if !isTarballNotFoundError(err) { + errs = append(errs, errors.Wrapf(err, "error downloading backup tarball, CSI snapshot cleanup was skipped").Error()) + } } else { defer closeAndRemoveFile(backupFile, r.logger) deleteCtx := &delete.Context{ @@ -351,11 +361,13 @@ func (r *backupDeletionReconciler) Reconcile(ctx context.Context, req ctrl.Reque } } - if backupStore != nil { + if backupStore != nil && len(errs) == 0 { log.Info("Removing backup from backup storage") if err := backupStore.DeleteBackup(backup.Name); err != nil { errs = append(errs, err.Error()) } + } else if len(errs) > 0 { + log.Info("Skipping removal of backup from backup storage due to previous errors") } log.Info("Removing restores") @@ -691,3 +703,28 @@ func batchDeleteSnapshots(ctx context.Context, repoEnsurer *repository.Ensurer, return errs } + +// isTarballNotFoundError reports whether err indicates that the backup tarball +// does not exist in object storage (e.g. HTTP 404 / not-found). Such errors are +// permanent and not retryable, so callers should let deletion proceed (skipping +// DeleteItemAction plugins) rather than failing the entire deletion. +// +// Transient errors (throttling, auth failures, network timeouts) return false so +// the deletion is failed and can be retried once the storage is reachable again. +func isTarballNotFoundError(err error) bool { + if err == nil { + return false + } + // Lower-case once for all comparisons. + msg := strings.ToLower(err.Error()) + // Common "not found" indicators across cloud providers: + // - "not found" / "does not exist": generic, in-memory object store + // - "nosuchkey": AWS S3 + // - "blobnotfound": Azure Blob Storage + // - "objectnotexist": GCS + return strings.Contains(msg, "not found") || + strings.Contains(msg, "does not exist") || + strings.Contains(msg, "nosuchkey") || + strings.Contains(msg, "blobnotfound") || + strings.Contains(msg, "objectnotexist") +} diff --git a/pkg/controller/backup_deletion_controller_test.go b/pkg/controller/backup_deletion_controller_test.go index ab3687438..24cc65846 100644 --- a/pkg/controller/backup_deletion_controller_test.go +++ b/pkg/controller/backup_deletion_controller_test.go @@ -25,8 +25,6 @@ import ( "reflect" "time" - snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" - "context" "github.com/sirupsen/logrus" @@ -606,7 +604,7 @@ func TestBackupDeletionControllerReconcile(t *testing.T) { // Make sure snapshot was deleted assert.Equal(t, 0, td.volumeSnapshotter.SnapshotsTaken.Len()) }) - t.Run("backup is still deleted if downloading tarball fails for DeleteItemAction plugins", func(t *testing.T) { + t.Run("backup deletion fails with error when downloading tarball fails for DeleteItemAction plugins", func(t *testing.T) { backup := builder.ForBackup(velerov1api.DefaultNamespace, "foo").Result() backup.UID = "uid" backup.Spec.StorageLocation = "primary" @@ -672,6 +670,89 @@ func TestBackupDeletionControllerReconcile(t *testing.T) { td.backupStore.On("GetBackupVolumeSnapshots", input.Spec.BackupName).Return(snapshots, nil) td.backupStore.On("GetBackupContents", input.Spec.BackupName).Return(nil, fmt.Errorf("error downloading tarball")) + + _, err := td.controller.Reconcile(t.Context(), td.req) + require.NoError(t, err) + + td.backupStore.AssertCalled(t, "GetBackupContents", input.Spec.BackupName) + // DeleteBackup (removing backup data from object storage) must NOT be called + // when there are errors, so that the deletion can be retried later. + td.backupStore.AssertNotCalled(t, "DeleteBackup", input.Spec.BackupName) + + // the dbr should still exist and be marked Processed with errors + res := &velerov1api.DeleteBackupRequest{} + err = td.fakeClient.Get(ctx, td.req.NamespacedName, res) + require.NoError(t, err, "Expected DBR to still exist after tarball download failure") + assert.Equal(t, velerov1api.DeleteBackupRequestPhaseProcessed, res.Status.Phase) + require.Len(t, res.Status.Errors, 1) + assert.Contains(t, res.Status.Errors[0], "error downloading backup tarball, CSI snapshot cleanup was skipped") + + // backup CR should NOT be deleted + err = td.fakeClient.Get(t.Context(), types.NamespacedName{ + Namespace: velerov1api.DefaultNamespace, + Name: backup.Name, + }, &velerov1api.Backup{}) + require.NoError(t, err, "Expected backup CR to still exist after tarball download failure") + }) + t.Run("backup is still deleted if downloading tarball returns a not-found error", func(t *testing.T) { + backup := builder.ForBackup(velerov1api.DefaultNamespace, "foo").Result() + backup.UID = "uid" + backup.Spec.StorageLocation = "primary" + + input := defaultTestDbr() + input.Labels = nil + + location := &velerov1api.BackupStorageLocation{ + ObjectMeta: metav1.ObjectMeta{ + Namespace: backup.Namespace, + Name: backup.Spec.StorageLocation, + }, + Spec: velerov1api.BackupStorageLocationSpec{ + Provider: "objStoreProvider", + StorageType: velerov1api.StorageType{ + ObjectStorage: &velerov1api.ObjectStorageLocation{ + Bucket: "bucket", + }, + }, + }, + Status: velerov1api.BackupStorageLocationStatus{ + Phase: velerov1api.BackupStorageLocationPhaseAvailable, + }, + } + + snapshotLocation := &velerov1api.VolumeSnapshotLocation{ + ObjectMeta: metav1.ObjectMeta{ + Namespace: backup.Namespace, + Name: "vsl-1", + }, + Spec: velerov1api.VolumeSnapshotLocationSpec{ + Provider: "provider-1", + }, + } + + td := setupBackupDeletionControllerTest(t, defaultTestDbr(), backup, location, snapshotLocation) + td.volumeSnapshotter.SnapshotsTaken.Insert("snap-1") + + snapshots := []*volume.Snapshot{ + { + Spec: volume.SnapshotSpec{ + Location: "vsl-1", + }, + Status: volume.SnapshotStatus{ + ProviderSnapshotID: "snap-1", + }, + }, + } + + pluginManager := &pluginmocks.Manager{} + pluginManager.On("GetVolumeSnapshotter", "provider-1").Return(td.volumeSnapshotter, nil) + pluginManager.On("GetDeleteItemActions").Return([]velero.DeleteItemAction{new(mocks.DeleteItemAction)}, nil) + pluginManager.On("CleanupClients") + td.controller.newPluginManager = func(logrus.FieldLogger) clientmgmt.Manager { return pluginManager } + + td.backupStore.On("GetBackupVolumeSnapshots", input.Spec.BackupName).Return(snapshots, nil) + // Simulate a 404/not-found error (tarball has already been removed from storage) + td.backupStore.On("GetBackupContents", input.Spec.BackupName).Return(nil, fmt.Errorf("key not found")) td.backupStore.On("DeleteBackup", input.Spec.BackupName).Return(nil) _, err := td.controller.Reconcile(t.Context(), td.req) @@ -680,30 +761,17 @@ func TestBackupDeletionControllerReconcile(t *testing.T) { td.backupStore.AssertCalled(t, "GetBackupContents", input.Spec.BackupName) td.backupStore.AssertCalled(t, "DeleteBackup", input.Spec.BackupName) - // the dbr should be deleted + // the dbr should be deleted (not-found is treated as permanent, deletion proceeds) res := &velerov1api.DeleteBackupRequest{} err = td.fakeClient.Get(ctx, td.req.NamespacedName, res) - assert.True(t, apierrors.IsNotFound(err), "Expected not found error, but actual value of error: %v", err) - if err == nil { - t.Logf("status of the dbr: %s, errors in dbr: %v", res.Status.Phase, res.Status.Errors) - } + assert.True(t, apierrors.IsNotFound(err), "Expected DBR to be deleted after not-found tarball error, but actual error: %v", err) - // backup CR should be deleted + // backup CR should be deleted because there are no errors in errs err = td.fakeClient.Get(t.Context(), types.NamespacedName{ Namespace: velerov1api.DefaultNamespace, Name: backup.Name, }, &velerov1api.Backup{}) - assert.True(t, apierrors.IsNotFound(err), "Expected not found error, but actual value of error: %v", err) - - // leaked CSI snapshot should be deleted - err = td.fakeClient.Get(t.Context(), types.NamespacedName{ - Namespace: "user-ns", - Name: "vs-1", - }, &snapshotv1api.VolumeSnapshot{}) - assert.True(t, apierrors.IsNotFound(err), "Expected not found error for the leaked CSI snapshot, but actual value of error: %v", err) - - // Make sure snapshot was deleted - assert.Equal(t, 0, td.volumeSnapshotter.SnapshotsTaken.Len()) + assert.True(t, apierrors.IsNotFound(err), "Expected backup CR to be deleted after not-found tarball error, but actual error: %v", err) }) t.Run("Expired request will be deleted if the status is processed", func(t *testing.T) { expired := time.Date(2018, 4, 3, 12, 0, 0, 0, time.UTC) @@ -821,12 +889,12 @@ func TestGetSnapshotsInBackup(t *testing.T) { { VolumeNamespace: "ns-1", SnapshotID: "snap-3", - RepositoryType: "restic", + RepositoryType: "kopia", }, { VolumeNamespace: "ns-1", SnapshotID: "snap-4", - RepositoryType: "restic", + RepositoryType: "kopia", }, }, }, @@ -876,7 +944,7 @@ func TestGetSnapshotsInBackup(t *testing.T) { { VolumeNamespace: "ns-1", SnapshotID: "snap-3", - RepositoryType: "restic", + RepositoryType: "kopia", }, }, }, diff --git a/pkg/controller/backup_repository_controller.go b/pkg/controller/backup_repository_controller.go index 16e0b740a..11ebb5aec 100644 --- a/pkg/controller/backup_repository_controller.go +++ b/pkg/controller/backup_repository_controller.go @@ -43,7 +43,6 @@ import ( "github.com/vmware-tanzu/velero/pkg/constant" "github.com/vmware-tanzu/velero/pkg/label" "github.com/vmware-tanzu/velero/pkg/metrics" - repoconfig "github.com/vmware-tanzu/velero/pkg/repository/config" "github.com/vmware-tanzu/velero/pkg/repository/maintenance" repomanager "github.com/vmware-tanzu/velero/pkg/repository/manager" "github.com/vmware-tanzu/velero/pkg/util/kube" @@ -53,9 +52,11 @@ import ( const ( repoSyncPeriod = 5 * time.Minute defaultMaintainFrequency = 7 * 24 * time.Hour - defaultMaintenanceStatusQueueLength = 3 + defaultMaintenanceStatusQueueLength = 25 ) +var maintenanceStatusQueueLength = defaultMaintenanceStatusQueueLength + type BackupRepoReconciler struct { client.Client namespace string @@ -238,6 +239,10 @@ func (r *BackupRepoReconciler) Reconcile(ctx context.Context, req ctrl.Request) return ctrl.Result{}, err } + if backupRepo.Spec.RepositoryType != velerov1api.BackupRepositoryTypeKopia { + return ctrl.Result{}, nil + } + bsl, bslErr := r.getBSL(ctx, backupRepo) if bslErr != nil { log.WithError(bslErr).Error("Fail to get BSL for BackupRepository. Skip reconciling.") @@ -245,7 +250,7 @@ func (r *BackupRepoReconciler) Reconcile(ctx context.Context, req ctrl.Request) } if backupRepo.Status.Phase == "" || backupRepo.Status.Phase == velerov1api.BackupRepositoryPhaseNew { - if err := r.initializeRepo(ctx, backupRepo, bsl, log); err != nil { + if err := r.initializeRepo(ctx, backupRepo, log); err != nil { log.WithError(err).Error("error initialize repository") return ctrl.Result{}, errors.WithStack(err) } @@ -263,7 +268,7 @@ func (r *BackupRepoReconciler) Reconcile(ctx context.Context, req ctrl.Request) switch backupRepo.Status.Phase { case velerov1api.BackupRepositoryPhaseNotReady: - ready, err := r.checkNotReadyRepo(ctx, backupRepo, bsl, log) + ready, err := r.checkNotReadyRepo(ctx, backupRepo, log) if err != nil { return ctrl.Result{}, err } else if !ready { @@ -311,35 +316,9 @@ func (r *BackupRepoReconciler) getBSL(ctx context.Context, req *velerov1api.Back return loc, nil } -func (r *BackupRepoReconciler) getIdentifierByBSL(bsl *velerov1api.BackupStorageLocation, req *velerov1api.BackupRepository) (string, error) { - repoIdentifier, err := repoconfig.GetRepoIdentifier(bsl, req.Spec.VolumeNamespace) - if err != nil { - return "", errors.Wrapf(err, "error to get identifier for repo %s", req.Name) - } - - return repoIdentifier, nil -} - -func (r *BackupRepoReconciler) initializeRepo(ctx context.Context, req *velerov1api.BackupRepository, bsl *velerov1api.BackupStorageLocation, log logrus.FieldLogger) error { +func (r *BackupRepoReconciler) initializeRepo(ctx context.Context, req *velerov1api.BackupRepository, log logrus.FieldLogger) error { log.WithField("repoConfig", r.backupRepoConfig).Info("Initializing backup repository") - var repoIdentifier string - // Only get restic identifier for restic repositories - if req.Spec.RepositoryType == "" || req.Spec.RepositoryType == velerov1api.BackupRepositoryTypeRestic { - var err error - repoIdentifier, err = r.getIdentifierByBSL(bsl, req) - if err != nil { - return r.patchBackupRepository(ctx, req, func(rr *velerov1api.BackupRepository) { - rr.Status.Message = err.Error() - rr.Status.Phase = velerov1api.BackupRepositoryPhaseNotReady - - if rr.Spec.MaintenanceFrequency.Duration <= 0 { - rr.Spec.MaintenanceFrequency = metav1.Duration{Duration: r.getRepositoryMaintenanceFrequency(req)} - } - }) - } - } - config, err := getBackupRepositoryConfig(ctx, r, r.backupRepoConfig, r.namespace, req.Name, req.Spec.RepositoryType, log) if err != nil { log.WithError(err).Warn("Failed to get repo config, repo config is ignored") @@ -349,11 +328,6 @@ func (r *BackupRepoReconciler) initializeRepo(ctx context.Context, req *velerov1 // defaulting - if the patch fails, return an error so the item is returned to the queue if err := r.patchBackupRepository(ctx, req, func(rr *velerov1api.BackupRepository) { - // Only set ResticIdentifier for restic repositories - if rr.Spec.RepositoryType == "" || rr.Spec.RepositoryType == velerov1api.BackupRepositoryTypeRestic { - rr.Spec.ResticIdentifier = repoIdentifier - } - if rr.Spec.MaintenanceFrequency.Duration <= 0 { rr.Spec.MaintenanceFrequency = metav1.Duration{Duration: r.getRepositoryMaintenanceFrequency(req)} } @@ -397,7 +371,7 @@ func ensureRepo(repo *velerov1api.BackupRepository, repoManager repomanager.Mana } func (r *BackupRepoReconciler) recallMaintenance(ctx context.Context, req *velerov1api.BackupRepository, log logrus.FieldLogger) error { - history, err := maintenance.WaitAllJobsComplete(ctx, r.Client, req, defaultMaintenanceStatusQueueLength, log) + history, err := maintenance.WaitAllJobsComplete(ctx, r.Client, req, maintenanceStatusQueueLength, log) if err != nil { return errors.Wrapf(err, "error waiting incomplete repo maintenance job for repo %s", req.Name) } @@ -455,7 +429,7 @@ func consolidateHistory(coming, cur []velerov1api.BackupRepositoryMaintenanceSta truncated := []velerov1api.BackupRepositoryMaintenanceStatus{} for consolidator.Len() > 0 { - if len(truncated) == defaultMaintenanceStatusQueueLength { + if len(truncated) == maintenanceStatusQueueLength { break } @@ -565,8 +539,8 @@ func updateRepoMaintenanceHistory(repo *velerov1api.BackupRepository, result vel } startingPos := 0 - if len(repo.Status.RecentMaintenance) >= defaultMaintenanceStatusQueueLength { - startingPos = len(repo.Status.RecentMaintenance) - defaultMaintenanceStatusQueueLength + 1 + if len(repo.Status.RecentMaintenance) >= maintenanceStatusQueueLength { + startingPos = len(repo.Status.RecentMaintenance) - maintenanceStatusQueueLength + 1 } repo.Status.RecentMaintenance = append(repo.Status.RecentMaintenance[startingPos:], latest) @@ -576,25 +550,9 @@ func dueForMaintenance(req *velerov1api.BackupRepository, now time.Time) bool { return req.Status.LastMaintenanceTime == nil || req.Status.LastMaintenanceTime.Add(req.Spec.MaintenanceFrequency.Duration).Before(now) } -func (r *BackupRepoReconciler) checkNotReadyRepo(ctx context.Context, req *velerov1api.BackupRepository, bsl *velerov1api.BackupStorageLocation, log logrus.FieldLogger) (bool, error) { +func (r *BackupRepoReconciler) checkNotReadyRepo(ctx context.Context, req *velerov1api.BackupRepository, log logrus.FieldLogger) (bool, error) { log.Info("Checking backup repository for readiness") - // Only check and update restic identifier for restic repositories - if req.Spec.RepositoryType == "" || req.Spec.RepositoryType == velerov1api.BackupRepositoryTypeRestic { - repoIdentifier, err := r.getIdentifierByBSL(bsl, req) - if err != nil { - return false, r.patchBackupRepository(ctx, req, repoNotReady(err.Error())) - } - - if repoIdentifier != req.Spec.ResticIdentifier { - if err := r.patchBackupRepository(ctx, req, func(rr *velerov1api.BackupRepository) { - rr.Spec.ResticIdentifier = repoIdentifier - }); err != nil { - return false, err - } - } - } - // we need to ensure it (first check, if check fails, attempt to init) // because we don't know if it's been successfully initialized yet. if err := ensureRepo(req, r.repositoryManager); err != nil { diff --git a/pkg/controller/backup_repository_controller_test.go b/pkg/controller/backup_repository_controller_test.go index 81a973200..ed952f4ae 100644 --- a/pkg/controller/backup_repository_controller_test.go +++ b/pkg/controller/backup_repository_controller_test.go @@ -98,32 +98,6 @@ func TestPatchBackupRepository(t *testing.T) { } func TestCheckNotReadyRepo(t *testing.T) { - // Test for restic repository - t.Run("restic repository", func(t *testing.T) { - rr := mockBackupRepositoryCR() - rr.Spec.BackupStorageLocation = "default" - rr.Spec.ResticIdentifier = "fake-identifier" - rr.Spec.VolumeNamespace = "volume-ns-1" - rr.Spec.RepositoryType = velerov1api.BackupRepositoryTypeRestic - reconciler := mockBackupRepoReconciler(t, "PrepareRepo", rr, nil) - err := reconciler.Client.Create(t.Context(), rr) - require.NoError(t, err) - location := velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Config: map[string]string{"resticRepoPrefix": "s3:test.amazonaws.com/bucket/restic"}, - }, - ObjectMeta: metav1.ObjectMeta{ - Namespace: velerov1api.DefaultNamespace, - Name: rr.Spec.BackupStorageLocation, - }, - } - - _, err = reconciler.checkNotReadyRepo(t.Context(), rr, &location, reconciler.logger) - require.NoError(t, err) - assert.Equal(t, velerov1api.BackupRepositoryPhaseReady, rr.Status.Phase) - assert.Equal(t, "s3:test.amazonaws.com/bucket/restic/volume-ns-1", rr.Spec.ResticIdentifier) - }) - // Test for kopia repository t.Run("kopia repository", func(t *testing.T) { rr := mockBackupRepositoryCR() @@ -133,48 +107,13 @@ func TestCheckNotReadyRepo(t *testing.T) { reconciler := mockBackupRepoReconciler(t, "PrepareRepo", rr, nil) err := reconciler.Client.Create(t.Context(), rr) require.NoError(t, err) - location := velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Config: map[string]string{"resticRepoPrefix": "s3:test.amazonaws.com/bucket/restic"}, - }, - ObjectMeta: metav1.ObjectMeta{ - Namespace: velerov1api.DefaultNamespace, - Name: rr.Spec.BackupStorageLocation, - }, - } - _, err = reconciler.checkNotReadyRepo(t.Context(), rr, &location, reconciler.logger) + _, err = reconciler.checkNotReadyRepo(t.Context(), rr, reconciler.logger) require.NoError(t, err) assert.Equal(t, velerov1api.BackupRepositoryPhaseReady, rr.Status.Phase) // ResticIdentifier should remain empty for kopia assert.Empty(t, rr.Spec.ResticIdentifier) }) - - // Test for empty repository type (defaults to restic) - t.Run("empty repository type", func(t *testing.T) { - rr := mockBackupRepositoryCR() - rr.Spec.BackupStorageLocation = "default" - rr.Spec.ResticIdentifier = "fake-identifier" - rr.Spec.VolumeNamespace = "volume-ns-1" - // Deliberately leave RepositoryType empty - reconciler := mockBackupRepoReconciler(t, "PrepareRepo", rr, nil) - err := reconciler.Client.Create(t.Context(), rr) - require.NoError(t, err) - location := velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Config: map[string]string{"resticRepoPrefix": "s3:test.amazonaws.com/bucket/restic"}, - }, - ObjectMeta: metav1.ObjectMeta{ - Namespace: velerov1api.DefaultNamespace, - Name: rr.Spec.BackupStorageLocation, - }, - } - - _, err = reconciler.checkNotReadyRepo(t.Context(), rr, &location, reconciler.logger) - require.NoError(t, err) - assert.Equal(t, velerov1api.BackupRepositoryPhaseReady, rr.Status.Phase) - assert.Equal(t, "s3:test.amazonaws.com/bucket/restic/volume-ns-1", rr.Spec.ResticIdentifier) - }) } func startMaintenanceJobFail(client.Client, context.Context, *velerov1api.BackupRepository, string, logrus.Level, *logging.FormatFlag, logrus.FieldLogger) (string, error) { @@ -463,17 +402,8 @@ func TestInitializeRepo(t *testing.T) { reconciler := mockBackupRepoReconciler(t, "PrepareRepo", rr, nil) err := reconciler.Client.Create(t.Context(), rr) require.NoError(t, err) - location := velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Config: map[string]string{"resticRepoPrefix": "s3:test.amazonaws.com/bucket/restic"}, - }, - ObjectMeta: metav1.ObjectMeta{ - Namespace: velerov1api.DefaultNamespace, - Name: rr.Spec.BackupStorageLocation, - }, - } - err = reconciler.initializeRepo(t.Context(), rr, &location, reconciler.logger) + err = reconciler.initializeRepo(t.Context(), rr, reconciler.logger) require.NoError(t, err) assert.Equal(t, velerov1api.BackupRepositoryPhaseReady, rr.Status.Phase) } @@ -999,6 +929,8 @@ func TestUpdateRepoMaintenanceHistory(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { + maintenanceStatusQueueLength = 3 + updateRepoMaintenanceHistory(test.backupRepo, test.result, &metav1.Time{Time: standardTime}, &metav1.Time{Time: standardTime.Add(time.Hour)}, "fake-message-0") for at := range test.backupRepo.Status.RecentMaintenance { @@ -1494,7 +1426,7 @@ func TestDeleteOldMaintenanceJobWithConfigMap(t *testing.T) { MaintenanceFrequency: metav1.Duration{Duration: testMaintenanceFrequency}, BackupStorageLocation: "default", VolumeNamespace: "test-ns", - RepositoryType: "restic", + RepositoryType: "kopia", }, Status: velerov1api.BackupRepositoryStatus{ Phase: velerov1api.BackupRepositoryPhaseReady, @@ -1531,7 +1463,7 @@ func TestDeleteOldMaintenanceJobWithConfigMap(t *testing.T) { MaintenanceFrequency: metav1.Duration{Duration: testMaintenanceFrequency}, BackupStorageLocation: "default", VolumeNamespace: "test-ns", - RepositoryType: "restic", + RepositoryType: "kopia", }, Status: velerov1api.BackupRepositoryStatus{ Phase: velerov1api.BackupRepositoryPhaseReady, @@ -1550,8 +1482,8 @@ func TestDeleteOldMaintenanceJobWithConfigMap(t *testing.T) { Name: "repo-maintenance-job-config", }, Data: map[string]string{ - "global": `{"keepLatestMaintenanceJobs": 5}`, - "test-ns-default-restic": `{"keepLatestMaintenanceJobs": 2}`, + "global": `{"keepLatestMaintenanceJobs": 5}`, + "test-ns-default-kopia": `{"keepLatestMaintenanceJobs": 2}`, }, }, }, @@ -1605,58 +1537,6 @@ func TestInitializeRepoWithRepositoryTypes(t *testing.T) { corev1api.AddToScheme(scheme) velerov1api.AddToScheme(scheme) - // Test for restic repository - t.Run("restic repository", func(t *testing.T) { - rr := mockBackupRepositoryCR() - rr.Spec.BackupStorageLocation = "default" - rr.Spec.VolumeNamespace = "volume-ns-1" - rr.Spec.RepositoryType = velerov1api.BackupRepositoryTypeRestic - - location := &velerov1api.BackupStorageLocation{ - ObjectMeta: metav1.ObjectMeta{ - Namespace: velerov1api.DefaultNamespace, - Name: "default", - }, - Spec: velerov1api.BackupStorageLocationSpec{ - Provider: "aws", - StorageType: velerov1api.StorageType{ - ObjectStorage: &velerov1api.ObjectStorageLocation{ - Bucket: "test-bucket", - Prefix: "test-prefix", - }, - }, - Config: map[string]string{ - "region": "us-east-1", - }, - }, - } - - fakeClient := clientFake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(rr, location).Build() - mgr := &repomokes.Manager{} - mgr.On("PrepareRepo", rr).Return(nil) - - reconciler := NewBackupRepoReconciler( - velerov1api.DefaultNamespace, - velerotest.NewLogger(), - fakeClient, - mgr, - testMaintenanceFrequency, - "", - "", - logrus.InfoLevel, - nil, - nil, - ) - - err := reconciler.initializeRepo(t.Context(), rr, location, reconciler.logger) - require.NoError(t, err) - - // Verify ResticIdentifier is set for restic - assert.NotEmpty(t, rr.Spec.ResticIdentifier) - assert.Contains(t, rr.Spec.ResticIdentifier, "volume-ns-1") - assert.Equal(t, velerov1api.BackupRepositoryPhaseReady, rr.Status.Phase) - }) - // Test for kopia repository t.Run("kopia repository", func(t *testing.T) { rr := mockBackupRepositoryCR() @@ -1700,65 +1580,13 @@ func TestInitializeRepoWithRepositoryTypes(t *testing.T) { nil, ) - err := reconciler.initializeRepo(t.Context(), rr, location, reconciler.logger) + err := reconciler.initializeRepo(t.Context(), rr, reconciler.logger) require.NoError(t, err) // Verify ResticIdentifier is NOT set for kopia assert.Empty(t, rr.Spec.ResticIdentifier) assert.Equal(t, velerov1api.BackupRepositoryPhaseReady, rr.Status.Phase) }) - - // Test for empty repository type (defaults to restic) - t.Run("empty repository type", func(t *testing.T) { - rr := mockBackupRepositoryCR() - rr.Spec.BackupStorageLocation = "default" - rr.Spec.VolumeNamespace = "volume-ns-1" - // Leave RepositoryType empty - - location := &velerov1api.BackupStorageLocation{ - ObjectMeta: metav1.ObjectMeta{ - Namespace: velerov1api.DefaultNamespace, - Name: "default", - }, - Spec: velerov1api.BackupStorageLocationSpec{ - Provider: "aws", - StorageType: velerov1api.StorageType{ - ObjectStorage: &velerov1api.ObjectStorageLocation{ - Bucket: "test-bucket", - Prefix: "test-prefix", - }, - }, - Config: map[string]string{ - "region": "us-east-1", - }, - }, - } - - fakeClient := clientFake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(rr, location).Build() - mgr := &repomokes.Manager{} - mgr.On("PrepareRepo", rr).Return(nil) - - reconciler := NewBackupRepoReconciler( - velerov1api.DefaultNamespace, - velerotest.NewLogger(), - fakeClient, - mgr, - testMaintenanceFrequency, - "", - "", - logrus.InfoLevel, - nil, - nil, - ) - - err := reconciler.initializeRepo(t.Context(), rr, location, reconciler.logger) - require.NoError(t, err) - - // Verify ResticIdentifier is set when type is empty (defaults to restic) - assert.NotEmpty(t, rr.Spec.ResticIdentifier) - assert.Contains(t, rr.Spec.ResticIdentifier, "volume-ns-1") - assert.Equal(t, velerov1api.BackupRepositoryPhaseReady, rr.Status.Phase) - }) } func TestRepoMaintenanceMetricsRecording(t *testing.T) { diff --git a/pkg/controller/pod_volume_restore_controller_legacy.go b/pkg/controller/pod_volume_restore_controller_legacy.go index 731b70db9..9ddececf5 100644 --- a/pkg/controller/pod_volume_restore_controller_legacy.go +++ b/pkg/controller/pod_volume_restore_controller_legacy.go @@ -360,5 +360,5 @@ func (c *PodVolumeRestoreReconcilerLegacy) closeDataPath(ctx context.Context, pv } func IsLegacyPVR(pvr *velerov1api.PodVolumeRestore) bool { - return pvr.Spec.UploaderType == uploader.ResticType + return pvr.Spec.UploaderType == "restic" } diff --git a/pkg/controller/restore_controller.go b/pkg/controller/restore_controller.go index 208a3ddca..469951f27 100644 --- a/pkg/controller/restore_controller.go +++ b/pkg/controller/restore_controller.go @@ -529,6 +529,7 @@ func (r *restoreReconciler) runValidatedRestore(restore *api.Restore, info backu LabelSelector: labels.Set(map[string]string{ api.BackupNameLabel: label.GetValidName(restore.Spec.BackupName), }).AsSelector(), + Namespace: restore.Namespace, } podVolumeBackupList := &api.PodVolumeBackupList{} diff --git a/pkg/controller/restore_controller_test.go b/pkg/controller/restore_controller_test.go index 3acc03d2a..b013ee64d 100644 --- a/pkg/controller/restore_controller_test.go +++ b/pkg/controller/restore_controller_test.go @@ -238,6 +238,8 @@ func TestRestoreReconcile(t *testing.T) { expectedFinalPhase string addValidFinalizer bool emptyVolumeInfo bool + podVolumeBackups []*velerov1api.PodVolumeBackup + expectedPVBCount int }{ { name: "restore with both namespace in both includedNamespaces and excludedNamespaces fails validation", @@ -357,6 +359,22 @@ func TestRestoreReconcile(t *testing.T) { expectedCompletedTime: ×tamp, expectedRestorerCall: NewRestore("foo", "bar", "backup-1", "ns-1", "", velerov1api.RestorePhaseInProgress).Result(), }, + { + name: "valid restore gets executed and only includes pod volume backups from restore namespace", + location: defaultStorageLocation, + restore: NewRestore("foo", "bar2", "backup-1", "ns-1", "", velerov1api.RestorePhaseNew).Result(), + backup: defaultBackup().StorageLocation("default").Result(), + podVolumeBackups: []*velerov1api.PodVolumeBackup{ + builder.ForPodVolumeBackup("foo", "pvb-1").ObjectMeta(builder.WithLabels(velerov1api.BackupNameLabel, "backup-1")).Result(), + builder.ForPodVolumeBackup("other-ns", "pvb-2").ObjectMeta(builder.WithLabels(velerov1api.BackupNameLabel, "backup-1")).Result(), + }, + expectedPVBCount: 1, + expectedErr: false, + expectedPhase: string(velerov1api.RestorePhaseInProgress), + expectedStartTime: ×tamp, + expectedCompletedTime: ×tamp, + expectedRestorerCall: NewRestore("foo", "bar2", "backup-1", "ns-1", "", velerov1api.RestorePhaseInProgress).Result(), + }, { name: "restoration of nodes is not supported", location: defaultStorageLocation, @@ -501,6 +519,13 @@ func TestRestoreReconcile(t *testing.T) { defaultStorageLocation.ObjectMeta.ResourceVersion = "" }() + if test.podVolumeBackups != nil { + for _, pvb := range test.podVolumeBackups { + err := fakeClient.Create(t.Context(), pvb) + require.NoError(t, err) + } + } + r := NewRestoreReconciler( t.Context(), velerov1api.DefaultNamespace, @@ -670,6 +695,10 @@ func TestRestoreReconcile(t *testing.T) { // the mock stores the pointer, which gets modified after assert.Equal(t, test.expectedRestorerCall.Spec, restorer.calledWithArg.Spec) assert.Equal(t, test.expectedRestorerCall.Status.Phase, restorer.calledWithArg.Status.Phase) + + if test.podVolumeBackups != nil { + assert.Len(t, restorer.calledWithPVBs, test.expectedPVBCount) + } }) } } @@ -1021,8 +1050,9 @@ func NewRestore(ns, name, backup, includeNS, includeResource string, phase veler type fakeRestorer struct { mock.Mock - calledWithArg velerov1api.Restore - kbClient client.Client + calledWithArg velerov1api.Restore + calledWithPVBs []*velerov1api.PodVolumeBackup + kbClient client.Client } func (r *fakeRestorer) Restore( @@ -1045,6 +1075,7 @@ func (r *fakeRestorer) RestoreWithResolvers(req *pkgrestore.Request, r.kbClient, volumeSnapshotterGetter) r.calledWithArg = *req.Restore + r.calledWithPVBs = req.PodVolumeBackups return res.Get(0).(results.Result), res.Get(1).(results.Result) } diff --git a/pkg/controller/restore_finalizer_controller.go b/pkg/controller/restore_finalizer_controller.go index 0061bdf45..f82216bc3 100644 --- a/pkg/controller/restore_finalizer_controller.go +++ b/pkg/controller/restore_finalizer_controller.go @@ -22,6 +22,8 @@ import ( "sync" "time" + volumegroupsnapshotv1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" + snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" corev1api "k8s.io/api/core/v1" @@ -43,6 +45,7 @@ import ( "github.com/vmware-tanzu/velero/pkg/persistence" "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" "github.com/vmware-tanzu/velero/pkg/util/results" ) @@ -291,13 +294,16 @@ type finalizerContext struct { resourceTimeout time.Duration } -func (ctx *finalizerContext) execute() (results.Result, results.Result) { //nolint:unparam //temporarily ignore the lint report: result 0 is always nil (unparam) +func (ctx *finalizerContext) execute() (results.Result, results.Result) { warnings, errs := results.Result{}, results.Result{} // implement finalization tasks pdpErrs := ctx.patchDynamicPVWithVolumeInfo() errs.Merge(&pdpErrs) + vgscWarnings := ctx.cleanupStubVGSC() + warnings.Merge(&vgscWarnings) + rehErrs := ctx.WaitRestoreExecHook() errs.Merge(&rehErrs) @@ -443,6 +449,93 @@ func (ctx *finalizerContext) patchDynamicPVWithVolumeInfo() (errs results.Result return errs } +// cleanupStubVGSC deletes stub VolumeGroupSnapshotContent objects that were +// created during restore to satisfy CSI controller validation. These stubs are +// labeled with velero.io/restore-name for identification. +// Before deleting each VGSC, it waits for all related VolumeSnapshotContents +// to become ReadyToUse, since the CSI controller needs the VGSC during VSC reconciliation. +func (ctx *finalizerContext) cleanupStubVGSC() (warnings results.Result) { + ctx.logger.Info("cleaning up stub VolumeGroupSnapshotContents") + + vgscList := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentList{} + err := ctx.crClient.List( + context.Background(), + vgscList, + client.MatchingLabels{velerov1api.RestoreNameLabel: ctx.restore.Name}, + ) + if err != nil { + // If the CRD is not installed, listing will fail. This is expected + // on clusters without VolumeGroupSnapshot support, so treat as warning. + ctx.logger.WithError(err).Warn("failed to list stub VolumeGroupSnapshotContents, skipping cleanup") + warnings.Add("cluster", errors.Wrap(err, "failed to list stub VolumeGroupSnapshotContents")) + return warnings + } + + if len(vgscList.Items) == 0 { + ctx.logger.Info("no stub VolumeGroupSnapshotContents to clean up") + return warnings + } + + for i := range vgscList.Items { + vgsc := &vgscList.Items[i] + log := ctx.logger.WithField("vgsc", vgsc.Name) + + // Collect the snapshot handles associated with this VGSC + snapshotHandles := map[string]bool{} + if vgsc.Spec.Source.GroupSnapshotHandles != nil { + for _, h := range vgsc.Spec.Source.GroupSnapshotHandles.VolumeSnapshotHandles { + snapshotHandles[h] = true + } + } + + if len(snapshotHandles) > 0 { + // Wait for related VSCs to become ReadyToUse before deleting the VGSC + log.Infof("waiting for %d related VolumeSnapshotContents to become ReadyToUse", len(snapshotHandles)) + err := wait.PollUntilContextTimeout(context.Background(), 10*time.Second, ctx.resourceTimeout, true, func(context.Context) (bool, error) { + vscList := &snapshotv1api.VolumeSnapshotContentList{} + if err := ctx.crClient.List(context.Background(), vscList, client.MatchingLabels{velerov1api.RestoreNameLabel: ctx.restore.Name}); err != nil { + log.WithError(err).Warn("failed to list VolumeSnapshotContents") + return false, nil + } + + for j := range vscList.Items { + vsc := &vscList.Items[j] + if vsc.Spec.Source.SnapshotHandle == nil { + continue + } + if !snapshotHandles[*vsc.Spec.Source.SnapshotHandle] { + continue + } + // This VSC is related to our VGSC + if vsc.Status == nil || !boolptr.IsSetToTrue(vsc.Status.ReadyToUse) { + log.Debugf("VolumeSnapshotContent %s not yet ReadyToUse", vsc.Name) + return false, nil + } + } + return true, nil + }) + if err != nil { + log.WithError(err).Warn("timed out waiting for related VolumeSnapshotContents to become ReadyToUse, proceeding with VGSC deletion") + warnings.Add("cluster", errors.Wrapf(err, "timed out waiting for VSCs related to VGSC %s", vgsc.Name)) + } + } + + log.Info("deleting stub VolumeGroupSnapshotContent") + if err := ctx.crClient.Delete(context.Background(), vgsc); err != nil { + if apierrors.IsNotFound(err) { + log.Info("stub VolumeGroupSnapshotContent already deleted") + continue + } + log.WithError(err).Warn("failed to delete stub VolumeGroupSnapshotContent") + warnings.Add("cluster", errors.Wrapf(err, "failed to delete stub VolumeGroupSnapshotContent %s", vgsc.Name)) + } else { + log.Info("deleted stub VolumeGroupSnapshotContent") + } + } + + return warnings +} + func needPatch(newPV *corev1api.PersistentVolume, pvInfo *volume.PVInfo) bool { if newPV.Spec.PersistentVolumeReclaimPolicy != corev1api.PersistentVolumeReclaimPolicy(pvInfo.ReclaimPolicy) { return true diff --git a/pkg/controller/restore_finalizer_controller_test.go b/pkg/controller/restore_finalizer_controller_test.go index 56366a360..6fb5ba303 100644 --- a/pkg/controller/restore_finalizer_controller_test.go +++ b/pkg/controller/restore_finalizer_controller_test.go @@ -22,6 +22,8 @@ import ( "testing" "time" + volumegroupsnapshotv1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" + snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" @@ -45,6 +47,7 @@ import ( pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks" "github.com/vmware-tanzu/velero/pkg/plugin/velero" velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" pkgUtilKubeMocks "github.com/vmware-tanzu/velero/pkg/util/kube/mocks" "github.com/vmware-tanzu/velero/pkg/util/results" ) @@ -739,3 +742,253 @@ func TestRestoreOperationList(t *testing.T) { }) } } + +func TestCleanupStubVGSC(t *testing.T) { + snapshotHandle1 := "snap-handle-1" + snapshotHandle2 := "snap-handle-2" + + tests := []struct { + name string + restore *velerov1api.Restore + existingVGSCs []*volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent + existingVSCs []*snapshotv1api.VolumeSnapshotContent + expectedRemaining int + expectedWarnings bool + }{ + { + name: "no stub VGSCs to clean up", + restore: builder.ForRestore(velerov1api.DefaultNamespace, "restore-1").Result(), + existingVGSCs: nil, + expectedRemaining: 0, + expectedWarnings: false, + }, + { + name: "single stub VGSC deleted after VSCs are ready", + restore: builder.ForRestore(velerov1api.DefaultNamespace, "restore-1").Result(), + existingVGSCs: []*volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "vgsc-stub-1", + Labels: map[string]string{ + velerov1api.RestoreNameLabel: "restore-1", + }, + }, + Spec: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSpec{ + Driver: "rbd.csi.ceph.com", + Source: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSource{ + GroupSnapshotHandles: &volumegroupsnapshotv1beta2.GroupSnapshotHandles{ + VolumeGroupSnapshotHandle: "vgs-handle-1", + VolumeSnapshotHandles: []string{snapshotHandle1}, + }, + }, + }, + }, + }, + existingVSCs: []*snapshotv1api.VolumeSnapshotContent{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "vsc-1", + Labels: map[string]string{ + velerov1api.RestoreNameLabel: "restore-1", + }, + }, + Spec: snapshotv1api.VolumeSnapshotContentSpec{ + Driver: "rbd.csi.ceph.com", + DeletionPolicy: snapshotv1api.VolumeSnapshotContentRetain, + Source: snapshotv1api.VolumeSnapshotContentSource{ + SnapshotHandle: &snapshotHandle1, + }, + VolumeSnapshotRef: corev1api.ObjectReference{ + Name: "vs-1", + Namespace: "ns-1", + }, + }, + Status: &snapshotv1api.VolumeSnapshotContentStatus{ + ReadyToUse: boolptr.True(), + }, + }, + }, + expectedRemaining: 0, + expectedWarnings: false, + }, + { + name: "multiple stub VGSCs deleted", + restore: builder.ForRestore(velerov1api.DefaultNamespace, "restore-1").Result(), + existingVGSCs: []*volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "vgsc-stub-1", + Labels: map[string]string{ + velerov1api.RestoreNameLabel: "restore-1", + }, + }, + Spec: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSpec{ + Driver: "rbd.csi.ceph.com", + Source: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSource{ + GroupSnapshotHandles: &volumegroupsnapshotv1beta2.GroupSnapshotHandles{ + VolumeGroupSnapshotHandle: "vgs-handle-1", + VolumeSnapshotHandles: []string{snapshotHandle1}, + }, + }, + }, + }, + { + ObjectMeta: metav1.ObjectMeta{ + Name: "vgsc-stub-2", + Labels: map[string]string{ + velerov1api.RestoreNameLabel: "restore-1", + }, + }, + Spec: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSpec{ + Driver: "rbd.csi.ceph.com", + Source: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSource{ + GroupSnapshotHandles: &volumegroupsnapshotv1beta2.GroupSnapshotHandles{ + VolumeGroupSnapshotHandle: "vgs-handle-2", + VolumeSnapshotHandles: []string{snapshotHandle2}, + }, + }, + }, + }, + }, + existingVSCs: []*snapshotv1api.VolumeSnapshotContent{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "vsc-1", + Labels: map[string]string{ + velerov1api.RestoreNameLabel: "restore-1", + }, + }, + Spec: snapshotv1api.VolumeSnapshotContentSpec{ + Driver: "rbd.csi.ceph.com", + DeletionPolicy: snapshotv1api.VolumeSnapshotContentRetain, + Source: snapshotv1api.VolumeSnapshotContentSource{ + SnapshotHandle: &snapshotHandle1, + }, + VolumeSnapshotRef: corev1api.ObjectReference{ + Name: "vs-1", + Namespace: "ns-1", + }, + }, + Status: &snapshotv1api.VolumeSnapshotContentStatus{ + ReadyToUse: boolptr.True(), + }, + }, + { + ObjectMeta: metav1.ObjectMeta{ + Name: "vsc-2", + Labels: map[string]string{ + velerov1api.RestoreNameLabel: "restore-1", + }, + }, + Spec: snapshotv1api.VolumeSnapshotContentSpec{ + Driver: "rbd.csi.ceph.com", + DeletionPolicy: snapshotv1api.VolumeSnapshotContentRetain, + Source: snapshotv1api.VolumeSnapshotContentSource{ + SnapshotHandle: &snapshotHandle2, + }, + VolumeSnapshotRef: corev1api.ObjectReference{ + Name: "vs-2", + Namespace: "ns-1", + }, + }, + Status: &snapshotv1api.VolumeSnapshotContentStatus{ + ReadyToUse: boolptr.True(), + }, + }, + }, + expectedRemaining: 0, + expectedWarnings: false, + }, + { + name: "VGSCs from different restore are not deleted", + restore: builder.ForRestore(velerov1api.DefaultNamespace, "restore-1").Result(), + existingVGSCs: []*volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "vgsc-stub-mine", + Labels: map[string]string{ + velerov1api.RestoreNameLabel: "restore-1", + }, + }, + Spec: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSpec{ + Driver: "rbd.csi.ceph.com", + Source: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSource{}, + }, + }, + { + ObjectMeta: metav1.ObjectMeta{ + Name: "vgsc-stub-other", + Labels: map[string]string{ + velerov1api.RestoreNameLabel: "restore-2", + }, + }, + Spec: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSpec{ + Driver: "rbd.csi.ceph.com", + Source: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSource{}, + }, + }, + }, + expectedRemaining: 1, + expectedWarnings: false, + }, + { + name: "VGSC deleted even when no snapshot handles in spec", + restore: builder.ForRestore(velerov1api.DefaultNamespace, "restore-1").Result(), + existingVGSCs: []*volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "vgsc-stub-empty", + Labels: map[string]string{ + velerov1api.RestoreNameLabel: "restore-1", + }, + }, + Spec: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSpec{ + Driver: "rbd.csi.ceph.com", + Source: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSource{}, + }, + }, + }, + expectedRemaining: 0, + expectedWarnings: false, + }, + } + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + fakeClient := velerotest.NewFakeControllerRuntimeClientBuilder(t).Build() + logger := velerotest.NewLogger() + + ctx := &finalizerContext{ + logger: logger, + crClient: fakeClient, + restore: tc.restore, + resourceTimeout: 10 * time.Second, + } + + for _, vgsc := range tc.existingVGSCs { + require.NoError(t, fakeClient.Create(t.Context(), vgsc)) + } + for _, vsc := range tc.existingVSCs { + require.NoError(t, fakeClient.Create(t.Context(), vsc)) + } + + warnings := ctx.cleanupStubVGSC() + + if tc.expectedWarnings { + assert.False(t, warnings.IsEmpty()) + } else { + assert.True(t, warnings.IsEmpty(), "expected no warnings") + } + + remainingList := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentList{} + require.NoError(t, fakeClient.List(t.Context(), remainingList)) + assert.Len(t, remainingList.Items, tc.expectedRemaining) + + // Verify remaining VGSCs don't belong to this restore + for _, remaining := range remainingList.Items { + assert.NotEqual(t, tc.restore.Name, remaining.Labels[velerov1api.RestoreNameLabel], + "VGSC %s should have been deleted", remaining.Name) + } + }) + } +} diff --git a/pkg/datapath/file_system.go b/pkg/datapath/file_system.go index f0f84acdb..61fac1e47 100644 --- a/pkg/datapath/file_system.go +++ b/pkg/datapath/file_system.go @@ -251,11 +251,9 @@ func (fs *fileSystemBR) boostRepoConnect(ctx context.Context, repositoryType str if err := repoProvider.NewUnifiedRepoProvider(*credentialGetter, repositoryType, fs.log).BoostRepoConnect(ctx, repoProvider.RepoParam{BackupLocation: fs.backupLocation, BackupRepo: fs.backupRepo, CacheDir: cacheDir}); err != nil { return err } - } else { - if err := repoProvider.NewResticRepositoryProvider(*credentialGetter, filesystem.NewFileSystem(), fs.log).BoostRepoConnect(ctx, repoProvider.RepoParam{BackupLocation: fs.backupLocation, BackupRepo: fs.backupRepo}); err != nil { - return err - } + + return nil } - return nil + return errors.Errorf("error getting provider for repo %s", repositoryType) } diff --git a/pkg/podvolume/backupper.go b/pkg/podvolume/backupper.go index 1747f1b33..6b534d5ed 100644 --- a/pkg/podvolume/backupper.go +++ b/pkg/podvolume/backupper.go @@ -272,7 +272,7 @@ func (b *backupper) BackupPodVolumes(backup *velerov1api.Backup, pod *corev1api. return nil, pvcSummary, []error{err} } - repositoryType := funcGetRepositoryType(b.uploaderType) + repositoryType := funcGetRepositoryType() if repositoryType == "" { err := errors.Errorf("empty repository type, uploader %s", b.uploaderType) skipAllPodVolumes(pod, volumesToBackup, err, pvcSummary, log) @@ -305,11 +305,6 @@ func (b *backupper) BackupPodVolumes(backup *velerov1api.Backup, pod *corev1api. } } - repoIdentifier := "" - if repositoryType == velerov1api.BackupRepositoryTypeRestic { - repoIdentifier = repo.Spec.ResticIdentifier - } - for _, volumeName := range volumesToBackup { volume, ok := podVolumes[volumeName] if !ok { @@ -366,7 +361,7 @@ func (b *backupper) BackupPodVolumes(backup *velerov1api.Backup, pod *corev1api. continue } - volumeBackup := newPodVolumeBackup(backup, pod, volume, repoIdentifier, b.uploaderType, pvc) + volumeBackup := newPodVolumeBackup(backup, pod, volume, "", b.uploaderType, pvc) // the PVB must be added into the indexer before creating it in API server otherwise unexpected behavior may happen: // the PVB may be handled very quickly by the controller and the informer handler will insert the PVB before "b.pvbIndexer.Add(volumeBackup)" runs, // this causes the PVB inserted by "b.pvbIndexer.Add(volumeBackup)" overrides the PVB in the indexer while the PVB inserted by "b.pvbIndexer.Add(volumeBackup)" diff --git a/pkg/podvolume/backupper_test.go b/pkg/podvolume/backupper_test.go index 846f65796..f7686978a 100644 --- a/pkg/podvolume/backupper_test.go +++ b/pkg/podvolume/backupper_test.go @@ -580,7 +580,7 @@ func TestBackupPodVolumes(t *testing.T) { require.NoError(t, err) if test.mockGetRepositoryType { - funcGetRepositoryType = func(string) string { return "" } + funcGetRepositoryType = func() string { return "" } } else { funcGetRepositoryType = getRepositoryType } diff --git a/pkg/podvolume/restorer.go b/pkg/podvolume/restorer.go index 47219ae99..ce662d5de 100644 --- a/pkg/podvolume/restorer.go +++ b/pkg/podvolume/restorer.go @@ -166,11 +166,6 @@ func (r *restorer) RestorePodVolumes(data RestoreData, tracker *volume.RestoreVo podVolumes[podVolume.Name] = podVolume } - repoIdentifier := "" - if repositoryType == velerov1api.BackupRepositoryTypeRestic { - repoIdentifier = repo.Spec.ResticIdentifier - } - for volume, backupInfo := range volumesToRestore { volumeObj, ok := podVolumes[volume] var pvc *corev1api.PersistentVolumeClaim @@ -185,7 +180,7 @@ func (r *restorer) RestorePodVolumes(data RestoreData, tracker *volume.RestoreVo } } - volumeRestore := newPodVolumeRestore(data.Restore, data.Pod, data.BackupLocation, volume, backupInfo.snapshotID, backupInfo.snapshotSize, repoIdentifier, backupInfo.uploaderType, data.SourceNamespace, pvc) + volumeRestore := newPodVolumeRestore(data.Restore, data.Pod, data.BackupLocation, volume, backupInfo.snapshotID, backupInfo.snapshotSize, "", backupInfo.uploaderType, data.SourceNamespace, pvc) if err := veleroclient.CreateRetryGenerateName(r.crClient, r.ctx, volumeRestore); err != nil { errs = append(errs, errors.WithStack(err)) continue diff --git a/pkg/podvolume/restorer_test.go b/pkg/podvolume/restorer_test.go index 36a1fc034..e10146578 100644 --- a/pkg/podvolume/restorer_test.go +++ b/pkg/podvolume/restorer_test.go @@ -204,24 +204,6 @@ func TestRestorePodVolumes(t *testing.T) { }, }, }, - { - name: "get repository type fail", - pvbs: []*velerov1api.PodVolumeBackup{ - createPVBObj(true, true, 1, "restic"), - createPVBObj(true, true, 2, "kopia"), - }, - kubeClientObj: []runtime.Object{ - createNodeAgentDaemonset(), - }, - restoredPod: createPodObj(false, false, false, 2), - sourceNamespace: "fake-ns", - errs: []expectError{ - { - err: "multiple repository type in one backup", - prefixOnly: true, - }, - }, - }, { name: "ensure repo fail", pvbs: []*velerov1api.PodVolumeBackup{ diff --git a/pkg/podvolume/util.go b/pkg/podvolume/util.go index 1864e9615..bb827c732 100644 --- a/pkg/podvolume/util.go +++ b/pkg/podvolume/util.go @@ -62,12 +62,12 @@ func GetVolumeBackupsForPod(podVolumeBackups []*velerov1api.PodVolumeBackup, pod // GetPvbRepositoryType returns the repositoryType according to the PVB information func GetPvbRepositoryType(pvb *velerov1api.PodVolumeBackup) string { - return getRepositoryType(pvb.Spec.UploaderType) + return getRepositoryType() } // GetPvrRepositoryType returns the repositoryType according to the PVR information func GetPvrRepositoryType(pvr *velerov1api.PodVolumeRestore) string { - return getRepositoryType(pvr.Spec.UploaderType) + return getRepositoryType() } // getVolumeBackupInfoForPod returns a map, of volume name -> VolumeBackupInfo, @@ -97,7 +97,7 @@ func getVolumeBackupInfoForPod(podVolumeBackups []*velerov1api.PodVolumeBackup, snapshotID: pvb.Status.SnapshotID, snapshotSize: pvb.Status.Progress.TotalBytes, uploaderType: getUploaderTypeOrDefault(pvb.Spec.UploaderType), - repositoryType: getRepositoryType(pvb.Spec.UploaderType), + repositoryType: getRepositoryType(), } } @@ -111,7 +111,7 @@ func getVolumeBackupInfoForPod(podVolumeBackups []*velerov1api.PodVolumeBackup, } for k, v := range fromAnnntation { - volumes[k] = volumeBackupInfo{v, 0, uploader.ResticType, velerov1api.BackupRepositoryTypeRestic} + volumes[k] = volumeBackupInfo{v, 0, uploader.KopiaType, velerov1api.BackupRepositoryTypeKopia} } return volumes @@ -135,7 +135,7 @@ func GetSnapshotIdentifier(podVolumeBackups *velerov1api.PodVolumeBackupList) ma VolumeNamespace: item.Spec.Pod.Namespace, BackupStorageLocation: item.Spec.BackupStorageLocation, SnapshotID: item.Status.SnapshotID, - RepositoryType: getRepositoryType(item.Spec.UploaderType), + RepositoryType: getRepositoryType(), UploaderType: item.Spec.UploaderType, Source: item.Status.Path, RepoIdentifier: item.Spec.RepoIdentifier, @@ -164,27 +164,14 @@ func getUploaderTypeOrDefault(uploaderType string) string { if uploaderType != "" { return uploaderType } - return uploader.ResticType + return uploader.KopiaType } -// getRepositoryType returns the hardcode repositoryType for different backup methods - Restic or Kopia,uploaderType -// indicates the method. -// For Restic backup method, it is always hardcode to BackupRepositoryTypeRestic, never changed. -// For Kopia backup method, this means we hardcode repositoryType as BackupRepositoryTypeKopia for Unified Repo, -// at present (Kopia backup method is using Unified Repo). However, it doesn't mean we could deduce repositoryType -// from uploaderType for Unified Repo. -// TODO: post v1.10, refactor this function for Kopia backup method. In future, when we have multiple implementations of -// Unified Repo (besides Kopia), we will add the repositoryType to BSL, because by then, we are not able to hardcode -// the repositoryType to BackupRepositoryTypeKopia for Unified Repo. -func getRepositoryType(uploaderType string) string { - switch uploaderType { - case "", uploader.ResticType: - return velerov1api.BackupRepositoryTypeRestic - case uploader.KopiaType: - return velerov1api.BackupRepositoryTypeKopia - default: - return "" - } +// getRepositoryType returns the hardcode repositoryType. +// TODO: In future, when we have multiple implementations of Unified Repo (besides Kopia), we will add the repositoryType to BSL, +// because by then, we are not able to hardcode the repositoryType to BackupRepositoryTypeKopia for Unified Repo. +func getRepositoryType() string { + return velerov1api.BackupRepositoryTypeKopia } func isPVBMatchPod(pvb *velerov1api.PodVolumeBackup, podName string, namespace string) bool { diff --git a/pkg/repository/config/config.go b/pkg/repository/config/config.go index 46a5478e6..04761e95b 100644 --- a/pkg/repository/config/config.go +++ b/pkg/repository/config/config.go @@ -17,14 +17,7 @@ limitations under the License. package config import ( - "fmt" - "path" "strings" - - "github.com/pkg/errors" - - velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" - "github.com/vmware-tanzu/velero/pkg/persistence" ) type BackendType string @@ -40,56 +33,6 @@ const ( CredentialsFileKey = "credentialsFile" ) -// this func is assigned to a package-level variable so it can be -// replaced when unit-testing -var getAWSBucketRegion = GetAWSBucketRegion - -// getRepoPrefix returns the prefix of the value of the --repo flag for -// restic commands, i.e. everything except the "/". -func getRepoPrefix(location *velerov1api.BackupStorageLocation) (string, error) { - var bucket, prefix string - - if location.Spec.ObjectStorage != nil { - layout := persistence.NewObjectStoreLayout(location.Spec.ObjectStorage.Prefix) - - bucket = location.Spec.ObjectStorage.Bucket - prefix = layout.GetResticDir() - } - - backendType := GetBackendType(location.Spec.Provider, location.Spec.Config) - - if repoPrefix := location.Spec.Config["resticRepoPrefix"]; repoPrefix != "" { - return repoPrefix, nil - } - - switch backendType { - case AWSBackend: - var url string - // non-AWS, S3-compatible object store - if s3Url := location.Spec.Config["s3Url"]; s3Url != "" { - url = strings.TrimSuffix(s3Url, "/") - } else { - var err error - region := location.Spec.Config["region"] - if region == "" { - region, err = getAWSBucketRegion(bucket, location.Spec.Config) - } - if err != nil { - return "", errors.Wrapf(err, "failed to detect the region via bucket: %s", bucket) - } - url = fmt.Sprintf("s3-%s.amazonaws.com", region) - } - - return fmt.Sprintf("s3:%s/%s", url, path.Join(bucket, prefix)), nil - case AzureBackend: - return fmt.Sprintf("azure:%s:/%s", bucket, prefix), nil - case GCPBackend: - return fmt.Sprintf("gs:%s:/%s", bucket, prefix), nil - } - - return "", errors.Errorf("invalid backend type %s, provider %s", backendType, location.Spec.Provider) -} - // GetBackendType returns a backend type that is known by Velero. // If the provider doesn't indicate a known backend type, but the endpoint is // specified, Velero regards it as a S3 compatible object store and return AWSBackend as the type. @@ -111,14 +54,3 @@ func GetBackendType(provider string, config map[string]string) BackendType { func IsBackendTypeValid(backendType BackendType) bool { return (backendType == AWSBackend || backendType == AzureBackend || backendType == GCPBackend || backendType == FSBackend) } - -// GetRepoIdentifier returns the string to be used as the value of the --repo flag in -// restic commands for the given repository. -func GetRepoIdentifier(location *velerov1api.BackupStorageLocation, name string) (string, error) { - prefix, err := getRepoPrefix(location) - if err != nil { - return "", err - } - - return fmt.Sprintf("%s/%s", strings.TrimSuffix(prefix, "/"), name), nil -} diff --git a/pkg/repository/config/config_test.go b/pkg/repository/config/config_test.go deleted file mode 100644 index aac5fc9bc..000000000 --- a/pkg/repository/config/config_test.go +++ /dev/null @@ -1,261 +0,0 @@ -/* -Copyright 2018, 2019 the Velero contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package config - -import ( - "testing" - - "github.com/pkg/errors" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" -) - -func TestGetRepoIdentifier(t *testing.T) { - testCases := []struct { - name string - bsl *velerov1api.BackupStorageLocation - repoName string - getAWSBucketRegion func(s string, config map[string]string) (string, error) - expected string - expectedErr string - }{ - { - name: "error is returned if BSL uses unsupported provider and resticRepoPrefix is not set", - bsl: &velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Provider: "unsupported-provider", - StorageType: velerov1api.StorageType{ - ObjectStorage: &velerov1api.ObjectStorageLocation{ - Bucket: "bucket-2", - Prefix: "prefix-2", - }, - }, - }, - }, - repoName: "repo-1", - expectedErr: "invalid backend type velero.io/unsupported-provider, provider unsupported-provider", - }, - { - name: "resticRepoPrefix in BSL config is used if set", - bsl: &velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Provider: "custom-repo-identifier", - Config: map[string]string{ - "resticRepoPrefix": "custom:prefix:/restic", - }, - StorageType: velerov1api.StorageType{ - ObjectStorage: &velerov1api.ObjectStorageLocation{ - Bucket: "bucket", - Prefix: "prefix", - }, - }, - }, - }, - repoName: "repo-1", - expected: "custom:prefix:/restic/repo-1", - }, - { - name: "s3Url in BSL config is used", - bsl: &velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Provider: "custom-repo-identifier", - Config: map[string]string{ - "s3Url": "s3Url", - }, - StorageType: velerov1api.StorageType{ - ObjectStorage: &velerov1api.ObjectStorageLocation{ - Bucket: "bucket", - Prefix: "prefix", - }, - }, - }, - }, - repoName: "repo-1", - expected: "s3:s3Url/bucket/prefix/restic/repo-1", - }, - { - name: "s3.amazonaws.com URL format is used if region cannot be determined for AWS BSL", - bsl: &velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Provider: "aws", - StorageType: velerov1api.StorageType{ - ObjectStorage: &velerov1api.ObjectStorageLocation{ - Bucket: "bucket", - }, - }, - }, - }, - repoName: "repo-1", - getAWSBucketRegion: func(s string, config map[string]string) (string, error) { - return "", errors.New("no region found") - }, - expected: "", - expectedErr: "failed to detect the region via bucket: bucket: no region found", - }, - { - name: "s3.s3-.amazonaws.com URL format is used if region can be determined for AWS BSL", - bsl: &velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Provider: "aws", - StorageType: velerov1api.StorageType{ - ObjectStorage: &velerov1api.ObjectStorageLocation{ - Bucket: "bucket", - }, - }, - }, - }, - repoName: "repo-1", - getAWSBucketRegion: func(string, map[string]string) (string, error) { - return "eu-west-1", nil - }, - expected: "s3:s3-eu-west-1.amazonaws.com/bucket/restic/repo-1", - }, - { - name: "prefix is included in repo identifier if set for AWS BSL", - bsl: &velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Provider: "aws", - StorageType: velerov1api.StorageType{ - ObjectStorage: &velerov1api.ObjectStorageLocation{ - Bucket: "bucket", - Prefix: "prefix", - }, - }, - }, - }, - repoName: "repo-1", - getAWSBucketRegion: func(s string, config map[string]string) (string, error) { - return "eu-west-1", nil - }, - expected: "s3:s3-eu-west-1.amazonaws.com/bucket/prefix/restic/repo-1", - }, - { - name: "s3Url is used in repo identifier if set for AWS BSL", - bsl: &velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Provider: "aws", - Config: map[string]string{ - "s3Url": "alternate-url", - }, - StorageType: velerov1api.StorageType{ - ObjectStorage: &velerov1api.ObjectStorageLocation{ - Bucket: "bucket", - Prefix: "prefix", - }, - }, - }, - }, - repoName: "repo-1", - getAWSBucketRegion: func(s string, config map[string]string) (string, error) { - return "eu-west-1", nil - }, - expected: "s3:alternate-url/bucket/prefix/restic/repo-1", - }, - { - name: "region is used in repo identifier if set for AWS BSL", - bsl: &velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Provider: "aws", - Config: map[string]string{ - "region": "us-west-1", - }, - StorageType: velerov1api.StorageType{ - ObjectStorage: &velerov1api.ObjectStorageLocation{ - Bucket: "bucket", - Prefix: "prefix", - }, - }, - }, - }, - repoName: "aws-repo", - getAWSBucketRegion: func(s string, config map[string]string) (string, error) { - return "eu-west-1", nil - }, - expected: "s3:s3-us-west-1.amazonaws.com/bucket/prefix/restic/aws-repo", - }, - { - name: "trailing slash in s3Url is not included in repo identifier for AWS BSL", - bsl: &velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Provider: "aws", - Config: map[string]string{ - "s3Url": "alternate-url-with-trailing-slash/", - }, - StorageType: velerov1api.StorageType{ - ObjectStorage: &velerov1api.ObjectStorageLocation{ - Bucket: "bucket", - Prefix: "prefix", - }, - }, - }, - }, - repoName: "aws-repo", - getAWSBucketRegion: func(s string, config map[string]string) (string, error) { - return "eu-west-1", nil - }, - expected: "s3:alternate-url-with-trailing-slash/bucket/prefix/restic/aws-repo", - }, - { - name: "repo identifier includes bucket and prefix for Azure BSL", - bsl: &velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Provider: "azure", - StorageType: velerov1api.StorageType{ - ObjectStorage: &velerov1api.ObjectStorageLocation{ - Bucket: "azure-bucket", - Prefix: "azure-prefix", - }, - }, - }, - }, - repoName: "azure-repo", - expected: "azure:azure-bucket:/azure-prefix/restic/azure-repo", - }, - { - name: "repo identifier includes bucket and prefix for GCP BSL", - bsl: &velerov1api.BackupStorageLocation{ - Spec: velerov1api.BackupStorageLocationSpec{ - Provider: "gcp", - StorageType: velerov1api.StorageType{ - ObjectStorage: &velerov1api.ObjectStorageLocation{ - Bucket: "gcp-bucket", - Prefix: "gcp-prefix", - }, - }, - }, - }, - repoName: "gcp-repo", - expected: "gs:gcp-bucket:/gcp-prefix/restic/gcp-repo", - }, - } - - for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - getAWSBucketRegion = tc.getAWSBucketRegion - id, err := GetRepoIdentifier(tc.bsl, tc.repoName) - assert.Equal(t, tc.expected, id) - if tc.expectedErr == "" { - assert.NoError(t, err) - } else { - require.EqualError(t, err, tc.expectedErr) - assert.Empty(t, id) - } - }) - } -} diff --git a/pkg/repository/manager/manager.go b/pkg/repository/manager/manager.go index abe76299f..4d03931c0 100644 --- a/pkg/repository/manager/manager.go +++ b/pkg/repository/manager/manager.go @@ -109,10 +109,6 @@ func NewManager( log: log, } - mgr.providers[velerov1api.BackupRepositoryTypeRestic] = provider.NewResticRepositoryProvider(credentials.CredentialGetter{ - FromFile: credentialFileStore, - FromSecret: credentialSecretStore, - }, mgr.fileSystem, mgr.log) mgr.providers[velerov1api.BackupRepositoryTypeKopia] = provider.NewUnifiedRepoProvider(credentials.CredentialGetter{ FromFile: credentialFileStore, FromSecret: credentialSecretStore, @@ -275,8 +271,6 @@ func (m *manager) ClientSideCacheLimit(repo *velerov1api.BackupRepository) (int6 func (m *manager) getRepositoryProvider(repo *velerov1api.BackupRepository) (provider.Provider, error) { switch repo.Spec.RepositoryType { - case "", velerov1api.BackupRepositoryTypeRestic: - return m.providers[velerov1api.BackupRepositoryTypeRestic], nil case velerov1api.BackupRepositoryTypeKopia: return m.providers[velerov1api.BackupRepositoryTypeKopia], nil default: diff --git a/pkg/repository/manager/manager_test.go b/pkg/repository/manager/manager_test.go index ea38c7448..88d8db481 100644 --- a/pkg/repository/manager/manager_test.go +++ b/pkg/repository/manager/manager_test.go @@ -32,15 +32,13 @@ func TestGetRepositoryProvider(t *testing.T) { repo := &velerov1.BackupRepository{} // empty repository type - provider, err := mgr.getRepositoryProvider(repo) - require.NoError(t, err) - assert.NotNil(t, provider) + _, err := mgr.getRepositoryProvider(repo) + require.Error(t, err) - // valid repository type - repo.Spec.RepositoryType = velerov1.BackupRepositoryTypeRestic - provider, err = mgr.getRepositoryProvider(repo) - require.NoError(t, err) - assert.NotNil(t, provider) + // invalid repository type + repo.Spec.RepositoryType = "restic" + _, err = mgr.getRepositoryProvider(repo) + require.Error(t, err) // invalid repository type repo.Spec.RepositoryType = "unknown" @@ -61,6 +59,6 @@ func TestGetRepositoryConfigProvider(t *testing.T) { assert.NotNil(t, provider) // invalid repository type - _, err = mgr.getRepositoryProvider(velerov1.BackupRepositoryTypeRestic) + _, err = mgr.getRepositoryProvider("restic") require.Error(t, err) } diff --git a/pkg/repository/provider/restic.go b/pkg/repository/provider/restic.go deleted file mode 100644 index 51a46bbf1..000000000 --- a/pkg/repository/provider/restic.go +++ /dev/null @@ -1,99 +0,0 @@ -/* -Copyright the Velero contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package provider - -import ( - "context" - "strings" - "time" - - "github.com/sirupsen/logrus" - - "github.com/vmware-tanzu/velero/internal/credentials" - "github.com/vmware-tanzu/velero/pkg/repository/restic" - "github.com/vmware-tanzu/velero/pkg/util/filesystem" -) - -func NewResticRepositoryProvider(credGetter credentials.CredentialGetter, fs filesystem.Interface, log logrus.FieldLogger) Provider { - return &resticRepositoryProvider{ - svc: restic.NewRepositoryService(credGetter, fs, log), - } -} - -type resticRepositoryProvider struct { - svc *restic.RepositoryService -} - -func (r *resticRepositoryProvider) InitRepo(ctx context.Context, param RepoParam) error { - return r.svc.InitRepo(param.BackupLocation, param.BackupRepo) -} - -func (r *resticRepositoryProvider) ConnectToRepo(ctx context.Context, param RepoParam) error { - return r.svc.ConnectToRepo(param.BackupLocation, param.BackupRepo) -} - -func (r *resticRepositoryProvider) PrepareRepo(ctx context.Context, param RepoParam) error { - if err := r.ConnectToRepo(ctx, param); err != nil { - // If the repository has not yet been initialized, the error message will always include - // the following string. This is the only scenario where we should try to initialize it. - // Other errors (e.g. "already locked") should be returned as-is since the repository - // does already exist, but it can't be connected to. - if strings.Contains(err.Error(), "Is there a repository at the following location?") { - return r.InitRepo(ctx, param) - } - - return err - } - - return nil -} - -func (r *resticRepositoryProvider) BoostRepoConnect(ctx context.Context, param RepoParam) error { - return nil -} - -func (r *resticRepositoryProvider) PruneRepo(ctx context.Context, param RepoParam) error { - return r.svc.PruneRepo(param.BackupLocation, param.BackupRepo) -} - -func (r *resticRepositoryProvider) EnsureUnlockRepo(ctx context.Context, param RepoParam) error { - return r.svc.UnlockRepo(param.BackupLocation, param.BackupRepo) -} - -func (r *resticRepositoryProvider) Forget(ctx context.Context, snapshotID string, param RepoParam) error { - return r.svc.Forget(param.BackupLocation, param.BackupRepo, snapshotID) -} - -func (r *resticRepositoryProvider) BatchForget(ctx context.Context, snapshotIDs []string, param RepoParam) []error { - errs := []error{} - for _, snapshot := range snapshotIDs { - err := r.Forget(ctx, snapshot, param) - if err != nil { - errs = append(errs, err) - } - } - - return errs -} - -func (r *resticRepositoryProvider) DefaultMaintenanceFrequency() time.Duration { - return r.svc.DefaultMaintenanceFrequency() -} - -func (r *resticRepositoryProvider) ClientSideCacheLimit(repoOption map[string]string) int64 { - return 0 -} diff --git a/pkg/repository/restic/repository.go b/pkg/repository/restic/repository.go deleted file mode 100644 index 7260542e1..000000000 --- a/pkg/repository/restic/repository.go +++ /dev/null @@ -1,147 +0,0 @@ -/* -Copyright the Velero contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package restic - -import ( - "os" - "time" - - "github.com/pkg/errors" - "github.com/sirupsen/logrus" - - "github.com/vmware-tanzu/velero/internal/credentials" - velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" - repokey "github.com/vmware-tanzu/velero/pkg/repository/keys" - "github.com/vmware-tanzu/velero/pkg/restic" - veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" - "github.com/vmware-tanzu/velero/pkg/util/filesystem" -) - -func NewRepositoryService(credGetter credentials.CredentialGetter, fs filesystem.Interface, log logrus.FieldLogger) *RepositoryService { - return &RepositoryService{ - credGetter: credGetter, - fileSystem: fs, - log: log, - } -} - -type RepositoryService struct { - credGetter credentials.CredentialGetter - fileSystem filesystem.Interface - log logrus.FieldLogger -} - -func (r *RepositoryService) InitRepo(bsl *velerov1api.BackupStorageLocation, repo *velerov1api.BackupRepository) error { - return r.exec(restic.InitCommand(repo.Spec.ResticIdentifier), bsl) -} - -func (r *RepositoryService) ConnectToRepo(bsl *velerov1api.BackupStorageLocation, repo *velerov1api.BackupRepository) error { - snapshotsCmd := restic.SnapshotsCommand(repo.Spec.ResticIdentifier) - // use the '--latest=1' flag to minimize the amount of data fetched since - // we're just validating that the repo exists and can be authenticated - // to. - // "--last" is replaced by "--latest=1" in restic v0.12.1 - snapshotsCmd.ExtraFlags = append(snapshotsCmd.ExtraFlags, "--latest=1") - - return r.exec(snapshotsCmd, bsl) -} - -func (r *RepositoryService) PruneRepo(bsl *velerov1api.BackupStorageLocation, repo *velerov1api.BackupRepository) error { - return r.exec(restic.PruneCommand(repo.Spec.ResticIdentifier), bsl) -} - -func (r *RepositoryService) UnlockRepo(bsl *velerov1api.BackupStorageLocation, repo *velerov1api.BackupRepository) error { - return r.exec(restic.UnlockCommand(repo.Spec.ResticIdentifier), bsl) -} - -func (r *RepositoryService) Forget(bsl *velerov1api.BackupStorageLocation, repo *velerov1api.BackupRepository, snapshotID string) error { - return r.exec(restic.ForgetCommand(repo.Spec.ResticIdentifier, snapshotID), bsl) -} - -func (r *RepositoryService) DefaultMaintenanceFrequency() time.Duration { - return restic.DefaultMaintenanceFrequency -} - -func (r *RepositoryService) exec(cmd *restic.Command, bsl *velerov1api.BackupStorageLocation) error { - file, err := r.credGetter.FromFile.Path(repokey.RepoKeySelector()) - if err != nil { - return err - } - // ignore error since there's nothing we can do and it's a temp file. - defer os.Remove(file) - - cmd.PasswordFile = file - - // if there's a caCert on the ObjectStorage, write it to disk so that it can be passed to restic - var caCertFile string - if bsl.Spec.ObjectStorage != nil { - var caCertData []byte - - // Try CACertRef first (new method), then fall back to CACert (deprecated) - if bsl.Spec.ObjectStorage.CACertRef != nil { - caCertString, err := r.credGetter.FromSecret.Get(bsl.Spec.ObjectStorage.CACertRef) - if err != nil { - return errors.Wrap(err, "error getting CA certificate from secret") - } - caCertData = []byte(caCertString) - } else if bsl.Spec.ObjectStorage.CACert != nil { - caCertData = bsl.Spec.ObjectStorage.CACert - } - - if caCertData != nil { - caCertFile, err = restic.TempCACertFile(caCertData, bsl.Name, r.fileSystem) - if err != nil { - return errors.Wrap(err, "error creating temp cacert file") - } - // ignore error since there's nothing we can do and it's a temp file. - defer os.Remove(caCertFile) - } - } - cmd.CACertFile = caCertFile - - // CmdEnv uses credGetter.FromFile (not FromSecret) to get cloud provider credentials. - // FromFile materializes the BSL's Credential secret to a file path that cloud SDKs - // can read (e.g., AWS_SHARED_CREDENTIALS_FILE). This is different from caCertRef above, - // which uses FromSecret to read the CA certificate data directly into memory, then - // writes it to a temp file because restic CLI only accepts file paths (--cacert flag). - env, err := restic.CmdEnv(bsl, r.credGetter.FromFile) - if err != nil { - return err - } - cmd.Env = env - - // #4820: restrieve insecureSkipTLSVerify from BSL configuration for - // AWS plugin. If nothing is return, that means insecureSkipTLSVerify - // is not enable for Restic command. - skipTLSRet := restic.GetInsecureSkipTLSVerifyFromBSL(bsl, r.log) - if len(skipTLSRet) > 0 { - cmd.ExtraFlags = append(cmd.ExtraFlags, skipTLSRet) - } - - stdout, stderr, err := veleroexec.RunCommandWithLog(cmd.Cmd(), r.log) - r.log.WithFields(logrus.Fields{ - "repository": cmd.RepoName(), - "command": cmd.String(), - "stdout": stdout, - "stderr": stderr, - }).Debugf("Ran restic command") - if err != nil { - return errors.Wrapf(err, "error running command=%s, stdout=%s, stderr=%s", cmd.String(), stdout, stderr) - } - - return nil -} diff --git a/pkg/repository/udmrepo/kopialib/lib_repo.go b/pkg/repository/udmrepo/kopialib/lib_repo.go index e6c46ae66..34559baf7 100644 --- a/pkg/repository/udmrepo/kopialib/lib_repo.go +++ b/pkg/repository/udmrepo/kopialib/lib_repo.go @@ -388,9 +388,9 @@ func (kr *kopiaRepository) Close(ctx context.Context) error { return nil } -func (kr *kopiaRepository) NewObjectWriter(ctx context.Context, opt udmrepo.ObjectWriteOptions) udmrepo.ObjectWriter { +func (kr *kopiaRepository) NewObjectWriter(ctx context.Context, opt udmrepo.ObjectWriteOptions) (udmrepo.ObjectWriter, error) { if kr.rawWriter == nil { - return nil + return nil, errors.New("repo writer is closed or not open") } writer := kr.rawWriter.NewObjectWriter(kopia.SetupKopiaLog(ctx, kr.logger), object.WriterOptions{ @@ -402,12 +402,22 @@ func (kr *kopiaRepository) NewObjectWriter(ctx context.Context, opt udmrepo.Obje }) if writer == nil { - return nil + return nil, errors.Errorf("error creating writer for object %s", opt.Description) } return &kopiaObjectWriter{ rawWriter: writer, - } + }, nil +} + +// TODO add implementation in following PRs +func (kr *kopiaRepository) WriteMetadata(ctx context.Context, meta *udmrepo.Metadata, opt udmrepo.ObjectWriteOptions) (udmrepo.ID, error) { + return "", errors.New("not supported") +} + +// TODO add implementation in following PRs +func (kr *kopiaRepository) ReadMetadata(ctx context.Context, id udmrepo.ID) (*udmrepo.Metadata, error) { + return nil, errors.New("not supported") } func (kr *kopiaRepository) PutManifest(ctx context.Context, manifest udmrepo.RepoManifest) (udmrepo.ID, error) { @@ -436,6 +446,21 @@ func (kr *kopiaRepository) DeleteManifest(ctx context.Context, id udmrepo.ID) er return nil } +// TODO add implementation in following PRs +func (kr *kopiaRepository) SaveSnapshot(ctx context.Context, snap udmrepo.Snapshot) (udmrepo.ID, error) { + return "", errors.New("not supported") +} + +// TODO add implementation in following PRs +func (kr *kopiaRepository) GetSnapshot(ctx context.Context, id udmrepo.ID) (udmrepo.Snapshot, error) { + return udmrepo.Snapshot{}, errors.New("not supported") +} + +// TODO add implementation in following PRs +func (kr *kopiaRepository) DeleteSnapshot(ctx context.Context, id udmrepo.ID) error { + return errors.New("not supported") +} + func (kr *kopiaRepository) Flush(ctx context.Context) error { if kr.rawWriter == nil { return errors.New("repo writer is closed or not open") @@ -546,8 +571,9 @@ func (kow *kopiaObjectWriter) Write(p []byte) (int, error) { return kow.rawWriter.Write(p) } -func (kow *kopiaObjectWriter) Seek(offset int64, whence int) (int64, error) { - return -1, errors.New("not supported") +// TODO add implementation in following PRs +func (kow *kopiaObjectWriter) WriteAt(p []byte, offset int64) (int, error) { + return 0, errors.New("not supported") } func (kow *kopiaObjectWriter) Checkpoint() (udmrepo.ID, error) { diff --git a/pkg/repository/udmrepo/kopialib/lib_repo_test.go b/pkg/repository/udmrepo/kopialib/lib_repo_test.go index 2feabaeca..36e331bef 100644 --- a/pkg/repository/udmrepo/kopialib/lib_repo_test.go +++ b/pkg/repository/udmrepo/kopialib/lib_repo_test.go @@ -663,13 +663,16 @@ func TestNewObjectWriter(t *testing.T) { rawWriter *repomocks.MockRepositoryWriter rawWriterRet object.Writer expectedRet udmrepo.ObjectWriter + expectedErr string }{ { - name: "raw writer is nil", + name: "raw writer is nil", + expectedErr: "repo writer is closed or not open", }, { - name: "new object writer fail", - rawWriter: repomocks.NewMockRepositoryWriter(t), + name: "new object writer fail", + rawWriter: repomocks.NewMockRepositoryWriter(t), + expectedErr: "error creating writer for object ", }, { name: "succeed", @@ -688,9 +691,14 @@ func TestNewObjectWriter(t *testing.T) { kr.rawWriter = tc.rawWriter } - ret := kr.NewObjectWriter(t.Context(), udmrepo.ObjectWriteOptions{}) + ret, err := kr.NewObjectWriter(t.Context(), udmrepo.ObjectWriteOptions{}) - assert.Equal(t, tc.expectedRet, ret) + if tc.expectedErr == "" { + require.NoError(t, err) + require.Equal(t, tc.expectedRet, ret) + } else { + require.EqualError(t, err, tc.expectedErr) + } }) } } diff --git a/pkg/repository/udmrepo/mocks/BackupRepo.go b/pkg/repository/udmrepo/mocks/BackupRepo.go index 7d044356d..e495b6b00 100644 --- a/pkg/repository/udmrepo/mocks/BackupRepo.go +++ b/pkg/repository/udmrepo/mocks/BackupRepo.go @@ -1,265 +1,17 @@ -// Code generated by mockery v2.39.1. DO NOT EDIT. +// Code generated by mockery; DO NOT EDIT. +// github.com/vektra/mockery +// template: testify package mocks import ( - context "context" - time "time" + "context" + "time" mock "github.com/stretchr/testify/mock" - - udmrepo "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" ) -// BackupRepo is an autogenerated mock type for the BackupRepo type -type BackupRepo struct { - mock.Mock -} - -// Close provides a mock function with given fields: ctx -func (_m *BackupRepo) Close(ctx context.Context) error { - ret := _m.Called(ctx) - - if len(ret) == 0 { - panic("no return value specified for Close") - } - - var r0 error - if rf, ok := ret.Get(0).(func(context.Context) error); ok { - r0 = rf(ctx) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// ConcatenateObjects provides a mock function with given fields: ctx, objectIDs -func (_m *BackupRepo) ConcatenateObjects(ctx context.Context, objectIDs []udmrepo.ID) (udmrepo.ID, error) { - ret := _m.Called(ctx, objectIDs) - - if len(ret) == 0 { - panic("no return value specified for ConcatenateObjects") - } - - var r0 udmrepo.ID - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, []udmrepo.ID) (udmrepo.ID, error)); ok { - return rf(ctx, objectIDs) - } - if rf, ok := ret.Get(0).(func(context.Context, []udmrepo.ID) udmrepo.ID); ok { - r0 = rf(ctx, objectIDs) - } else { - r0 = ret.Get(0).(udmrepo.ID) - } - - if rf, ok := ret.Get(1).(func(context.Context, []udmrepo.ID) error); ok { - r1 = rf(ctx, objectIDs) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// DeleteManifest provides a mock function with given fields: ctx, id -func (_m *BackupRepo) DeleteManifest(ctx context.Context, id udmrepo.ID) error { - ret := _m.Called(ctx, id) - - if len(ret) == 0 { - panic("no return value specified for DeleteManifest") - } - - var r0 error - if rf, ok := ret.Get(0).(func(context.Context, udmrepo.ID) error); ok { - r0 = rf(ctx, id) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// FindManifests provides a mock function with given fields: ctx, filter -func (_m *BackupRepo) FindManifests(ctx context.Context, filter udmrepo.ManifestFilter) ([]*udmrepo.ManifestEntryMetadata, error) { - ret := _m.Called(ctx, filter) - - if len(ret) == 0 { - panic("no return value specified for FindManifests") - } - - var r0 []*udmrepo.ManifestEntryMetadata - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, udmrepo.ManifestFilter) ([]*udmrepo.ManifestEntryMetadata, error)); ok { - return rf(ctx, filter) - } - if rf, ok := ret.Get(0).(func(context.Context, udmrepo.ManifestFilter) []*udmrepo.ManifestEntryMetadata); ok { - r0 = rf(ctx, filter) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).([]*udmrepo.ManifestEntryMetadata) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, udmrepo.ManifestFilter) error); ok { - r1 = rf(ctx, filter) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// Flush provides a mock function with given fields: ctx -func (_m *BackupRepo) Flush(ctx context.Context) error { - ret := _m.Called(ctx) - - if len(ret) == 0 { - panic("no return value specified for Flush") - } - - var r0 error - if rf, ok := ret.Get(0).(func(context.Context) error); ok { - r0 = rf(ctx) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// GetAdvancedFeatures provides a mock function with given fields: -func (_m *BackupRepo) GetAdvancedFeatures() udmrepo.AdvancedFeatureInfo { - ret := _m.Called() - - if len(ret) == 0 { - panic("no return value specified for GetAdvancedFeatures") - } - - var r0 udmrepo.AdvancedFeatureInfo - if rf, ok := ret.Get(0).(func() udmrepo.AdvancedFeatureInfo); ok { - r0 = rf() - } else { - r0 = ret.Get(0).(udmrepo.AdvancedFeatureInfo) - } - - return r0 -} - -// GetManifest provides a mock function with given fields: ctx, id, mani -func (_m *BackupRepo) GetManifest(ctx context.Context, id udmrepo.ID, mani *udmrepo.RepoManifest) error { - ret := _m.Called(ctx, id, mani) - - if len(ret) == 0 { - panic("no return value specified for GetManifest") - } - - var r0 error - if rf, ok := ret.Get(0).(func(context.Context, udmrepo.ID, *udmrepo.RepoManifest) error); ok { - r0 = rf(ctx, id, mani) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// NewObjectWriter provides a mock function with given fields: ctx, opt -func (_m *BackupRepo) NewObjectWriter(ctx context.Context, opt udmrepo.ObjectWriteOptions) udmrepo.ObjectWriter { - ret := _m.Called(ctx, opt) - - if len(ret) == 0 { - panic("no return value specified for NewObjectWriter") - } - - var r0 udmrepo.ObjectWriter - if rf, ok := ret.Get(0).(func(context.Context, udmrepo.ObjectWriteOptions) udmrepo.ObjectWriter); ok { - r0 = rf(ctx, opt) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(udmrepo.ObjectWriter) - } - } - - return r0 -} - -// OpenObject provides a mock function with given fields: ctx, id -func (_m *BackupRepo) OpenObject(ctx context.Context, id udmrepo.ID) (udmrepo.ObjectReader, error) { - ret := _m.Called(ctx, id) - - if len(ret) == 0 { - panic("no return value specified for OpenObject") - } - - var r0 udmrepo.ObjectReader - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, udmrepo.ID) (udmrepo.ObjectReader, error)); ok { - return rf(ctx, id) - } - if rf, ok := ret.Get(0).(func(context.Context, udmrepo.ID) udmrepo.ObjectReader); ok { - r0 = rf(ctx, id) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(udmrepo.ObjectReader) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, udmrepo.ID) error); ok { - r1 = rf(ctx, id) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// PutManifest provides a mock function with given fields: ctx, mani -func (_m *BackupRepo) PutManifest(ctx context.Context, mani udmrepo.RepoManifest) (udmrepo.ID, error) { - ret := _m.Called(ctx, mani) - - if len(ret) == 0 { - panic("no return value specified for PutManifest") - } - - var r0 udmrepo.ID - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, udmrepo.RepoManifest) (udmrepo.ID, error)); ok { - return rf(ctx, mani) - } - if rf, ok := ret.Get(0).(func(context.Context, udmrepo.RepoManifest) udmrepo.ID); ok { - r0 = rf(ctx, mani) - } else { - r0 = ret.Get(0).(udmrepo.ID) - } - - if rf, ok := ret.Get(1).(func(context.Context, udmrepo.RepoManifest) error); ok { - r1 = rf(ctx, mani) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// Time provides a mock function with given fields: -func (_m *BackupRepo) Time() time.Time { - ret := _m.Called() - - if len(ret) == 0 { - panic("no return value specified for Time") - } - - var r0 time.Time - if rf, ok := ret.Get(0).(func() time.Time); ok { - r0 = rf() - } else { - r0 = ret.Get(0).(time.Time) - } - - return r0 -} - // NewBackupRepo creates a new instance of BackupRepo. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. // The first argument is typically a *testing.T value. func NewBackupRepo(t interface { @@ -273,3 +25,991 @@ func NewBackupRepo(t interface { return mock } + +// BackupRepo is an autogenerated mock type for the BackupRepo type +type BackupRepo struct { + mock.Mock +} + +type BackupRepo_Expecter struct { + mock *mock.Mock +} + +func (_m *BackupRepo) EXPECT() *BackupRepo_Expecter { + return &BackupRepo_Expecter{mock: &_m.Mock} +} + +// Close provides a mock function for the type BackupRepo +func (_mock *BackupRepo) Close(ctx context.Context) error { + ret := _mock.Called(ctx) + + if len(ret) == 0 { + panic("no return value specified for Close") + } + + var r0 error + if returnFunc, ok := ret.Get(0).(func(context.Context) error); ok { + r0 = returnFunc(ctx) + } else { + r0 = ret.Error(0) + } + return r0 +} + +// BackupRepo_Close_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Close' +type BackupRepo_Close_Call struct { + *mock.Call +} + +// Close is a helper method to define mock.On call +// - ctx context.Context +func (_e *BackupRepo_Expecter) Close(ctx interface{}) *BackupRepo_Close_Call { + return &BackupRepo_Close_Call{Call: _e.mock.On("Close", ctx)} +} + +func (_c *BackupRepo_Close_Call) Run(run func(ctx context.Context)) *BackupRepo_Close_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *BackupRepo_Close_Call) Return(err error) *BackupRepo_Close_Call { + _c.Call.Return(err) + return _c +} + +func (_c *BackupRepo_Close_Call) RunAndReturn(run func(ctx context.Context) error) *BackupRepo_Close_Call { + _c.Call.Return(run) + return _c +} + +// ConcatenateObjects provides a mock function for the type BackupRepo +func (_mock *BackupRepo) ConcatenateObjects(ctx context.Context, objectIDs []udmrepo.ID) (udmrepo.ID, error) { + ret := _mock.Called(ctx, objectIDs) + + if len(ret) == 0 { + panic("no return value specified for ConcatenateObjects") + } + + var r0 udmrepo.ID + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, []udmrepo.ID) (udmrepo.ID, error)); ok { + return returnFunc(ctx, objectIDs) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, []udmrepo.ID) udmrepo.ID); ok { + r0 = returnFunc(ctx, objectIDs) + } else { + r0 = ret.Get(0).(udmrepo.ID) + } + if returnFunc, ok := ret.Get(1).(func(context.Context, []udmrepo.ID) error); ok { + r1 = returnFunc(ctx, objectIDs) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// BackupRepo_ConcatenateObjects_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ConcatenateObjects' +type BackupRepo_ConcatenateObjects_Call struct { + *mock.Call +} + +// ConcatenateObjects is a helper method to define mock.On call +// - ctx context.Context +// - objectIDs []udmrepo.ID +func (_e *BackupRepo_Expecter) ConcatenateObjects(ctx interface{}, objectIDs interface{}) *BackupRepo_ConcatenateObjects_Call { + return &BackupRepo_ConcatenateObjects_Call{Call: _e.mock.On("ConcatenateObjects", ctx, objectIDs)} +} + +func (_c *BackupRepo_ConcatenateObjects_Call) Run(run func(ctx context.Context, objectIDs []udmrepo.ID)) *BackupRepo_ConcatenateObjects_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 []udmrepo.ID + if args[1] != nil { + arg1 = args[1].([]udmrepo.ID) + } + run( + arg0, + arg1, + ) + }) + return _c +} + +func (_c *BackupRepo_ConcatenateObjects_Call) Return(iD udmrepo.ID, err error) *BackupRepo_ConcatenateObjects_Call { + _c.Call.Return(iD, err) + return _c +} + +func (_c *BackupRepo_ConcatenateObjects_Call) RunAndReturn(run func(ctx context.Context, objectIDs []udmrepo.ID) (udmrepo.ID, error)) *BackupRepo_ConcatenateObjects_Call { + _c.Call.Return(run) + return _c +} + +// DeleteManifest provides a mock function for the type BackupRepo +func (_mock *BackupRepo) DeleteManifest(ctx context.Context, id udmrepo.ID) error { + ret := _mock.Called(ctx, id) + + if len(ret) == 0 { + panic("no return value specified for DeleteManifest") + } + + var r0 error + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.ID) error); ok { + r0 = returnFunc(ctx, id) + } else { + r0 = ret.Error(0) + } + return r0 +} + +// BackupRepo_DeleteManifest_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteManifest' +type BackupRepo_DeleteManifest_Call struct { + *mock.Call +} + +// DeleteManifest is a helper method to define mock.On call +// - ctx context.Context +// - id udmrepo.ID +func (_e *BackupRepo_Expecter) DeleteManifest(ctx interface{}, id interface{}) *BackupRepo_DeleteManifest_Call { + return &BackupRepo_DeleteManifest_Call{Call: _e.mock.On("DeleteManifest", ctx, id)} +} + +func (_c *BackupRepo_DeleteManifest_Call) Run(run func(ctx context.Context, id udmrepo.ID)) *BackupRepo_DeleteManifest_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 udmrepo.ID + if args[1] != nil { + arg1 = args[1].(udmrepo.ID) + } + run( + arg0, + arg1, + ) + }) + return _c +} + +func (_c *BackupRepo_DeleteManifest_Call) Return(err error) *BackupRepo_DeleteManifest_Call { + _c.Call.Return(err) + return _c +} + +func (_c *BackupRepo_DeleteManifest_Call) RunAndReturn(run func(ctx context.Context, id udmrepo.ID) error) *BackupRepo_DeleteManifest_Call { + _c.Call.Return(run) + return _c +} + +// DeleteSnapshot provides a mock function for the type BackupRepo +func (_mock *BackupRepo) DeleteSnapshot(ctx context.Context, id udmrepo.ID) error { + ret := _mock.Called(ctx, id) + + if len(ret) == 0 { + panic("no return value specified for DeleteSnapshot") + } + + var r0 error + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.ID) error); ok { + r0 = returnFunc(ctx, id) + } else { + r0 = ret.Error(0) + } + return r0 +} + +// BackupRepo_DeleteSnapshot_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteSnapshot' +type BackupRepo_DeleteSnapshot_Call struct { + *mock.Call +} + +// DeleteSnapshot is a helper method to define mock.On call +// - ctx context.Context +// - id udmrepo.ID +func (_e *BackupRepo_Expecter) DeleteSnapshot(ctx interface{}, id interface{}) *BackupRepo_DeleteSnapshot_Call { + return &BackupRepo_DeleteSnapshot_Call{Call: _e.mock.On("DeleteSnapshot", ctx, id)} +} + +func (_c *BackupRepo_DeleteSnapshot_Call) Run(run func(ctx context.Context, id udmrepo.ID)) *BackupRepo_DeleteSnapshot_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 udmrepo.ID + if args[1] != nil { + arg1 = args[1].(udmrepo.ID) + } + run( + arg0, + arg1, + ) + }) + return _c +} + +func (_c *BackupRepo_DeleteSnapshot_Call) Return(err error) *BackupRepo_DeleteSnapshot_Call { + _c.Call.Return(err) + return _c +} + +func (_c *BackupRepo_DeleteSnapshot_Call) RunAndReturn(run func(ctx context.Context, id udmrepo.ID) error) *BackupRepo_DeleteSnapshot_Call { + _c.Call.Return(run) + return _c +} + +// FindManifests provides a mock function for the type BackupRepo +func (_mock *BackupRepo) FindManifests(ctx context.Context, filter udmrepo.ManifestFilter) ([]*udmrepo.ManifestEntryMetadata, error) { + ret := _mock.Called(ctx, filter) + + if len(ret) == 0 { + panic("no return value specified for FindManifests") + } + + var r0 []*udmrepo.ManifestEntryMetadata + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.ManifestFilter) ([]*udmrepo.ManifestEntryMetadata, error)); ok { + return returnFunc(ctx, filter) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.ManifestFilter) []*udmrepo.ManifestEntryMetadata); ok { + r0 = returnFunc(ctx, filter) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]*udmrepo.ManifestEntryMetadata) + } + } + if returnFunc, ok := ret.Get(1).(func(context.Context, udmrepo.ManifestFilter) error); ok { + r1 = returnFunc(ctx, filter) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// BackupRepo_FindManifests_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FindManifests' +type BackupRepo_FindManifests_Call struct { + *mock.Call +} + +// FindManifests is a helper method to define mock.On call +// - ctx context.Context +// - filter udmrepo.ManifestFilter +func (_e *BackupRepo_Expecter) FindManifests(ctx interface{}, filter interface{}) *BackupRepo_FindManifests_Call { + return &BackupRepo_FindManifests_Call{Call: _e.mock.On("FindManifests", ctx, filter)} +} + +func (_c *BackupRepo_FindManifests_Call) Run(run func(ctx context.Context, filter udmrepo.ManifestFilter)) *BackupRepo_FindManifests_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 udmrepo.ManifestFilter + if args[1] != nil { + arg1 = args[1].(udmrepo.ManifestFilter) + } + run( + arg0, + arg1, + ) + }) + return _c +} + +func (_c *BackupRepo_FindManifests_Call) Return(manifestEntryMetadatas []*udmrepo.ManifestEntryMetadata, err error) *BackupRepo_FindManifests_Call { + _c.Call.Return(manifestEntryMetadatas, err) + return _c +} + +func (_c *BackupRepo_FindManifests_Call) RunAndReturn(run func(ctx context.Context, filter udmrepo.ManifestFilter) ([]*udmrepo.ManifestEntryMetadata, error)) *BackupRepo_FindManifests_Call { + _c.Call.Return(run) + return _c +} + +// Flush provides a mock function for the type BackupRepo +func (_mock *BackupRepo) Flush(ctx context.Context) error { + ret := _mock.Called(ctx) + + if len(ret) == 0 { + panic("no return value specified for Flush") + } + + var r0 error + if returnFunc, ok := ret.Get(0).(func(context.Context) error); ok { + r0 = returnFunc(ctx) + } else { + r0 = ret.Error(0) + } + return r0 +} + +// BackupRepo_Flush_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Flush' +type BackupRepo_Flush_Call struct { + *mock.Call +} + +// Flush is a helper method to define mock.On call +// - ctx context.Context +func (_e *BackupRepo_Expecter) Flush(ctx interface{}) *BackupRepo_Flush_Call { + return &BackupRepo_Flush_Call{Call: _e.mock.On("Flush", ctx)} +} + +func (_c *BackupRepo_Flush_Call) Run(run func(ctx context.Context)) *BackupRepo_Flush_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *BackupRepo_Flush_Call) Return(err error) *BackupRepo_Flush_Call { + _c.Call.Return(err) + return _c +} + +func (_c *BackupRepo_Flush_Call) RunAndReturn(run func(ctx context.Context) error) *BackupRepo_Flush_Call { + _c.Call.Return(run) + return _c +} + +// GetAdvancedFeatures provides a mock function for the type BackupRepo +func (_mock *BackupRepo) GetAdvancedFeatures() udmrepo.AdvancedFeatureInfo { + ret := _mock.Called() + + if len(ret) == 0 { + panic("no return value specified for GetAdvancedFeatures") + } + + var r0 udmrepo.AdvancedFeatureInfo + if returnFunc, ok := ret.Get(0).(func() udmrepo.AdvancedFeatureInfo); ok { + r0 = returnFunc() + } else { + r0 = ret.Get(0).(udmrepo.AdvancedFeatureInfo) + } + return r0 +} + +// BackupRepo_GetAdvancedFeatures_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetAdvancedFeatures' +type BackupRepo_GetAdvancedFeatures_Call struct { + *mock.Call +} + +// GetAdvancedFeatures is a helper method to define mock.On call +func (_e *BackupRepo_Expecter) GetAdvancedFeatures() *BackupRepo_GetAdvancedFeatures_Call { + return &BackupRepo_GetAdvancedFeatures_Call{Call: _e.mock.On("GetAdvancedFeatures")} +} + +func (_c *BackupRepo_GetAdvancedFeatures_Call) Run(run func()) *BackupRepo_GetAdvancedFeatures_Call { + _c.Call.Run(func(args mock.Arguments) { + run() + }) + return _c +} + +func (_c *BackupRepo_GetAdvancedFeatures_Call) Return(advancedFeatureInfo udmrepo.AdvancedFeatureInfo) *BackupRepo_GetAdvancedFeatures_Call { + _c.Call.Return(advancedFeatureInfo) + return _c +} + +func (_c *BackupRepo_GetAdvancedFeatures_Call) RunAndReturn(run func() udmrepo.AdvancedFeatureInfo) *BackupRepo_GetAdvancedFeatures_Call { + _c.Call.Return(run) + return _c +} + +// GetManifest provides a mock function for the type BackupRepo +func (_mock *BackupRepo) GetManifest(ctx context.Context, id udmrepo.ID, mani *udmrepo.RepoManifest) error { + ret := _mock.Called(ctx, id, mani) + + if len(ret) == 0 { + panic("no return value specified for GetManifest") + } + + var r0 error + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.ID, *udmrepo.RepoManifest) error); ok { + r0 = returnFunc(ctx, id, mani) + } else { + r0 = ret.Error(0) + } + return r0 +} + +// BackupRepo_GetManifest_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetManifest' +type BackupRepo_GetManifest_Call struct { + *mock.Call +} + +// GetManifest is a helper method to define mock.On call +// - ctx context.Context +// - id udmrepo.ID +// - mani *udmrepo.RepoManifest +func (_e *BackupRepo_Expecter) GetManifest(ctx interface{}, id interface{}, mani interface{}) *BackupRepo_GetManifest_Call { + return &BackupRepo_GetManifest_Call{Call: _e.mock.On("GetManifest", ctx, id, mani)} +} + +func (_c *BackupRepo_GetManifest_Call) Run(run func(ctx context.Context, id udmrepo.ID, mani *udmrepo.RepoManifest)) *BackupRepo_GetManifest_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 udmrepo.ID + if args[1] != nil { + arg1 = args[1].(udmrepo.ID) + } + var arg2 *udmrepo.RepoManifest + if args[2] != nil { + arg2 = args[2].(*udmrepo.RepoManifest) + } + run( + arg0, + arg1, + arg2, + ) + }) + return _c +} + +func (_c *BackupRepo_GetManifest_Call) Return(err error) *BackupRepo_GetManifest_Call { + _c.Call.Return(err) + return _c +} + +func (_c *BackupRepo_GetManifest_Call) RunAndReturn(run func(ctx context.Context, id udmrepo.ID, mani *udmrepo.RepoManifest) error) *BackupRepo_GetManifest_Call { + _c.Call.Return(run) + return _c +} + +// GetSnapshot provides a mock function for the type BackupRepo +func (_mock *BackupRepo) GetSnapshot(ctx context.Context, id udmrepo.ID) (udmrepo.Snapshot, error) { + ret := _mock.Called(ctx, id) + + if len(ret) == 0 { + panic("no return value specified for GetSnapshot") + } + + var r0 udmrepo.Snapshot + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.ID) (udmrepo.Snapshot, error)); ok { + return returnFunc(ctx, id) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.ID) udmrepo.Snapshot); ok { + r0 = returnFunc(ctx, id) + } else { + r0 = ret.Get(0).(udmrepo.Snapshot) + } + if returnFunc, ok := ret.Get(1).(func(context.Context, udmrepo.ID) error); ok { + r1 = returnFunc(ctx, id) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// BackupRepo_GetSnapshot_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetSnapshot' +type BackupRepo_GetSnapshot_Call struct { + *mock.Call +} + +// GetSnapshot is a helper method to define mock.On call +// - ctx context.Context +// - id udmrepo.ID +func (_e *BackupRepo_Expecter) GetSnapshot(ctx interface{}, id interface{}) *BackupRepo_GetSnapshot_Call { + return &BackupRepo_GetSnapshot_Call{Call: _e.mock.On("GetSnapshot", ctx, id)} +} + +func (_c *BackupRepo_GetSnapshot_Call) Run(run func(ctx context.Context, id udmrepo.ID)) *BackupRepo_GetSnapshot_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 udmrepo.ID + if args[1] != nil { + arg1 = args[1].(udmrepo.ID) + } + run( + arg0, + arg1, + ) + }) + return _c +} + +func (_c *BackupRepo_GetSnapshot_Call) Return(snapshot udmrepo.Snapshot, err error) *BackupRepo_GetSnapshot_Call { + _c.Call.Return(snapshot, err) + return _c +} + +func (_c *BackupRepo_GetSnapshot_Call) RunAndReturn(run func(ctx context.Context, id udmrepo.ID) (udmrepo.Snapshot, error)) *BackupRepo_GetSnapshot_Call { + _c.Call.Return(run) + return _c +} + +// NewObjectWriter provides a mock function for the type BackupRepo +func (_mock *BackupRepo) NewObjectWriter(ctx context.Context, opt udmrepo.ObjectWriteOptions) (udmrepo.ObjectWriter, error) { + ret := _mock.Called(ctx, opt) + + if len(ret) == 0 { + panic("no return value specified for NewObjectWriter") + } + + var r0 udmrepo.ObjectWriter + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.ObjectWriteOptions) (udmrepo.ObjectWriter, error)); ok { + return returnFunc(ctx, opt) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.ObjectWriteOptions) udmrepo.ObjectWriter); ok { + r0 = returnFunc(ctx, opt) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(udmrepo.ObjectWriter) + } + } + if returnFunc, ok := ret.Get(1).(func(context.Context, udmrepo.ObjectWriteOptions) error); ok { + r1 = returnFunc(ctx, opt) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// BackupRepo_NewObjectWriter_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'NewObjectWriter' +type BackupRepo_NewObjectWriter_Call struct { + *mock.Call +} + +// NewObjectWriter is a helper method to define mock.On call +// - ctx context.Context +// - opt udmrepo.ObjectWriteOptions +func (_e *BackupRepo_Expecter) NewObjectWriter(ctx interface{}, opt interface{}) *BackupRepo_NewObjectWriter_Call { + return &BackupRepo_NewObjectWriter_Call{Call: _e.mock.On("NewObjectWriter", ctx, opt)} +} + +func (_c *BackupRepo_NewObjectWriter_Call) Run(run func(ctx context.Context, opt udmrepo.ObjectWriteOptions)) *BackupRepo_NewObjectWriter_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 udmrepo.ObjectWriteOptions + if args[1] != nil { + arg1 = args[1].(udmrepo.ObjectWriteOptions) + } + run( + arg0, + arg1, + ) + }) + return _c +} + +func (_c *BackupRepo_NewObjectWriter_Call) Return(objectWriter udmrepo.ObjectWriter, err error) *BackupRepo_NewObjectWriter_Call { + _c.Call.Return(objectWriter, err) + return _c +} + +func (_c *BackupRepo_NewObjectWriter_Call) RunAndReturn(run func(ctx context.Context, opt udmrepo.ObjectWriteOptions) (udmrepo.ObjectWriter, error)) *BackupRepo_NewObjectWriter_Call { + _c.Call.Return(run) + return _c +} + +// OpenObject provides a mock function for the type BackupRepo +func (_mock *BackupRepo) OpenObject(ctx context.Context, id udmrepo.ID) (udmrepo.ObjectReader, error) { + ret := _mock.Called(ctx, id) + + if len(ret) == 0 { + panic("no return value specified for OpenObject") + } + + var r0 udmrepo.ObjectReader + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.ID) (udmrepo.ObjectReader, error)); ok { + return returnFunc(ctx, id) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.ID) udmrepo.ObjectReader); ok { + r0 = returnFunc(ctx, id) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(udmrepo.ObjectReader) + } + } + if returnFunc, ok := ret.Get(1).(func(context.Context, udmrepo.ID) error); ok { + r1 = returnFunc(ctx, id) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// BackupRepo_OpenObject_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'OpenObject' +type BackupRepo_OpenObject_Call struct { + *mock.Call +} + +// OpenObject is a helper method to define mock.On call +// - ctx context.Context +// - id udmrepo.ID +func (_e *BackupRepo_Expecter) OpenObject(ctx interface{}, id interface{}) *BackupRepo_OpenObject_Call { + return &BackupRepo_OpenObject_Call{Call: _e.mock.On("OpenObject", ctx, id)} +} + +func (_c *BackupRepo_OpenObject_Call) Run(run func(ctx context.Context, id udmrepo.ID)) *BackupRepo_OpenObject_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 udmrepo.ID + if args[1] != nil { + arg1 = args[1].(udmrepo.ID) + } + run( + arg0, + arg1, + ) + }) + return _c +} + +func (_c *BackupRepo_OpenObject_Call) Return(objectReader udmrepo.ObjectReader, err error) *BackupRepo_OpenObject_Call { + _c.Call.Return(objectReader, err) + return _c +} + +func (_c *BackupRepo_OpenObject_Call) RunAndReturn(run func(ctx context.Context, id udmrepo.ID) (udmrepo.ObjectReader, error)) *BackupRepo_OpenObject_Call { + _c.Call.Return(run) + return _c +} + +// PutManifest provides a mock function for the type BackupRepo +func (_mock *BackupRepo) PutManifest(ctx context.Context, mani udmrepo.RepoManifest) (udmrepo.ID, error) { + ret := _mock.Called(ctx, mani) + + if len(ret) == 0 { + panic("no return value specified for PutManifest") + } + + var r0 udmrepo.ID + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.RepoManifest) (udmrepo.ID, error)); ok { + return returnFunc(ctx, mani) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.RepoManifest) udmrepo.ID); ok { + r0 = returnFunc(ctx, mani) + } else { + r0 = ret.Get(0).(udmrepo.ID) + } + if returnFunc, ok := ret.Get(1).(func(context.Context, udmrepo.RepoManifest) error); ok { + r1 = returnFunc(ctx, mani) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// BackupRepo_PutManifest_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'PutManifest' +type BackupRepo_PutManifest_Call struct { + *mock.Call +} + +// PutManifest is a helper method to define mock.On call +// - ctx context.Context +// - mani udmrepo.RepoManifest +func (_e *BackupRepo_Expecter) PutManifest(ctx interface{}, mani interface{}) *BackupRepo_PutManifest_Call { + return &BackupRepo_PutManifest_Call{Call: _e.mock.On("PutManifest", ctx, mani)} +} + +func (_c *BackupRepo_PutManifest_Call) Run(run func(ctx context.Context, mani udmrepo.RepoManifest)) *BackupRepo_PutManifest_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 udmrepo.RepoManifest + if args[1] != nil { + arg1 = args[1].(udmrepo.RepoManifest) + } + run( + arg0, + arg1, + ) + }) + return _c +} + +func (_c *BackupRepo_PutManifest_Call) Return(iD udmrepo.ID, err error) *BackupRepo_PutManifest_Call { + _c.Call.Return(iD, err) + return _c +} + +func (_c *BackupRepo_PutManifest_Call) RunAndReturn(run func(ctx context.Context, mani udmrepo.RepoManifest) (udmrepo.ID, error)) *BackupRepo_PutManifest_Call { + _c.Call.Return(run) + return _c +} + +// ReadMetadata provides a mock function for the type BackupRepo +func (_mock *BackupRepo) ReadMetadata(ctx context.Context, id udmrepo.ID) (*udmrepo.Metadata, error) { + ret := _mock.Called(ctx, id) + + if len(ret) == 0 { + panic("no return value specified for ReadMetadata") + } + + var r0 *udmrepo.Metadata + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.ID) (*udmrepo.Metadata, error)); ok { + return returnFunc(ctx, id) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.ID) *udmrepo.Metadata); ok { + r0 = returnFunc(ctx, id) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*udmrepo.Metadata) + } + } + if returnFunc, ok := ret.Get(1).(func(context.Context, udmrepo.ID) error); ok { + r1 = returnFunc(ctx, id) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// BackupRepo_ReadMetadata_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ReadMetadata' +type BackupRepo_ReadMetadata_Call struct { + *mock.Call +} + +// ReadMetadata is a helper method to define mock.On call +// - ctx context.Context +// - id udmrepo.ID +func (_e *BackupRepo_Expecter) ReadMetadata(ctx interface{}, id interface{}) *BackupRepo_ReadMetadata_Call { + return &BackupRepo_ReadMetadata_Call{Call: _e.mock.On("ReadMetadata", ctx, id)} +} + +func (_c *BackupRepo_ReadMetadata_Call) Run(run func(ctx context.Context, id udmrepo.ID)) *BackupRepo_ReadMetadata_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 udmrepo.ID + if args[1] != nil { + arg1 = args[1].(udmrepo.ID) + } + run( + arg0, + arg1, + ) + }) + return _c +} + +func (_c *BackupRepo_ReadMetadata_Call) Return(metadata *udmrepo.Metadata, err error) *BackupRepo_ReadMetadata_Call { + _c.Call.Return(metadata, err) + return _c +} + +func (_c *BackupRepo_ReadMetadata_Call) RunAndReturn(run func(ctx context.Context, id udmrepo.ID) (*udmrepo.Metadata, error)) *BackupRepo_ReadMetadata_Call { + _c.Call.Return(run) + return _c +} + +// SaveSnapshot provides a mock function for the type BackupRepo +func (_mock *BackupRepo) SaveSnapshot(ctx context.Context, snapshot udmrepo.Snapshot) (udmrepo.ID, error) { + ret := _mock.Called(ctx, snapshot) + + if len(ret) == 0 { + panic("no return value specified for SaveSnapshot") + } + + var r0 udmrepo.ID + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.Snapshot) (udmrepo.ID, error)); ok { + return returnFunc(ctx, snapshot) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, udmrepo.Snapshot) udmrepo.ID); ok { + r0 = returnFunc(ctx, snapshot) + } else { + r0 = ret.Get(0).(udmrepo.ID) + } + if returnFunc, ok := ret.Get(1).(func(context.Context, udmrepo.Snapshot) error); ok { + r1 = returnFunc(ctx, snapshot) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// BackupRepo_SaveSnapshot_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SaveSnapshot' +type BackupRepo_SaveSnapshot_Call struct { + *mock.Call +} + +// SaveSnapshot is a helper method to define mock.On call +// - ctx context.Context +// - snapshot udmrepo.Snapshot +func (_e *BackupRepo_Expecter) SaveSnapshot(ctx interface{}, snapshot interface{}) *BackupRepo_SaveSnapshot_Call { + return &BackupRepo_SaveSnapshot_Call{Call: _e.mock.On("SaveSnapshot", ctx, snapshot)} +} + +func (_c *BackupRepo_SaveSnapshot_Call) Run(run func(ctx context.Context, snapshot udmrepo.Snapshot)) *BackupRepo_SaveSnapshot_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 udmrepo.Snapshot + if args[1] != nil { + arg1 = args[1].(udmrepo.Snapshot) + } + run( + arg0, + arg1, + ) + }) + return _c +} + +func (_c *BackupRepo_SaveSnapshot_Call) Return(iD udmrepo.ID, err error) *BackupRepo_SaveSnapshot_Call { + _c.Call.Return(iD, err) + return _c +} + +func (_c *BackupRepo_SaveSnapshot_Call) RunAndReturn(run func(ctx context.Context, snapshot udmrepo.Snapshot) (udmrepo.ID, error)) *BackupRepo_SaveSnapshot_Call { + _c.Call.Return(run) + return _c +} + +// Time provides a mock function for the type BackupRepo +func (_mock *BackupRepo) Time() time.Time { + ret := _mock.Called() + + if len(ret) == 0 { + panic("no return value specified for Time") + } + + var r0 time.Time + if returnFunc, ok := ret.Get(0).(func() time.Time); ok { + r0 = returnFunc() + } else { + r0 = ret.Get(0).(time.Time) + } + return r0 +} + +// BackupRepo_Time_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Time' +type BackupRepo_Time_Call struct { + *mock.Call +} + +// Time is a helper method to define mock.On call +func (_e *BackupRepo_Expecter) Time() *BackupRepo_Time_Call { + return &BackupRepo_Time_Call{Call: _e.mock.On("Time")} +} + +func (_c *BackupRepo_Time_Call) Run(run func()) *BackupRepo_Time_Call { + _c.Call.Run(func(args mock.Arguments) { + run() + }) + return _c +} + +func (_c *BackupRepo_Time_Call) Return(time1 time.Time) *BackupRepo_Time_Call { + _c.Call.Return(time1) + return _c +} + +func (_c *BackupRepo_Time_Call) RunAndReturn(run func() time.Time) *BackupRepo_Time_Call { + _c.Call.Return(run) + return _c +} + +// WriteMetadata provides a mock function for the type BackupRepo +func (_mock *BackupRepo) WriteMetadata(ctx context.Context, meta *udmrepo.Metadata, opt udmrepo.ObjectWriteOptions) (udmrepo.ID, error) { + ret := _mock.Called(ctx, meta, opt) + + if len(ret) == 0 { + panic("no return value specified for WriteMetadata") + } + + var r0 udmrepo.ID + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, *udmrepo.Metadata, udmrepo.ObjectWriteOptions) (udmrepo.ID, error)); ok { + return returnFunc(ctx, meta, opt) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, *udmrepo.Metadata, udmrepo.ObjectWriteOptions) udmrepo.ID); ok { + r0 = returnFunc(ctx, meta, opt) + } else { + r0 = ret.Get(0).(udmrepo.ID) + } + if returnFunc, ok := ret.Get(1).(func(context.Context, *udmrepo.Metadata, udmrepo.ObjectWriteOptions) error); ok { + r1 = returnFunc(ctx, meta, opt) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// BackupRepo_WriteMetadata_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WriteMetadata' +type BackupRepo_WriteMetadata_Call struct { + *mock.Call +} + +// WriteMetadata is a helper method to define mock.On call +// - ctx context.Context +// - meta *udmrepo.Metadata +// - opt udmrepo.ObjectWriteOptions +func (_e *BackupRepo_Expecter) WriteMetadata(ctx interface{}, meta interface{}, opt interface{}) *BackupRepo_WriteMetadata_Call { + return &BackupRepo_WriteMetadata_Call{Call: _e.mock.On("WriteMetadata", ctx, meta, opt)} +} + +func (_c *BackupRepo_WriteMetadata_Call) Run(run func(ctx context.Context, meta *udmrepo.Metadata, opt udmrepo.ObjectWriteOptions)) *BackupRepo_WriteMetadata_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *udmrepo.Metadata + if args[1] != nil { + arg1 = args[1].(*udmrepo.Metadata) + } + var arg2 udmrepo.ObjectWriteOptions + if args[2] != nil { + arg2 = args[2].(udmrepo.ObjectWriteOptions) + } + run( + arg0, + arg1, + arg2, + ) + }) + return _c +} + +func (_c *BackupRepo_WriteMetadata_Call) Return(iD udmrepo.ID, err error) *BackupRepo_WriteMetadata_Call { + _c.Call.Return(iD, err) + return _c +} + +func (_c *BackupRepo_WriteMetadata_Call) RunAndReturn(run func(ctx context.Context, meta *udmrepo.Metadata, opt udmrepo.ObjectWriteOptions) (udmrepo.ID, error)) *BackupRepo_WriteMetadata_Call { + _c.Call.Return(run) + return _c +} diff --git a/pkg/repository/udmrepo/mocks/ObjectWriter.go b/pkg/repository/udmrepo/mocks/ObjectWriter.go index 4bc21f8b7..d50a3ce76 100644 --- a/pkg/repository/udmrepo/mocks/ObjectWriter.go +++ b/pkg/repository/udmrepo/mocks/ObjectWriter.go @@ -1,147 +1,14 @@ -// Code generated by mockery v2.39.1. DO NOT EDIT. +// Code generated by mockery; DO NOT EDIT. +// github.com/vektra/mockery +// template: testify package mocks import ( mock "github.com/stretchr/testify/mock" - udmrepo "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" ) -// ObjectWriter is an autogenerated mock type for the ObjectWriter type -type ObjectWriter struct { - mock.Mock -} - -// Checkpoint provides a mock function with given fields: -func (_m *ObjectWriter) Checkpoint() (udmrepo.ID, error) { - ret := _m.Called() - - if len(ret) == 0 { - panic("no return value specified for Checkpoint") - } - - var r0 udmrepo.ID - var r1 error - if rf, ok := ret.Get(0).(func() (udmrepo.ID, error)); ok { - return rf() - } - if rf, ok := ret.Get(0).(func() udmrepo.ID); ok { - r0 = rf() - } else { - r0 = ret.Get(0).(udmrepo.ID) - } - - if rf, ok := ret.Get(1).(func() error); ok { - r1 = rf() - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// Close provides a mock function with given fields: -func (_m *ObjectWriter) Close() error { - ret := _m.Called() - - if len(ret) == 0 { - panic("no return value specified for Close") - } - - var r0 error - if rf, ok := ret.Get(0).(func() error); ok { - r0 = rf() - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// Result provides a mock function with given fields: -func (_m *ObjectWriter) Result() (udmrepo.ID, error) { - ret := _m.Called() - - if len(ret) == 0 { - panic("no return value specified for Result") - } - - var r0 udmrepo.ID - var r1 error - if rf, ok := ret.Get(0).(func() (udmrepo.ID, error)); ok { - return rf() - } - if rf, ok := ret.Get(0).(func() udmrepo.ID); ok { - r0 = rf() - } else { - r0 = ret.Get(0).(udmrepo.ID) - } - - if rf, ok := ret.Get(1).(func() error); ok { - r1 = rf() - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// Seek provides a mock function with given fields: offset, whence -func (_m *ObjectWriter) Seek(offset int64, whence int) (int64, error) { - ret := _m.Called(offset, whence) - - if len(ret) == 0 { - panic("no return value specified for Seek") - } - - var r0 int64 - var r1 error - if rf, ok := ret.Get(0).(func(int64, int) (int64, error)); ok { - return rf(offset, whence) - } - if rf, ok := ret.Get(0).(func(int64, int) int64); ok { - r0 = rf(offset, whence) - } else { - r0 = ret.Get(0).(int64) - } - - if rf, ok := ret.Get(1).(func(int64, int) error); ok { - r1 = rf(offset, whence) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// Write provides a mock function with given fields: p -func (_m *ObjectWriter) Write(p []byte) (int, error) { - ret := _m.Called(p) - - if len(ret) == 0 { - panic("no return value specified for Write") - } - - var r0 int - var r1 error - if rf, ok := ret.Get(0).(func([]byte) (int, error)); ok { - return rf(p) - } - if rf, ok := ret.Get(0).(func([]byte) int); ok { - r0 = rf(p) - } else { - r0 = ret.Get(0).(int) - } - - if rf, ok := ret.Get(1).(func([]byte) error); ok { - r1 = rf(p) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - // NewObjectWriter creates a new instance of ObjectWriter. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. // The first argument is typically a *testing.T value. func NewObjectWriter(t interface { @@ -155,3 +22,292 @@ func NewObjectWriter(t interface { return mock } + +// ObjectWriter is an autogenerated mock type for the ObjectWriter type +type ObjectWriter struct { + mock.Mock +} + +type ObjectWriter_Expecter struct { + mock *mock.Mock +} + +func (_m *ObjectWriter) EXPECT() *ObjectWriter_Expecter { + return &ObjectWriter_Expecter{mock: &_m.Mock} +} + +// Checkpoint provides a mock function for the type ObjectWriter +func (_mock *ObjectWriter) Checkpoint() (udmrepo.ID, error) { + ret := _mock.Called() + + if len(ret) == 0 { + panic("no return value specified for Checkpoint") + } + + var r0 udmrepo.ID + var r1 error + if returnFunc, ok := ret.Get(0).(func() (udmrepo.ID, error)); ok { + return returnFunc() + } + if returnFunc, ok := ret.Get(0).(func() udmrepo.ID); ok { + r0 = returnFunc() + } else { + r0 = ret.Get(0).(udmrepo.ID) + } + if returnFunc, ok := ret.Get(1).(func() error); ok { + r1 = returnFunc() + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// ObjectWriter_Checkpoint_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Checkpoint' +type ObjectWriter_Checkpoint_Call struct { + *mock.Call +} + +// Checkpoint is a helper method to define mock.On call +func (_e *ObjectWriter_Expecter) Checkpoint() *ObjectWriter_Checkpoint_Call { + return &ObjectWriter_Checkpoint_Call{Call: _e.mock.On("Checkpoint")} +} + +func (_c *ObjectWriter_Checkpoint_Call) Run(run func()) *ObjectWriter_Checkpoint_Call { + _c.Call.Run(func(args mock.Arguments) { + run() + }) + return _c +} + +func (_c *ObjectWriter_Checkpoint_Call) Return(iD udmrepo.ID, err error) *ObjectWriter_Checkpoint_Call { + _c.Call.Return(iD, err) + return _c +} + +func (_c *ObjectWriter_Checkpoint_Call) RunAndReturn(run func() (udmrepo.ID, error)) *ObjectWriter_Checkpoint_Call { + _c.Call.Return(run) + return _c +} + +// Close provides a mock function for the type ObjectWriter +func (_mock *ObjectWriter) Close() error { + ret := _mock.Called() + + if len(ret) == 0 { + panic("no return value specified for Close") + } + + var r0 error + if returnFunc, ok := ret.Get(0).(func() error); ok { + r0 = returnFunc() + } else { + r0 = ret.Error(0) + } + return r0 +} + +// ObjectWriter_Close_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Close' +type ObjectWriter_Close_Call struct { + *mock.Call +} + +// Close is a helper method to define mock.On call +func (_e *ObjectWriter_Expecter) Close() *ObjectWriter_Close_Call { + return &ObjectWriter_Close_Call{Call: _e.mock.On("Close")} +} + +func (_c *ObjectWriter_Close_Call) Run(run func()) *ObjectWriter_Close_Call { + _c.Call.Run(func(args mock.Arguments) { + run() + }) + return _c +} + +func (_c *ObjectWriter_Close_Call) Return(err error) *ObjectWriter_Close_Call { + _c.Call.Return(err) + return _c +} + +func (_c *ObjectWriter_Close_Call) RunAndReturn(run func() error) *ObjectWriter_Close_Call { + _c.Call.Return(run) + return _c +} + +// Result provides a mock function for the type ObjectWriter +func (_mock *ObjectWriter) Result() (udmrepo.ID, error) { + ret := _mock.Called() + + if len(ret) == 0 { + panic("no return value specified for Result") + } + + var r0 udmrepo.ID + var r1 error + if returnFunc, ok := ret.Get(0).(func() (udmrepo.ID, error)); ok { + return returnFunc() + } + if returnFunc, ok := ret.Get(0).(func() udmrepo.ID); ok { + r0 = returnFunc() + } else { + r0 = ret.Get(0).(udmrepo.ID) + } + if returnFunc, ok := ret.Get(1).(func() error); ok { + r1 = returnFunc() + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// ObjectWriter_Result_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Result' +type ObjectWriter_Result_Call struct { + *mock.Call +} + +// Result is a helper method to define mock.On call +func (_e *ObjectWriter_Expecter) Result() *ObjectWriter_Result_Call { + return &ObjectWriter_Result_Call{Call: _e.mock.On("Result")} +} + +func (_c *ObjectWriter_Result_Call) Run(run func()) *ObjectWriter_Result_Call { + _c.Call.Run(func(args mock.Arguments) { + run() + }) + return _c +} + +func (_c *ObjectWriter_Result_Call) Return(iD udmrepo.ID, err error) *ObjectWriter_Result_Call { + _c.Call.Return(iD, err) + return _c +} + +func (_c *ObjectWriter_Result_Call) RunAndReturn(run func() (udmrepo.ID, error)) *ObjectWriter_Result_Call { + _c.Call.Return(run) + return _c +} + +// Write provides a mock function for the type ObjectWriter +func (_mock *ObjectWriter) Write(p []byte) (int, error) { + ret := _mock.Called(p) + + if len(ret) == 0 { + panic("no return value specified for Write") + } + + var r0 int + var r1 error + if returnFunc, ok := ret.Get(0).(func([]byte) (int, error)); ok { + return returnFunc(p) + } + if returnFunc, ok := ret.Get(0).(func([]byte) int); ok { + r0 = returnFunc(p) + } else { + r0 = ret.Get(0).(int) + } + if returnFunc, ok := ret.Get(1).(func([]byte) error); ok { + r1 = returnFunc(p) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// ObjectWriter_Write_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Write' +type ObjectWriter_Write_Call struct { + *mock.Call +} + +// Write is a helper method to define mock.On call +// - p []byte +func (_e *ObjectWriter_Expecter) Write(p interface{}) *ObjectWriter_Write_Call { + return &ObjectWriter_Write_Call{Call: _e.mock.On("Write", p)} +} + +func (_c *ObjectWriter_Write_Call) Run(run func(p []byte)) *ObjectWriter_Write_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 []byte + if args[0] != nil { + arg0 = args[0].([]byte) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *ObjectWriter_Write_Call) Return(n int, err error) *ObjectWriter_Write_Call { + _c.Call.Return(n, err) + return _c +} + +func (_c *ObjectWriter_Write_Call) RunAndReturn(run func(p []byte) (int, error)) *ObjectWriter_Write_Call { + _c.Call.Return(run) + return _c +} + +// WriteAt provides a mock function for the type ObjectWriter +func (_mock *ObjectWriter) WriteAt(p []byte, off int64) (int, error) { + ret := _mock.Called(p, off) + + if len(ret) == 0 { + panic("no return value specified for WriteAt") + } + + var r0 int + var r1 error + if returnFunc, ok := ret.Get(0).(func([]byte, int64) (int, error)); ok { + return returnFunc(p, off) + } + if returnFunc, ok := ret.Get(0).(func([]byte, int64) int); ok { + r0 = returnFunc(p, off) + } else { + r0 = ret.Get(0).(int) + } + if returnFunc, ok := ret.Get(1).(func([]byte, int64) error); ok { + r1 = returnFunc(p, off) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// ObjectWriter_WriteAt_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WriteAt' +type ObjectWriter_WriteAt_Call struct { + *mock.Call +} + +// WriteAt is a helper method to define mock.On call +// - p []byte +// - off int64 +func (_e *ObjectWriter_Expecter) WriteAt(p interface{}, off interface{}) *ObjectWriter_WriteAt_Call { + return &ObjectWriter_WriteAt_Call{Call: _e.mock.On("WriteAt", p, off)} +} + +func (_c *ObjectWriter_WriteAt_Call) Run(run func(p []byte, off int64)) *ObjectWriter_WriteAt_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 []byte + if args[0] != nil { + arg0 = args[0].([]byte) + } + var arg1 int64 + if args[1] != nil { + arg1 = args[1].(int64) + } + run( + arg0, + arg1, + ) + }) + return _c +} + +func (_c *ObjectWriter_WriteAt_Call) Return(n int, err error) *ObjectWriter_WriteAt_Call { + _c.Call.Return(n, err) + return _c +} + +func (_c *ObjectWriter_WriteAt_Call) RunAndReturn(run func(p []byte, off int64) (int, error)) *ObjectWriter_WriteAt_Call { + _c.Call.Return(run) + return _c +} diff --git a/pkg/repository/udmrepo/repo.go b/pkg/repository/udmrepo/repo.go index 1e7e4d011..095d18973 100644 --- a/pkg/repository/udmrepo/repo.go +++ b/pkg/repository/udmrepo/repo.go @@ -62,19 +62,41 @@ const ( // ObjectWriteOptions defines the options when creating an object for write type ObjectWriteOptions struct { - FullPath string // Full logical path of the object - DataType int // OBJECT_DATA_TYPE_* - Description string // A description of the object, could be empty - Prefix ID // A prefix of the name used to save the object - AccessMode int // OBJECT_DATA_ACCESS_* - BackupMode int // OBJECT_DATA_BACKUP_* - AsyncWrites int // Num of async writes for the object, 0 means no async write + FullPath string // Full logical path of the object + DataType int // OBJECT_DATA_TYPE_* + Description string // A description of the object, could be empty + Prefix ID // A prefix of the name used to save the object + AccessMode int // OBJECT_DATA_ACCESS_* + BackupMode int // OBJECT_DATA_BACKUP_* + AsyncWrites int // Num of async writes for the object, 0 means no async write + ParentObject ID // The object in the previous snapshot, for incremental backup } type AdvancedFeatureInfo struct { MultiPartBackup bool // if set to true, it means the repo supports multiple-part backup } +type ObjectMetadata struct { + ID ID + Type int // OBJECT_DATA_TYPE_* + Size int64 +} + +type Metadata struct { + SubObjects []ObjectMetadata // For dir metadata only, the sub objects in this dir. + ExtraDataLen int // Extra data associated to this metadata. + ExtraData []byte +} + +type Snapshot struct { + Source string + Description string + StartTime time.Time + EndTime time.Time + Tags map[string]string + RootObject ID +} + // BackupRepoService is used to initialize, open or maintain a backup repository type BackupRepoService interface { // Create creates a new backup repository. @@ -119,7 +141,14 @@ type BackupRepo interface { // NewObjectWriter creates a new object and return the object's writer interface. // return: A unified identifier of the object on success. - NewObjectWriter(ctx context.Context, opt ObjectWriteOptions) ObjectWriter + NewObjectWriter(ctx context.Context, opt ObjectWriteOptions) (ObjectWriter, error) + + // WriteMetadata writes metadata to the repo, metadata is used to describe data, e.g., file system + // dirs are saved as metadata + WriteMetadata(ctx context.Context, meta *Metadata, opt ObjectWriteOptions) (ID, error) + + // ReadMetadata reads a metadata from repo by the metadata's object ID + ReadMetadata(ctx context.Context, id ID) (*Metadata, error) // PutManifest saves a manifest object into the backup repository. PutManifest(ctx context.Context, mani RepoManifest) (ID, error) @@ -139,6 +168,15 @@ type BackupRepo interface { // Time returns the local time of the backup repository. It may be different from the time of the caller Time() time.Time + // SaveSnapshot saves a repo snapshot + SaveSnapshot(ctx context.Context, snapshot Snapshot) (ID, error) + + // GetSnapshot returns a repo snapshot from snapshot ID + GetSnapshot(ctx context.Context, id ID) (Snapshot, error) + + // DeleteSnapshot deletes a repo snapshot + DeleteSnapshot(ctx context.Context, id ID) error + // Close closes the backup repository Close(ctx context.Context) error } @@ -154,8 +192,8 @@ type ObjectReader interface { type ObjectWriter interface { io.WriteCloser - // Seeker is used in the cases that the object is not written sequentially - io.Seeker + // WriterAt is used in the cases that the object is not written sequentially + io.WriterAt // Checkpoint is periodically called to preserve the state of data written to the repo so far. // Checkpoint returns a unified identifier that represent the current state. diff --git a/pkg/restore/actions/csi/volumesnapshot_action.go b/pkg/restore/actions/csi/volumesnapshot_action.go index 6d4bc1eda..dec33d4ef 100644 --- a/pkg/restore/actions/csi/volumesnapshot_action.go +++ b/pkg/restore/actions/csi/volumesnapshot_action.go @@ -17,11 +17,16 @@ limitations under the License. package csi import ( + "context" "fmt" + volumegroupsnapshotv1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" + corev1api "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" crclient "sigs.k8s.io/controller-runtime/pkg/client" @@ -65,6 +70,165 @@ func resetVolumeSnapshotAnnotation(vs *snapshotv1api.VolumeSnapshot) { string(snapshotv1api.VolumeSnapshotContentRetain) } +// ensureStubVGSCExists creates a stub VolumeGroupSnapshotContent if the snapshot +// was created as part of a VolumeGroupSnapshot. This is needed for CSI drivers +// like Ceph RBD that populate volumeGroupSnapshotHandle on pre-provisioned snapshots. +// The CSI snapshot controller requires a VGSC with matching handle to exist. +func (p *volumeSnapshotRestoreItemAction) ensureStubVGSCExists( + ctx context.Context, + vs *snapshotv1api.VolumeSnapshot, + restore *velerov1api.Restore, +) error { + vgsh, ok := vs.Annotations[velerov1api.VolumeGroupSnapshotHandleAnnotation] + if !ok || vgsh == "" { + // No VolumeGroupSnapshotHandle, nothing to do + return nil + } + + snapshotHandle, ok := vs.Annotations[velerov1api.VolumeSnapshotHandleAnnotation] + if !ok || snapshotHandle == "" { + p.log.Warnf("VS %s/%s has VolumeGroupSnapshotHandle but no SnapshotHandle annotation", + vs.Namespace, vs.Name) + return nil + } + + driver, ok := vs.Annotations[velerov1api.DriverNameAnnotation] + if !ok || driver == "" { + p.log.Warnf("VS %s/%s has VolumeGroupSnapshotHandle but no Driver annotation", + vs.Namespace, vs.Name) + return nil + } + + // Generate a deterministic name for the stub VGSC based on the group handle + vgscName := util.GenerateSha256FromRestoreUIDAndVsName(string(restore.UID), vgsh) + + // Check if VGSC already exists + existingVGSC := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{} + err := p.crClient.Get(ctx, crclient.ObjectKey{Name: vgscName}, existingVGSC) + if err == nil { + // VGSC already exists, add this snapshot handle if not already present + p.log.Infof("Stub VGSC %s already exists for VolumeGroupSnapshotHandle %s", vgscName, vgsh) + return p.addSnapshotHandleToVGSC(ctx, existingVGSC, snapshotHandle) + } + if !apierrors.IsNotFound(err) { + return errors.Wrapf(err, "failed to check for existing VGSC %s", vgscName) + } + + // Create stub VGSC + p.log.Infof("Creating stub VGSC %s for VolumeGroupSnapshotHandle %s", vgscName, vgsh) + + // Look up VolumeGroupSnapshotClass to get secret annotations + vgscAnnotations := map[string]string{} + vgscList := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotClassList{} + if err := p.crClient.List(ctx, vgscList); err == nil { + for _, vgsClass := range vgscList.Items { + if vgsClass.Driver == driver { + // Found matching class, extract secret parameters + if secretName, ok := vgsClass.Parameters["csi.storage.k8s.io/group-snapshotter-secret-name"]; ok { + vgscAnnotations["groupsnapshot.storage.kubernetes.io/deletion-secret-name"] = secretName + } + if secretNS, ok := vgsClass.Parameters["csi.storage.k8s.io/group-snapshotter-secret-namespace"]; ok { + vgscAnnotations["groupsnapshot.storage.kubernetes.io/deletion-secret-namespace"] = secretNS + } + break + } + } + } + + vgsc := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{ + ObjectMeta: metav1.ObjectMeta{ + Name: vgscName, + Labels: map[string]string{ + velerov1api.RestoreNameLabel: restore.Name, + }, + Annotations: vgscAnnotations, + }, + Spec: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSpec{ + DeletionPolicy: snapshotv1api.VolumeSnapshotContentRetain, + Driver: driver, + Source: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSource{ + GroupSnapshotHandles: &volumegroupsnapshotv1beta2.GroupSnapshotHandles{ + VolumeGroupSnapshotHandle: vgsh, + VolumeSnapshotHandles: []string{snapshotHandle}, + }, + }, + VolumeGroupSnapshotRef: corev1api.ObjectReference{ + Name: "stub-vgs-" + vgscName[:8], + Namespace: vs.Namespace, + }, + }, + } + + if err := p.crClient.Create(ctx, vgsc); err != nil { + if apierrors.IsAlreadyExists(err) { + // Another VS restore created the VGSC between our Get and Create. + // Re-fetch and add our snapshot handle. + p.log.Infof("Stub VGSC %s was created by another VS restore, adding our handle", vgscName) + raceVGSC := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{} + if getErr := p.crClient.Get(ctx, crclient.ObjectKey{Name: vgscName}, raceVGSC); getErr != nil { + return errors.Wrapf(getErr, "failed to get VGSC %s after race", vgscName) + } + return p.addSnapshotHandleToVGSC(ctx, raceVGSC, snapshotHandle) + } + return errors.Wrapf(err, "failed to create stub VGSC %s", vgscName) + } + + // Re-fetch to get server-assigned metadata (resourceVersion) needed for patching + createdVGSC := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{} + if err := p.crClient.Get(ctx, crclient.ObjectKey{Name: vgscName}, createdVGSC); err != nil { + p.log.Warnf("Failed to fetch stub VGSC %s for status patch: %v", vgscName, err) + return nil + } + + // Set volumeGroupSnapshotHandle in status using Patch to avoid conflicts with the CSI controller. + patchBase := createdVGSC.DeepCopy() + if createdVGSC.Status == nil { + createdVGSC.Status = &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentStatus{} + } + createdVGSC.Status.VolumeGroupSnapshotHandle = &vgsh + if err := p.crClient.Status().Patch(ctx, createdVGSC, crclient.MergeFrom(patchBase)); err != nil { + p.log.Warnf("Failed to patch stub VGSC %s status: %v", vgscName, err) + } + + p.log.Infof("Successfully created stub VGSC %s", vgscName) + return nil +} + +// addSnapshotHandleToVGSC adds a snapshot handle to an existing VGSC if not already present. +// This is needed when multiple VolumeSnapshots from the same VolumeGroupSnapshot are restored. +func (p *volumeSnapshotRestoreItemAction) addSnapshotHandleToVGSC( + ctx context.Context, + vgsc *volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent, + snapshotHandle string, +) error { + // Check if handle is already in the list + if vgsc.Spec.Source.GroupSnapshotHandles != nil { + for _, handle := range vgsc.Spec.Source.GroupSnapshotHandles.VolumeSnapshotHandles { + if handle == snapshotHandle { + p.log.Infof("Snapshot handle %s already present in VGSC %s", snapshotHandle, vgsc.Name) + return nil + } + } + } + + // Add the snapshot handle to the list + patchBase := vgsc.DeepCopy() + if vgsc.Spec.Source.GroupSnapshotHandles == nil { + vgsc.Spec.Source.GroupSnapshotHandles = &volumegroupsnapshotv1beta2.GroupSnapshotHandles{} + } + vgsc.Spec.Source.GroupSnapshotHandles.VolumeSnapshotHandles = append( + vgsc.Spec.Source.GroupSnapshotHandles.VolumeSnapshotHandles, + snapshotHandle, + ) + + if err := p.crClient.Patch(ctx, vgsc, crclient.MergeFrom(patchBase)); err != nil { + return errors.Wrapf(err, "failed to add snapshot handle to VGSC %s", vgsc.Name) + } + + p.log.Infof("Added snapshot handle %s to existing VGSC %s", snapshotHandle, vgsc.Name) + return nil +} + func (p *volumeSnapshotRestoreItemAction) Execute( input *velero.RestoreItemActionExecuteInput, ) (*velero.RestoreItemActionExecuteOutput, error) { @@ -90,6 +254,13 @@ func (p *volumeSnapshotRestoreItemAction) Execute( errors.Wrapf(err, "failed to convert input.Item from unstructured") } + // Create stub VGSC if this snapshot was created via VolumeGroupSnapshot + // This must happen before VSC is created, as the CSI controller requires VGSC to exist + if err := p.ensureStubVGSCExists(context.Background(), &vsFromBackup, input.Restore); err != nil { + p.log.Warnf("Failed to create stub VGSC for VS %s/%s: %v", vsFromBackup.Namespace, vsFromBackup.Name, err) + // Continue with restore, VGSC creation failure should not block restore + } + generatedName := util.GenerateSha256FromRestoreUIDAndVsName(string(input.Restore.UID), vsFromBackup.Name) // Reset Spec to convert the VolumeSnapshot from using diff --git a/pkg/restore/actions/csi/volumesnapshot_action_test.go b/pkg/restore/actions/csi/volumesnapshot_action_test.go index 4fb37e301..de3e592c0 100644 --- a/pkg/restore/actions/csi/volumesnapshot_action_test.go +++ b/pkg/restore/actions/csi/volumesnapshot_action_test.go @@ -17,9 +17,11 @@ limitations under the License. package csi import ( + "context" "fmt" "testing" + volumegroupsnapshotv1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" @@ -27,6 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" + crclient "sigs.k8s.io/controller-runtime/pkg/client" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" "github.com/vmware-tanzu/velero/pkg/builder" @@ -219,3 +222,244 @@ func TestNewVolumeSnapshotRestoreItemAction(t *testing.T) { _, err1 := plugin1(logger) require.NoError(t, err1) } + +func TestEnsureStubVGSCExists(t *testing.T) { + testDriver := "rbd.csi.ceph.com" + testVGSHandle := "vgs-handle-123" + testSnapshotHandle := "snap-handle-456" + + tests := []struct { + name string + vs *snapshotv1api.VolumeSnapshot + restore *velerov1api.Restore + existingVGSC *volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent + expectVGSC bool + expectErr bool + expectedHandle string + }{ + { + name: "VS without VolumeGroupSnapshotHandle annotation - no VGSC created", + vs: &snapshotv1api.VolumeSnapshot{ + ObjectMeta: metav1.ObjectMeta{ + Name: "test-vs", + Namespace: "test-ns", + Annotations: map[string]string{ + velerov1api.VolumeSnapshotHandleAnnotation: testSnapshotHandle, + velerov1api.DriverNameAnnotation: testDriver, + }, + }, + }, + restore: builder.ForRestore("velero", "restore").ObjectMeta(builder.WithUID("restore-uid")).Result(), + expectVGSC: false, + expectErr: false, + }, + { + name: "VS with VolumeGroupSnapshotHandle but no SnapshotHandle - no VGSC created", + vs: &snapshotv1api.VolumeSnapshot{ + ObjectMeta: metav1.ObjectMeta{ + Name: "test-vs", + Namespace: "test-ns", + Annotations: map[string]string{ + velerov1api.VolumeGroupSnapshotHandleAnnotation: testVGSHandle, + velerov1api.DriverNameAnnotation: testDriver, + }, + }, + }, + restore: builder.ForRestore("velero", "restore").ObjectMeta(builder.WithUID("restore-uid")).Result(), + expectVGSC: false, + expectErr: false, + }, + { + name: "VS with VolumeGroupSnapshotHandle but no Driver annotation - no VGSC created", + vs: &snapshotv1api.VolumeSnapshot{ + ObjectMeta: metav1.ObjectMeta{ + Name: "test-vs", + Namespace: "test-ns", + Annotations: map[string]string{ + velerov1api.VolumeGroupSnapshotHandleAnnotation: testVGSHandle, + velerov1api.VolumeSnapshotHandleAnnotation: testSnapshotHandle, + }, + }, + }, + restore: builder.ForRestore("velero", "restore").ObjectMeta(builder.WithUID("restore-uid")).Result(), + expectVGSC: false, + expectErr: false, + }, + { + name: "VS with all required annotations - VGSC should be created", + vs: &snapshotv1api.VolumeSnapshot{ + ObjectMeta: metav1.ObjectMeta{ + Name: "test-vs", + Namespace: "test-ns", + Annotations: map[string]string{ + velerov1api.VolumeGroupSnapshotHandleAnnotation: testVGSHandle, + velerov1api.VolumeSnapshotHandleAnnotation: testSnapshotHandle, + velerov1api.DriverNameAnnotation: testDriver, + }, + }, + }, + restore: builder.ForRestore("velero", "restore").ObjectMeta(builder.WithUID("restore-uid")).Result(), + expectVGSC: true, + expectErr: false, + expectedHandle: testSnapshotHandle, + }, + { + name: "VGSC already exists - should add snapshot handle", + vs: &snapshotv1api.VolumeSnapshot{ + ObjectMeta: metav1.ObjectMeta{ + Name: "test-vs-2", + Namespace: "test-ns", + Annotations: map[string]string{ + velerov1api.VolumeGroupSnapshotHandleAnnotation: testVGSHandle, + velerov1api.VolumeSnapshotHandleAnnotation: "snap-handle-789", + velerov1api.DriverNameAnnotation: testDriver, + }, + }, + }, + restore: builder.ForRestore("velero", "restore").ObjectMeta(builder.WithUID("restore-uid")).Result(), + existingVGSC: &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{ + ObjectMeta: metav1.ObjectMeta{ + Name: util.GenerateSha256FromRestoreUIDAndVsName("restore-uid", testVGSHandle), + }, + Spec: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSpec{ + Driver: testDriver, + DeletionPolicy: snapshotv1api.VolumeSnapshotContentRetain, + Source: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSource{ + GroupSnapshotHandles: &volumegroupsnapshotv1beta2.GroupSnapshotHandles{ + VolumeGroupSnapshotHandle: testVGSHandle, + VolumeSnapshotHandles: []string{testSnapshotHandle}, + }, + }, + }, + }, + expectVGSC: true, + expectErr: false, + expectedHandle: "snap-handle-789", + }, + } + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + crClient := velerotest.NewFakeControllerRuntimeClient(t) + + // Create existing VGSC if provided + if tc.existingVGSC != nil { + require.NoError(t, crClient.Create(context.Background(), tc.existingVGSC)) + } + + p := &volumeSnapshotRestoreItemAction{ + log: logrus.StandardLogger(), + crClient: crClient, + } + + err := p.ensureStubVGSCExists(context.Background(), tc.vs, tc.restore) + + if tc.expectErr { + require.Error(t, err) + return + } + require.NoError(t, err) + + // Check if VGSC was created/updated + vgscName := util.GenerateSha256FromRestoreUIDAndVsName(string(tc.restore.UID), tc.vs.Annotations[velerov1api.VolumeGroupSnapshotHandleAnnotation]) + vgsc := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{} + getErr := crClient.Get(context.Background(), crclient.ObjectKey{Name: vgscName}, vgsc) + + if tc.expectVGSC { + require.NoError(t, getErr) + require.NotNil(t, vgsc.Spec.Source.GroupSnapshotHandles) + require.Contains(t, vgsc.Spec.Source.GroupSnapshotHandles.VolumeSnapshotHandles, tc.expectedHandle) + } else { + // If no VGSC expected, it's okay if Get returns not found or if vgscName is empty + if tc.vs.Annotations[velerov1api.VolumeGroupSnapshotHandleAnnotation] != "" { + require.Error(t, getErr) + } + } + }) + } +} + +func TestAddSnapshotHandleToVGSC(t *testing.T) { + testDriver := "rbd.csi.ceph.com" + testVGSHandle := "vgs-handle-123" + + tests := []struct { + name string + existingHandles []string + nilGroupSnapshotHandles bool + newHandle string + expectedHandles []string + }{ + { + name: "Add new handle to empty list", + existingHandles: []string{}, + newHandle: "snap-1", + expectedHandles: []string{"snap-1"}, + }, + { + name: "Add new handle to existing list", + existingHandles: []string{"snap-1"}, + newHandle: "snap-2", + expectedHandles: []string{"snap-1", "snap-2"}, + }, + { + name: "Handle already exists - no change", + existingHandles: []string{"snap-1", "snap-2"}, + newHandle: "snap-1", + expectedHandles: []string{"snap-1", "snap-2"}, + }, + { + name: "Nil GroupSnapshotHandles - should initialize and add", + nilGroupSnapshotHandles: true, + newHandle: "snap-1", + expectedHandles: []string{"snap-1"}, + }, + } + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + crClient := velerotest.NewFakeControllerRuntimeClient(t) + + var source volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSource + if tc.nilGroupSnapshotHandles { + source = volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSource{} + } else { + source = volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSource{ + GroupSnapshotHandles: &volumegroupsnapshotv1beta2.GroupSnapshotHandles{ + VolumeGroupSnapshotHandle: testVGSHandle, + VolumeSnapshotHandles: tc.existingHandles, + }, + } + } + + existingVGSC := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{ + ObjectMeta: metav1.ObjectMeta{ + Name: "test-vgsc", + }, + Spec: volumegroupsnapshotv1beta2.VolumeGroupSnapshotContentSpec{ + Driver: testDriver, + DeletionPolicy: snapshotv1api.VolumeSnapshotContentRetain, + Source: source, + }, + } + require.NoError(t, crClient.Create(context.Background(), existingVGSC)) + + // Re-fetch to get the created object with proper metadata + fetchedVGSC := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{} + require.NoError(t, crClient.Get(context.Background(), crclient.ObjectKey{Name: "test-vgsc"}, fetchedVGSC)) + + p := &volumeSnapshotRestoreItemAction{ + log: logrus.StandardLogger(), + crClient: crClient, + } + + err := p.addSnapshotHandleToVGSC(context.Background(), fetchedVGSC, tc.newHandle) + require.NoError(t, err) + + // Verify the VGSC has expected handles + updatedVGSC := &volumegroupsnapshotv1beta2.VolumeGroupSnapshotContent{} + require.NoError(t, crClient.Get(context.Background(), crclient.ObjectKey{Name: "test-vgsc"}, updatedVGSC)) + require.ElementsMatch(t, tc.expectedHandles, updatedVGSC.Spec.Source.GroupSnapshotHandles.VolumeSnapshotHandles) + }) + } +} diff --git a/pkg/restore/actions/csi/volumesnapshotcontent_action.go b/pkg/restore/actions/csi/volumesnapshotcontent_action.go index 0a268eab2..00a25c86f 100644 --- a/pkg/restore/actions/csi/volumesnapshotcontent_action.go +++ b/pkg/restore/actions/csi/volumesnapshotcontent_action.go @@ -17,6 +17,8 @@ limitations under the License. package csi import ( + "context" + snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -108,12 +110,23 @@ func (p *volumeSnapshotContentRestoreItemAction) Execute( return nil, errors.Errorf("fail to get snapshot handle from VSC %s status", vsc.Name) } - if vsc.Spec.VolumeSnapshotClassName != nil { - // Delete VolumeSnapshotClass from the VolumeSnapshotContent. - // This is necessary to make the restore independent of the VolumeSnapshotClass. - vsc.Spec.VolumeSnapshotClassName = nil - p.log.Debugf("Deleted VolumeSnapshotClassName from VolumeSnapshotContent %s to make restore independent of VolumeSnapshotClass", - vsc.Name) + // Look up a VolumeSnapshotClass matching the driver for credential lookup. + // Some CSI drivers (e.g., Ceph RBD) need credentials for snapshot verification. + // Instead of keeping the original class name (which may not exist on target cluster), + // we find a matching class by driver to make restore portable. + vsc.Spec.VolumeSnapshotClassName = nil + vscList := &snapshotv1api.VolumeSnapshotClassList{} + if err := p.client.List(context.Background(), vscList); err == nil { + for i := range vscList.Items { + if vscList.Items[i].Driver == vsc.Spec.Driver { + vsc.Spec.VolumeSnapshotClassName = &vscList.Items[i].Name + p.log.Infof("Set VolumeSnapshotClassName to %s for VSC %s based on driver match", + vscList.Items[i].Name, vsc.Name) + break + } + } + } else { + p.log.Warnf("Failed to list VolumeSnapshotClasses: %v", err) } additionalItems := []velero.ResourceIdentifier{} diff --git a/pkg/restore/actions/pod_volume_restore_action.go b/pkg/restore/actions/pod_volume_restore_action.go index 4e3180fef..e26a53034 100644 --- a/pkg/restore/actions/pod_volume_restore_action.go +++ b/pkg/restore/actions/pod_volume_restore_action.go @@ -101,6 +101,7 @@ func (a *PodVolumeRestoreAction) Execute(input *velero.RestoreItemActionExecuteI opts := &ctrlclient.ListOptions{ LabelSelector: label.NewSelectorForBackup(input.Restore.Spec.BackupName), + Namespace: input.Restore.Namespace, } podVolumeBackupList := new(velerov1api.PodVolumeBackupList) if err := a.crClient.List(context.TODO(), podVolumeBackupList, opts); err != nil { diff --git a/pkg/restore/actions/pod_volume_restore_action_test.go b/pkg/restore/actions/pod_volume_restore_action_test.go index 70911ca37..bc9662ab7 100644 --- a/pkg/restore/actions/pod_volume_restore_action_test.go +++ b/pkg/restore/actions/pod_volume_restore_action_test.go @@ -350,6 +350,28 @@ func TestPodVolumeRestoreActionExecute(t *testing.T) { VolumeMounts(builder.ForVolumeMount("myvol", "/restores/myvol").Result()). Command([]string{"/velero-restore-helper"}).Result()).Result(), }, + { + name: "pod volume backups in a different namespace are ignored when looking for matches due to namespace scoping", + pod: builder.ForPod("ns-1", "my-pod"). + Volumes( + builder.ForVolume("myvol").PersistentVolumeClaimSource("pvc-1").Result(), + ). + Result(), + podVolumeBackups: []runtime.Object{ + builder.ForPodVolumeBackup("other-ns", "pvb-1"). + PodName("my-pod"). + PodNamespace("ns-1"). + Volume("myvol"). + ObjectMeta(builder.WithLabels(velerov1api.BackupNameLabel, backupName)). + SnapshotID("foo"). + Result(), + }, + want: builder.ForPod("ns-1", "my-pod"). + Volumes( + builder.ForVolume("myvol").PersistentVolumeClaimSource("pvc-1").Result(), + ). + Result(), + }, } veleroDeployment := &appsv1api.Deployment{ diff --git a/pkg/test/fake_controller_runtime_client.go b/pkg/test/fake_controller_runtime_client.go index e22220404..90ee95d11 100644 --- a/pkg/test/fake_controller_runtime_client.go +++ b/pkg/test/fake_controller_runtime_client.go @@ -19,7 +19,7 @@ package test import ( "testing" - volumegroupsnapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta1" + volumegroupsnapshotv1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" "github.com/stretchr/testify/require" @@ -45,6 +45,7 @@ func NewFakeControllerRuntimeClientBuilder(t *testing.T) *k8sfake.ClientBuilder require.NoError(t, appsv1api.AddToScheme(scheme)) require.NoError(t, snapshotv1api.AddToScheme(scheme)) require.NoError(t, storagev1api.AddToScheme(scheme)) + require.NoError(t, volumegroupsnapshotv1beta2.AddToScheme(scheme)) return k8sfake.NewClientBuilder().WithScheme(scheme) } @@ -60,7 +61,7 @@ func NewFakeControllerRuntimeClient(t *testing.T, initObjs ...runtime.Object) cl require.NoError(t, snapshotv1api.AddToScheme(scheme)) require.NoError(t, storagev1api.AddToScheme(scheme)) require.NoError(t, batchv1api.AddToScheme(scheme)) - require.NoError(t, volumegroupsnapshotv1beta1.AddToScheme(scheme)) + require.NoError(t, volumegroupsnapshotv1beta2.AddToScheme(scheme)) return k8sfake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(initObjs...).Build() } diff --git a/pkg/uploader/kopia/shim.go b/pkg/uploader/kopia/shim.go index 1b9812d48..f146348fa 100644 --- a/pkg/uploader/kopia/shim.go +++ b/pkg/uploader/kopia/shim.go @@ -183,8 +183,8 @@ func (sr *shimRepository) NewObjectWriter(ctx context.Context, option object.Wri opt.DataType = udmrepo.ObjectDataTypeData } - writer := sr.udmRepo.NewObjectWriter(ctx, opt) - if writer == nil { + writer, err := sr.udmRepo.NewObjectWriter(ctx, opt) + if err != nil || writer == nil { return nil } diff --git a/pkg/uploader/kopia/shim_test.go b/pkg/uploader/kopia/shim_test.go index 69d1605a6..7933ec6b8 100644 --- a/pkg/uploader/kopia/shim_test.go +++ b/pkg/uploader/kopia/shim_test.go @@ -66,7 +66,7 @@ func TestShimRepo(t *testing.T) { backupRepo.On("Flush", mock.Anything).Return(nil) NewShimRepo(backupRepo).Flush(ctx) - backupRepo.On("NewObjectWriter", mock.Anything, mock.Anything).Return(nil) + backupRepo.On("NewObjectWriter", mock.Anything, mock.Anything).Return(nil, nil) NewShimRepo(backupRepo).NewObjectWriter(ctx, object.WriterOptions{}) } diff --git a/pkg/uploader/provider/kopia_test.go b/pkg/uploader/provider/kopia_test.go index 74eaa67f7..734bdb176 100644 --- a/pkg/uploader/provider/kopia_test.go +++ b/pkg/uploader/provider/kopia_test.go @@ -294,6 +294,10 @@ func TestGetPassword(t *testing.T) { } } +type MockCredentialGetter struct { + mock.Mock +} + func (m *MockCredentialGetter) GetCredentials() (string, error) { args := m.Called() return args.String(0), args.Error(1) diff --git a/pkg/uploader/provider/provider.go b/pkg/uploader/provider/provider.go index fe1dd3091..95a34b1a0 100644 --- a/pkg/uploader/provider/provider.go +++ b/pkg/uploader/provider/provider.go @@ -87,6 +87,6 @@ func NewUploaderProvider( if uploaderType == uploader.KopiaType { return NewKopiaUploaderProvider(requesterType, ctx, credGetter, backupRepo, log) } else { - return NewResticUploaderProvider(repoIdentifier, bsl, credGetter, repoKeySelector, log) + return nil, errors.Errorf("unsupported uploader type %v", uploaderType) } } diff --git a/pkg/uploader/provider/provider_test.go b/pkg/uploader/provider/provider_test.go index 199091e32..8f447725b 100644 --- a/pkg/uploader/provider/provider_test.go +++ b/pkg/uploader/provider/provider_test.go @@ -75,7 +75,7 @@ func TestNewUploaderProvider(t *testing.T) { UploaderType: "restic", RequestorType: "requester", needFromFile: true, - ExpectedError: "", + ExpectedError: "unsupported uploader type restic", }, } diff --git a/pkg/uploader/provider/restic.go b/pkg/uploader/provider/restic.go deleted file mode 100644 index 93b907be9..000000000 --- a/pkg/uploader/provider/restic.go +++ /dev/null @@ -1,269 +0,0 @@ -/* -Copyright The Velero Contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package provider - -import ( - "context" - "fmt" - "os" - "strings" - - "github.com/pkg/errors" - "github.com/sirupsen/logrus" - corev1api "k8s.io/api/core/v1" - - "github.com/vmware-tanzu/velero/internal/credentials" - velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" - "github.com/vmware-tanzu/velero/pkg/restic" - "github.com/vmware-tanzu/velero/pkg/uploader" - uploaderutil "github.com/vmware-tanzu/velero/pkg/uploader/util" - "github.com/vmware-tanzu/velero/pkg/util/filesystem" -) - -// resticBackupCMDFunc and resticRestoreCMDFunc are mainly used to make testing more convenient -var resticBackupCMDFunc = restic.BackupCommand -var resticBackupFunc = restic.RunBackup -var resticGetSnapshotFunc = restic.GetSnapshotCommand -var resticGetSnapshotIDFunc = restic.GetSnapshotID -var resticRestoreCMDFunc = restic.RestoreCommand -var resticTempCACertFileFunc = restic.TempCACertFile -var resticCmdEnvFunc = restic.CmdEnv - -type resticProvider struct { - repoIdentifier string - credentialsFile string - caCertFile string - cmdEnv []string - extraFlags []string - bsl *velerov1api.BackupStorageLocation - log logrus.FieldLogger -} - -func NewResticUploaderProvider( - repoIdentifier string, - bsl *velerov1api.BackupStorageLocation, - credGetter *credentials.CredentialGetter, - repoKeySelector *corev1api.SecretKeySelector, - log logrus.FieldLogger, -) (Provider, error) { - provider := resticProvider{ - repoIdentifier: repoIdentifier, - bsl: bsl, - log: log, - } - - var err error - provider.credentialsFile, err = credGetter.FromFile.Path(repoKeySelector) - if err != nil { - return nil, errors.Wrap(err, "error creating temp restic credentials file") - } - - // if there's a caCert on the ObjectStorage, write it to disk so that it can be passed to restic - if bsl.Spec.ObjectStorage != nil { - var caCertData []byte - - // Try CACertRef first (new method), then fall back to CACert (deprecated) - if bsl.Spec.ObjectStorage.CACertRef != nil { - caCertString, err := credGetter.FromSecret.Get(bsl.Spec.ObjectStorage.CACertRef) - if err != nil { - return nil, errors.Wrap(err, "error getting CA certificate from secret") - } - caCertData = []byte(caCertString) - } else if bsl.Spec.ObjectStorage.CACert != nil { - caCertData = bsl.Spec.ObjectStorage.CACert - } - - if caCertData != nil { - provider.caCertFile, err = resticTempCACertFileFunc(caCertData, bsl.Name, filesystem.NewFileSystem()) - if err != nil { - return nil, errors.Wrap(err, "error create temp cert file") - } - } - } - - provider.cmdEnv, err = resticCmdEnvFunc(bsl, credGetter.FromFile) - if err != nil { - return nil, errors.Wrap(err, "error generating repository cmnd env") - } - - // #4820: restrieve insecureSkipTLSVerify from BSL configuration for - // AWS plugin. If nothing is return, that means insecureSkipTLSVerify - // is not enable for Restic command. - skipTLSRet := restic.GetInsecureSkipTLSVerifyFromBSL(bsl, log) - if len(skipTLSRet) > 0 { - provider.extraFlags = append(provider.extraFlags, skipTLSRet) - } - - return &provider, nil -} - -func (rp *resticProvider) Close(ctx context.Context) error { - _, err := os.Stat(rp.credentialsFile) - if err == nil { - return os.Remove(rp.credentialsFile) - } else if !os.IsNotExist(err) { - return errors.Errorf("failed to get file %s info with error %v", rp.credentialsFile, err) - } - - _, err = os.Stat(rp.caCertFile) - if err == nil { - return os.Remove(rp.caCertFile) - } else if !os.IsNotExist(err) { - return errors.Errorf("failed to get file %s info with error %v", rp.caCertFile, err) - } - return nil -} - -// RunBackup runs a `backup` command and watches the output to provide -// progress updates to the caller and return snapshotID, isEmptySnapshot, error -func (rp *resticProvider) RunBackup( - ctx context.Context, - path string, - realSource string, - tags map[string]string, - forceFull bool, - parentSnapshot string, - volMode uploader.PersistentVolumeMode, - uploaderCfg map[string]string, - updater uploader.ProgressUpdater) (string, bool, int64, int64, error) { - if updater == nil { - return "", false, 0, 0, errors.New("Need to initial backup progress updater first") - } - - if path == "" { - return "", false, 0, 0, errors.New("path is empty") - } - - if realSource != "" { - return "", false, 0, 0, errors.New("real source is not empty, this is not supported by restic uploader") - } - - if volMode == uploader.PersistentVolumeBlock { - return "", false, 0, 0, errors.New("unable to support block mode") - } - - log := rp.log.WithFields(logrus.Fields{ - "path": path, - "parentSnapshot": parentSnapshot, - }) - - if len(uploaderCfg) > 0 { - parallelFilesUpload, err := uploaderutil.GetParallelFilesUpload(uploaderCfg) - if err != nil { - return "", false, 0, 0, errors.Wrap(err, "failed to get uploader config") - } - if parallelFilesUpload > 0 { - log.Warnf("ParallelFilesUpload is set to %d, but restic does not support parallel file uploads. Ignoring.", parallelFilesUpload) - } - } - - backupCmd := resticBackupCMDFunc(rp.repoIdentifier, rp.credentialsFile, path, tags) - backupCmd.Env = rp.cmdEnv - backupCmd.CACertFile = rp.caCertFile - if len(rp.extraFlags) != 0 { - backupCmd.ExtraFlags = append(backupCmd.ExtraFlags, rp.extraFlags...) - } - - if parentSnapshot != "" { - backupCmd.ExtraFlags = append(backupCmd.ExtraFlags, fmt.Sprintf("--parent=%s", parentSnapshot)) - } - - summary, stderrBuf, err := resticBackupFunc(backupCmd, log, updater) - if err != nil { - if strings.Contains(stderrBuf, "snapshot is empty") { - log.Debugf("Restic backup got empty dir with %s path", path) - return "", true, 0, 0, nil - } - return "", false, 0, 0, errors.WithStack(fmt.Errorf("error running restic backup command %s with error: %v stderr: %v", backupCmd.String(), err, stderrBuf)) - } - // GetSnapshotID - snapshotIDCmd := resticGetSnapshotFunc(rp.repoIdentifier, rp.credentialsFile, tags) - snapshotIDCmd.Env = rp.cmdEnv - snapshotIDCmd.CACertFile = rp.caCertFile - if len(rp.extraFlags) != 0 { - snapshotIDCmd.ExtraFlags = append(snapshotIDCmd.ExtraFlags, rp.extraFlags...) - } - snapshotID, err := resticGetSnapshotIDFunc(snapshotIDCmd) - if err != nil { - return "", false, 0, 0, errors.WithStack(fmt.Errorf("error getting snapshot id with error: %v", err)) - } - log.Infof("Run command=%s, stdout=%s, stderr=%s", backupCmd.String(), summary, stderrBuf) - return snapshotID, false, 0, 0, nil -} - -// RunRestore runs a `restore` command and monitors the volume size to -// provide progress updates to the caller. -func (rp *resticProvider) RunRestore( - ctx context.Context, - snapshotID string, - volumePath string, - volMode uploader.PersistentVolumeMode, - uploaderCfg map[string]string, - updater uploader.ProgressUpdater) (int64, error) { - if updater == nil { - return 0, errors.New("Need to initial backup progress updater first") - } - log := rp.log.WithFields(logrus.Fields{ - "snapshotID": snapshotID, - "volumePath": volumePath, - }) - - if volMode == uploader.PersistentVolumeBlock { - return 0, errors.New("unable to support block mode") - } - - restoreCmd := resticRestoreCMDFunc(rp.repoIdentifier, rp.credentialsFile, snapshotID, volumePath) - restoreCmd.Env = rp.cmdEnv - restoreCmd.CACertFile = rp.caCertFile - if len(rp.extraFlags) != 0 { - restoreCmd.ExtraFlags = append(restoreCmd.ExtraFlags, rp.extraFlags...) - } - - extraFlags, err := rp.parseRestoreExtraFlags(uploaderCfg) - if err != nil { - return 0, errors.Wrap(err, "failed to parse uploader config") - } else if len(extraFlags) != 0 { - restoreCmd.ExtraFlags = append(restoreCmd.ExtraFlags, extraFlags...) - } - - stdout, stderr, err := restic.RunRestore(restoreCmd, log, updater) - - log.Infof("Run command=%v, stdout=%s, stderr=%s", restoreCmd, stdout, stderr) - return 0, err -} - -func (rp *resticProvider) parseRestoreExtraFlags(uploaderCfg map[string]string) ([]string, error) { - extraFlags := []string{} - if len(uploaderCfg) == 0 { - return extraFlags, nil - } - - writeSparseFiles, err := uploaderutil.GetWriteSparseFiles(uploaderCfg) - if err != nil { - return extraFlags, errors.Wrap(err, "failed to get uploader config") - } - - if writeSparseFiles { - extraFlags = append(extraFlags, "--sparse") - } - - if restoreConcurrency, err := uploaderutil.GetRestoreConcurrency(uploaderCfg); err == nil && restoreConcurrency > 0 { - return extraFlags, errors.New("restic does not support parallel restore") - } - - return extraFlags, nil -} diff --git a/pkg/uploader/provider/restic_test.go b/pkg/uploader/provider/restic_test.go deleted file mode 100644 index 24eb11e04..000000000 --- a/pkg/uploader/provider/restic_test.go +++ /dev/null @@ -1,464 +0,0 @@ -/* -Copyright The Velero Contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package provider - -import ( - "errors" - "os" - "reflect" - "strings" - "testing" - - "github.com/sirupsen/logrus" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/require" - corev1api "k8s.io/api/core/v1" - "sigs.k8s.io/controller-runtime/pkg/client/fake" - - "github.com/vmware-tanzu/velero/internal/credentials" - velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" - "github.com/vmware-tanzu/velero/pkg/builder" - "github.com/vmware-tanzu/velero/pkg/restic" - "github.com/vmware-tanzu/velero/pkg/uploader" - "github.com/vmware-tanzu/velero/pkg/util" - "github.com/vmware-tanzu/velero/pkg/util/filesystem" -) - -func TestResticRunBackup(t *testing.T) { - testCases := []struct { - name string - nilUpdater bool - parentSnapshot string - rp *resticProvider - volMode uploader.PersistentVolumeMode - hookBackupFunc func(string, string, string, map[string]string) *restic.Command - hookResticBackupFunc func(*restic.Command, logrus.FieldLogger, uploader.ProgressUpdater) (string, string, error) - hookResticGetSnapshotFunc func(string, string, map[string]string) *restic.Command - hookResticGetSnapshotIDFunc func(*restic.Command) (string, error) - errorHandleFunc func(err error) bool - }{ - { - name: "nil uploader", - rp: &resticProvider{log: logrus.New()}, - nilUpdater: true, - hookBackupFunc: func(repoIdentifier string, passwordFile string, path string, tags map[string]string) *restic.Command { - return &restic.Command{Command: "date"} - }, - errorHandleFunc: func(err error) bool { - return strings.Contains(err.Error(), "Need to initial backup progress updater first") - }, - }, - { - name: "wrong restic execute command", - rp: &resticProvider{log: logrus.New()}, - hookBackupFunc: func(repoIdentifier string, passwordFile string, path string, tags map[string]string) *restic.Command { - return &restic.Command{Command: "date"} - }, - errorHandleFunc: func(err error) bool { - return strings.Contains(err.Error(), "error running") - }, - }, { - name: "has parent snapshot", - rp: &resticProvider{log: logrus.New()}, - parentSnapshot: "parentSnapshot", - hookBackupFunc: func(repoIdentifier string, passwordFile string, path string, tags map[string]string) *restic.Command { - return &restic.Command{Command: "date"} - }, - hookResticBackupFunc: func(*restic.Command, logrus.FieldLogger, uploader.ProgressUpdater) (string, string, error) { - return "", "", nil - }, - - hookResticGetSnapshotIDFunc: func(*restic.Command) (string, error) { return "test-snapshot-id", nil }, - errorHandleFunc: func(err error) bool { - return err == nil - }, - }, - { - name: "has extra flags", - rp: &resticProvider{log: logrus.New(), extraFlags: []string{"testFlags"}}, - hookBackupFunc: func(string, string, string, map[string]string) *restic.Command { - return &restic.Command{Command: "date"} - }, - hookResticBackupFunc: func(*restic.Command, logrus.FieldLogger, uploader.ProgressUpdater) (string, string, error) { - return "", "", nil - }, - hookResticGetSnapshotIDFunc: func(*restic.Command) (string, error) { return "test-snapshot-id", nil }, - errorHandleFunc: func(err error) bool { - return err == nil - }, - }, - { - name: "failed to get snapshot id", - rp: &resticProvider{log: logrus.New(), extraFlags: []string{"testFlags"}}, - hookBackupFunc: func(string, string, string, map[string]string) *restic.Command { - return &restic.Command{Command: "date"} - }, - hookResticBackupFunc: func(*restic.Command, logrus.FieldLogger, uploader.ProgressUpdater) (string, string, error) { - return "", "", nil - }, - hookResticGetSnapshotIDFunc: func(*restic.Command) (string, error) { - return "test-snapshot-id", errors.New("failed to get snapshot id") - }, - errorHandleFunc: func(err error) bool { - return strings.Contains(err.Error(), "failed to get snapshot id") - }, - }, - { - name: "failed to use block mode", - rp: &resticProvider{log: logrus.New(), extraFlags: []string{"testFlags"}}, - volMode: uploader.PersistentVolumeBlock, - errorHandleFunc: func(err error) bool { - return strings.Contains(err.Error(), "unable to support block mode") - }, - }, - } - - for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - var err error - parentSnapshot := tc.parentSnapshot - if tc.hookBackupFunc != nil { - resticBackupCMDFunc = tc.hookBackupFunc - } - if tc.hookResticBackupFunc != nil { - resticBackupFunc = tc.hookResticBackupFunc - } - if tc.hookResticGetSnapshotFunc != nil { - resticGetSnapshotFunc = tc.hookResticGetSnapshotFunc - } - if tc.hookResticGetSnapshotIDFunc != nil { - resticGetSnapshotIDFunc = tc.hookResticGetSnapshotIDFunc - } - if tc.volMode == "" { - tc.volMode = uploader.PersistentVolumeFilesystem - } - if !tc.nilUpdater { - updater := FakeBackupProgressUpdater{PodVolumeBackup: &velerov1api.PodVolumeBackup{}, Log: tc.rp.log, Ctx: t.Context(), Cli: fake.NewClientBuilder().WithScheme(util.VeleroScheme).Build()} - _, _, _, _, err = tc.rp.RunBackup(t.Context(), "var", "", map[string]string{}, false, parentSnapshot, tc.volMode, map[string]string{}, &updater) - } else { - _, _, _, _, err = tc.rp.RunBackup(t.Context(), "var", "", map[string]string{}, false, parentSnapshot, tc.volMode, map[string]string{}, nil) - } - - tc.rp.log.Infof("test name %v error %v", tc.name, err) - require.True(t, tc.errorHandleFunc(err)) - }) - } -} - -func TestResticRunRestore(t *testing.T) { - resticRestoreCMDFunc = func(repoIdentifier, passwordFile, snapshotID, target string) *restic.Command { - return &restic.Command{Args: []string{""}} - } - testCases := []struct { - name string - rp *resticProvider - nilUpdater bool - hookResticRestoreFunc func(repoIdentifier, passwordFile, snapshotID, target string) *restic.Command - errorHandleFunc func(err error) bool - volMode uploader.PersistentVolumeMode - }{ - { - name: "wrong restic execute command", - rp: &resticProvider{log: logrus.New()}, - nilUpdater: true, - errorHandleFunc: func(err error) bool { - return strings.Contains(err.Error(), "Need to initial backup progress updater first") - }, - }, - { - name: "has extral flags", - rp: &resticProvider{log: logrus.New(), extraFlags: []string{"test-extra-flags"}}, - hookResticRestoreFunc: func(repoIdentifier, passwordFile, snapshotID, target string) *restic.Command { - return &restic.Command{Args: []string{"date"}} - }, - errorHandleFunc: func(err error) bool { - return strings.Contains(err.Error(), "error running command") - }, - }, - { - name: "wrong restic execute command", - rp: &resticProvider{log: logrus.New()}, - hookResticRestoreFunc: func(repoIdentifier, passwordFile, snapshotID, target string) *restic.Command { - return &restic.Command{Args: []string{"date"}} - }, - errorHandleFunc: func(err error) bool { - return strings.Contains(err.Error(), "error running command") - }, - }, - { - name: "error block volume mode", - rp: &resticProvider{log: logrus.New()}, - errorHandleFunc: func(err error) bool { - return strings.Contains(err.Error(), "unable to support block mode") - }, - volMode: uploader.PersistentVolumeBlock, - }, - } - - for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - if tc.volMode == "" { - tc.volMode = uploader.PersistentVolumeFilesystem - } - resticRestoreCMDFunc = tc.hookResticRestoreFunc - if tc.volMode == "" { - tc.volMode = uploader.PersistentVolumeFilesystem - } - var err error - if !tc.nilUpdater { - updater := FakeBackupProgressUpdater{PodVolumeBackup: &velerov1api.PodVolumeBackup{}, Log: tc.rp.log, Ctx: t.Context(), Cli: fake.NewClientBuilder().WithScheme(util.VeleroScheme).Build()} - _, err = tc.rp.RunRestore(t.Context(), "", "var", tc.volMode, map[string]string{}, &updater) - } else { - _, err = tc.rp.RunRestore(t.Context(), "", "var", tc.volMode, map[string]string{}, nil) - } - - tc.rp.log.Infof("test name %v error %v", tc.name, err) - require.True(t, tc.errorHandleFunc(err)) - }) - } -} - -func TestClose(t *testing.T) { - t.Run("Delete existing credentials file", func(t *testing.T) { - // Create temporary files for the credentials and caCert - credentialsFile, err := os.CreateTemp(t.TempDir(), "credentialsFile") - if err != nil { - t.Fatalf("failed to create temp file: %v", err) - } - defer os.Remove(credentialsFile.Name()) - - caCertFile, err := os.CreateTemp(t.TempDir(), "caCertFile") - if err != nil { - t.Fatalf("failed to create temp file: %v", err) - } - defer os.Remove(caCertFile.Name()) - rp := &resticProvider{ - credentialsFile: credentialsFile.Name(), - caCertFile: caCertFile.Name(), - } - // Test deleting an existing credentials file - err = rp.Close(t.Context()) - if err != nil { - t.Errorf("unexpected error: %v", err) - } - - _, err = os.Stat(rp.credentialsFile) - if !os.IsNotExist(err) { - t.Errorf("expected credentials file to be deleted, got error: %v", err) - } - }) - - t.Run("Delete existing caCert file", func(t *testing.T) { - // Create temporary files for the credentials and caCert - caCertFile, err := os.CreateTemp(t.TempDir(), "caCertFile") - if err != nil { - t.Fatalf("failed to create temp file: %v", err) - } - defer os.Remove(caCertFile.Name()) - rp := &resticProvider{ - credentialsFile: "", - caCertFile: "", - } - err = rp.Close(t.Context()) - // Test deleting an existing caCert file - if err != nil { - t.Errorf("unexpected error: %v", err) - } - - _, err = os.Stat(rp.caCertFile) - if !os.IsNotExist(err) { - t.Errorf("expected caCert file to be deleted, got error: %v", err) - } - }) -} - -type MockCredentialGetter struct { - mock.Mock -} - -func (m *MockCredentialGetter) Path(selector *corev1api.SecretKeySelector) (string, error) { - args := m.Called(selector) - return args.Get(0).(string), args.Error(1) -} - -func TestNewResticUploaderProvider(t *testing.T) { - testCases := []struct { - name string - emptyBSL bool - mockCredFunc func(*MockCredentialGetter, *corev1api.SecretKeySelector) - resticCmdEnvFunc func(backupLocation *velerov1api.BackupStorageLocation, credentialFileStore credentials.FileStore) ([]string, error) - resticTempCACertFileFunc func(caCert []byte, bsl string, fs filesystem.Interface) (string, error) - checkFunc func(t *testing.T, provider Provider, err error) - }{ - { - name: "No error in creating temp credentials file", - mockCredFunc: func(credGetter *MockCredentialGetter, repoKeySelector *corev1api.SecretKeySelector) { - credGetter.On("Path", repoKeySelector).Return("temp-credentials", nil) - }, - checkFunc: func(t *testing.T, provider Provider, err error) { - t.Helper() - require.NoError(t, err) - assert.NotNil(t, provider) - }, - }, { - name: "Error in creating temp credentials file", - mockCredFunc: func(credGetter *MockCredentialGetter, repoKeySelector *corev1api.SecretKeySelector) { - credGetter.On("Path", repoKeySelector).Return("", errors.New("error creating temp credentials file")) - }, - checkFunc: func(t *testing.T, provider Provider, err error) { - t.Helper() - require.Error(t, err) - assert.Nil(t, provider) - }, - }, { - name: "ObjectStorage with CACert present and creating CACert file failed", - mockCredFunc: func(credGetter *MockCredentialGetter, repoKeySelector *corev1api.SecretKeySelector) { - credGetter.On("Path", repoKeySelector).Return("temp-credentials", nil) - }, - resticTempCACertFileFunc: func(caCert []byte, bsl string, fs filesystem.Interface) (string, error) { - return "", errors.New("error writing CACert file") - }, - checkFunc: func(t *testing.T, provider Provider, err error) { - t.Helper() - require.Error(t, err) - assert.Nil(t, provider) - }, - }, { - name: "Generating repository cmd failed", - mockCredFunc: func(credGetter *MockCredentialGetter, repoKeySelector *corev1api.SecretKeySelector) { - credGetter.On("Path", repoKeySelector).Return("temp-credentials", nil) - }, - resticTempCACertFileFunc: func(caCert []byte, bsl string, fs filesystem.Interface) (string, error) { - return "test-ca", nil - }, - resticCmdEnvFunc: func(backupLocation *velerov1api.BackupStorageLocation, credentialFileStore credentials.FileStore) ([]string, error) { - return nil, errors.New("error generating repository cmnd env") - }, - checkFunc: func(t *testing.T, provider Provider, err error) { - t.Helper() - require.Error(t, err) - assert.Nil(t, provider) - }, - }, { - name: "New provider with not nil bsl", - mockCredFunc: func(credGetter *MockCredentialGetter, repoKeySelector *corev1api.SecretKeySelector) { - credGetter.On("Path", repoKeySelector).Return("temp-credentials", nil) - }, - resticTempCACertFileFunc: func(caCert []byte, bsl string, fs filesystem.Interface) (string, error) { - return "test-ca", nil - }, - resticCmdEnvFunc: func(backupLocation *velerov1api.BackupStorageLocation, credentialFileStore credentials.FileStore) ([]string, error) { - return nil, nil - }, - checkFunc: func(t *testing.T, provider Provider, err error) { - t.Helper() - require.NoError(t, err) - assert.NotNil(t, provider) - }, - }, - { - name: "New provider with nil bsl", - emptyBSL: true, - mockCredFunc: func(credGetter *MockCredentialGetter, repoKeySelector *corev1api.SecretKeySelector) { - credGetter.On("Path", repoKeySelector).Return("temp-credentials", nil) - }, - resticTempCACertFileFunc: func(caCert []byte, bsl string, fs filesystem.Interface) (string, error) { - return "test-ca", nil - }, - resticCmdEnvFunc: func(backupLocation *velerov1api.BackupStorageLocation, credentialFileStore credentials.FileStore) ([]string, error) { - return nil, nil - }, - checkFunc: func(t *testing.T, provider Provider, err error) { - t.Helper() - require.NoError(t, err) - assert.NotNil(t, provider) - }, - }, - } - for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - repoIdentifier := "my-repo" - bsl := &velerov1api.BackupStorageLocation{} - if !tc.emptyBSL { - bsl = builder.ForBackupStorageLocation("test-ns", "test-name").CACert([]byte("my-cert")).Result() - } - credGetter := &credentials.CredentialGetter{} - repoKeySelector := &corev1api.SecretKeySelector{} - log := logrus.New() - - // Mock CredentialGetter - mockCredGetter := &MockCredentialGetter{} - credGetter.FromFile = mockCredGetter - tc.mockCredFunc(mockCredGetter, repoKeySelector) - if tc.resticCmdEnvFunc != nil { - resticCmdEnvFunc = tc.resticCmdEnvFunc - } - if tc.resticTempCACertFileFunc != nil { - resticTempCACertFileFunc = tc.resticTempCACertFileFunc - } - provider, err := NewResticUploaderProvider(repoIdentifier, bsl, credGetter, repoKeySelector, log) - tc.checkFunc(t, provider, err) - }) - } -} - -func TestParseUploaderConfig(t *testing.T) { - rp := &resticProvider{} - - testCases := []struct { - name string - uploaderConfig map[string]string - expectedFlags []string - }{ - { - name: "SparseFilesEnabled", - uploaderConfig: map[string]string{ - "WriteSparseFiles": "true", - }, - expectedFlags: []string{"--sparse"}, - }, - { - name: "SparseFilesDisabled", - uploaderConfig: map[string]string{ - "writeSparseFiles": "false", - }, - expectedFlags: []string{}, - }, - { - name: "RestoreConcorrency", - uploaderConfig: map[string]string{ - "Parallel": "5", - }, - expectedFlags: []string{}, - }, - } - - for _, testCase := range testCases { - t.Run(testCase.name, func(t *testing.T) { - result, err := rp.parseRestoreExtraFlags(testCase.uploaderConfig) - if err != nil { - t.Errorf("Test case %s failed with error: %v", testCase.name, err) - return - } - - if !reflect.DeepEqual(result, testCase.expectedFlags) { - t.Errorf("Test case %s failed. Expected: %v, Got: %v", testCase.name, testCase.expectedFlags, result) - } - }) - } -} diff --git a/pkg/uploader/types.go b/pkg/uploader/types.go index f69cbf072..52f8ca5bf 100644 --- a/pkg/uploader/types.go +++ b/pkg/uploader/types.go @@ -22,7 +22,6 @@ import ( ) const ( - ResticType = "restic" KopiaType = "kopia" SnapshotRequesterTag = "snapshot-requester" SnapshotUploaderTag = "snapshot-uploader" diff --git a/pkg/util/csi/volume_snapshot.go b/pkg/util/csi/volume_snapshot.go index 57e6f2e1d..ed6371f7b 100644 --- a/pkg/util/csi/volume_snapshot.go +++ b/pkg/util/csi/volume_snapshot.go @@ -708,17 +708,18 @@ func DiagnoseVS(vs *snapshotv1api.VolumeSnapshot, events *corev1api.EventList) s } } - diag := fmt.Sprintf("VS %s/%s, bind to %s, readyToUse %v, errMessage %s\n", vs.Namespace, vs.Name, vscName, readyToUse, errMessage) + var diag strings.Builder + _, _ = fmt.Fprintf(&diag, "VS %s/%s, bind to %s, readyToUse %v, errMessage %s\n", vs.Namespace, vs.Name, vscName, readyToUse, errMessage) if events != nil { for _, e := range events.Items { if e.InvolvedObject.UID == vs.UID && e.Type == corev1api.EventTypeWarning { - diag += fmt.Sprintf("VS event reason %s, message %s\n", e.Reason, e.Message) + _, _ = fmt.Fprintf(&diag, "VS event reason %s, message %s\n", e.Reason, e.Message) } } } - return diag + return diag.String() } func DiagnoseVSC(vsc *snapshotv1api.VolumeSnapshotContent) string { diff --git a/pkg/util/kube/pod.go b/pkg/util/kube/pod.go index 4ff05b43e..4dc423272 100644 --- a/pkg/util/kube/pod.go +++ b/pkg/util/kube/pod.go @@ -20,6 +20,7 @@ import ( "fmt" "io" "os" + "strings" "time" "github.com/pkg/errors" @@ -183,16 +184,16 @@ func GetPodContainerTerminateMessage(pod *corev1api.Pod, container string) strin // GetPodTerminateMessage returns the terminate message for all containers of a pod func GetPodTerminateMessage(pod *corev1api.Pod) string { - message := "" + var message strings.Builder for _, containerStatus := range pod.Status.ContainerStatuses { if containerStatus.State.Terminated != nil { if containerStatus.State.Terminated.Message != "" { - message += containerStatus.State.Terminated.Message + "/" + message.WriteString(containerStatus.State.Terminated.Message + "/") } } } - return message + return message.String() } func getPodLogReader(ctx context.Context, podGetter corev1client.CoreV1Interface, pod string, namespace string, logOptions *corev1api.PodLogOptions) (io.ReadCloser, error) { @@ -272,21 +273,22 @@ func ToSystemAffinity(loadAffinity *LoadAffinity, volumeTopology *corev1api.Node } func DiagnosePod(pod *corev1api.Pod, events *corev1api.EventList) string { - diag := fmt.Sprintf("Pod %s/%s, phase %s, node name %s, message %s\n", pod.Namespace, pod.Name, pod.Status.Phase, pod.Spec.NodeName, pod.Status.Message) + var diag strings.Builder + _, _ = fmt.Fprintf(&diag, "Pod %s/%s, phase %s, node name %s, message %s\n", pod.Namespace, pod.Name, pod.Status.Phase, pod.Spec.NodeName, pod.Status.Message) for _, condition := range pod.Status.Conditions { - diag += fmt.Sprintf("Pod condition %s, status %s, reason %s, message %s\n", condition.Type, condition.Status, condition.Reason, condition.Message) + _, _ = fmt.Fprintf(&diag, "Pod condition %s, status %s, reason %s, message %s\n", condition.Type, condition.Status, condition.Reason, condition.Message) } if events != nil { for _, e := range events.Items { if e.InvolvedObject.UID == pod.UID && e.Type == corev1api.EventTypeWarning { - diag += fmt.Sprintf("Pod event reason %s, message %s\n", e.Reason, e.Message) + _, _ = fmt.Fprintf(&diag, "Pod event reason %s, message %s\n", e.Reason, e.Message) } } } - return diag + return diag.String() } var funcExit = os.Exit diff --git a/pkg/util/kube/pvc_pv.go b/pkg/util/kube/pvc_pv.go index d5d2e2041..fa886bf60 100644 --- a/pkg/util/kube/pvc_pv.go +++ b/pkg/util/kube/pvc_pv.go @@ -464,17 +464,18 @@ func GetPVCForPodVolume(vol *corev1api.Volume, pod *corev1api.Pod, crClient crcl } func DiagnosePVC(pvc *corev1api.PersistentVolumeClaim, events *corev1api.EventList) string { - diag := fmt.Sprintf("PVC %s/%s, phase %s, binding to %s\n", pvc.Namespace, pvc.Name, pvc.Status.Phase, pvc.Spec.VolumeName) + var diag strings.Builder + _, _ = fmt.Fprintf(&diag, "PVC %s/%s, phase %s, binding to %s\n", pvc.Namespace, pvc.Name, pvc.Status.Phase, pvc.Spec.VolumeName) if events != nil { for _, e := range events.Items { if e.InvolvedObject.UID == pvc.UID && e.Type == corev1api.EventTypeWarning { - diag += fmt.Sprintf("PVC event reason %s, message %s\n", e.Reason, e.Message) + _, _ = fmt.Fprintf(&diag, "PVC event reason %s, message %s\n", e.Reason, e.Message) } } } - return diag + return diag.String() } func DiagnosePV(pv *corev1api.PersistentVolume) string { diff --git a/site/content/community/_index.md b/site/content/community/_index.md index c9eebef31..70e31c869 100644 --- a/site/content/community/_index.md +++ b/site/content/community/_index.md @@ -13,11 +13,10 @@ You can follow the work we do, see our milestones, and our backlog on our [GitHu * Follow us on Twitter at [@projectvelero](https://twitter.com/projectvelero) * Join our Kubernetes Slack channel and talk to over 800 other community members: [#velero-users](https://kubernetes.slack.com/messages/velero-users) -* Join our [Google Group](https://groups.google.com/forum/#!forum/projectvelero) to get updates on the project and invites to community meetings. -* Join the Velero community meetings - [Zoom link](https://broadcom.zoom.us/j/94416678753?pwd=YkptN1k4M2lrUTdGbitNTmorODcvUT09) +* Join the Velero community meetings Bi-weekly community meeting alternating every week between Beijing Friendly timezone and EST/Europe Friendly Timezone - * Beijing/US friendly - we start at 8am Beijing Time(bound to CST) / 8pm EDT(7pm EST) / 5pm PDT(4pm PST) / 2am CEST(1am CET) - [Convert to your time zone](https://dateful.com/convert/beijing-china?t=8am) - * US/Europe friendly - we start at 10am ET(bound to ET) / 7am PT / 3pm CET / 10pm(11pm) CST - [Convert to your time zone](https://dateful.com/convert/est-edt-eastern-time?t=10) -* Read and comment on the [meeting notes](https://hackmd.io/bxrvgewUQ5ORH10BKUFpxw) + * Beijing/US friendly - we start at 8am Beijing Time(bound to CST) / 8pm EDT(7pm EST) / 5pm PDT(4pm PST) / 2am CEST(1am CET) - [Convert to your time zone](https://dateful.com/convert/beijing-china?t=8am) - [Zoom Link](https://broadcom.zoom.us/j/93945566592?pwd=rovF20vuI73kR6v67QBMpQuJOtM6sr.1&jst=2) + * US/Europe friendly - we start at 10am ET(bound to ET) / 7am PT / 3pm CET / 10pm(11pm) CST - [Convert to your time zone](https://dateful.com/convert/est-edt-eastern-time?t=10) - [Google meet link](https://meet.google.com/dyr-djtj-sko) +* Read and comment on the [meeting notes](https://hackmd.io/fCDVjqGuTG23CoOWQpoEVg) * See previous community meetings on our [YouTube Channel](https://www.youtube.com/playlist?list=PL7bmigfV0EqQRysvqvqOtRNk4L5S7uqwM) * Have a question to discuss in the community meeting? Please add it to our [Q&A Discussion board](https://github.com/vmware-tanzu/velero/discussions/categories/community-support-q-a) diff --git a/site/content/docs/main/customize-installation.md b/site/content/docs/main/customize-installation.md index c73142fdf..7774565f1 100644 --- a/site/content/docs/main/customize-installation.md +++ b/site/content/docs/main/customize-installation.md @@ -342,6 +342,12 @@ If you are installing Velero in Kubernetes 1.14.x or earlier, you need to use `k If you intend to use Velero with a storage provider that is secured by a self-signed certificate, you may need to instruct Velero to trust that certificate. See [use Velero with a storage provider secured by a self-signed certificate][9] for details. +## Enabling parallel/concurrent backup processing + +By default, only one backup is processed in the `InProgress` phase at a time. The install flag `concurrent-backups`, which takes an integer argument, configures Velero to process multiple backups at the same time, up to a max of `concurrent-backups`. The other restriction on parallel backup processing is that two backups which have any included namespaces in common may not run at the same time. For example, if `concurrent-backups` is set to 2 and two backups for "namespace1" are submitted at the same time, only one of those will be processed at the same time. On the other hand, if a backup for "namespace1" and another for "namespace2" are submitted, then both can be processed in parallel. Note that a whole-cluster backup (one which does not restrict to a set list of namespaces) includes all namespaces, and therefore it will not run in parallel with any other backup. + +Enabling parallel backups can provide a significant performance benefit for backups which contain a large number of Kubernetes resources or ones which contain a large number of smaller volumes. Backups dominated by large volumes will not see as much benefit, since the majority of time for those backups is spent waiting for the async phase to complete. A larger `concurrent-backups` configuration may require additional memory and CPU resources for the velero container. + ## Additional options Run `velero install --help` or see the [Helm chart documentation](https://vmware-tanzu.github.io/helm-charts/) for the full set of installation options.