Skip to content

Add sse_kms_key_id for S3 backup#607

Merged
yiwu-arbug merged 1 commit intopingcap:masterfrom
yiwu-arbug:enc_sse
Apr 23, 2020
Merged

Add sse_kms_key_id for S3 backup#607
yiwu-arbug merged 1 commit intopingcap:masterfrom
yiwu-arbug:enc_sse

Conversation

@yiwu-arbug
Copy link
Contributor

Add sse_kms_key_id field to S3 config. This is to allow using an owned KMS key when having S3 server-side encryption.

Signed-off-by: Yi Wu yiwu@pingcap.com

Signed-off-by: Yi Wu <yiwu@pingcap.com>
Copy link
Contributor

@kennytm kennytm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

Should this be cherry-picked to 3.1?

@yiwu-arbug
Copy link
Contributor Author

yiwu-arbug commented Apr 22, 2020

LGTM.

Should this be cherry-picked to 3.1?

confirmed with @gregwebs, no such needs right now.

@yiwu-arbug
Copy link
Contributor Author

But I do want to catch up with 4.0-rc.2 branch cut.

@kennytm kennytm added the LGT1 LGTM1 label Apr 23, 2020
@yiwu-arbug yiwu-arbug merged commit 038e319 into pingcap:master Apr 23, 2020
@yiwu-arbug yiwu-arbug deleted the enc_sse branch April 23, 2020 02:01
yiwu-arbug pushed a commit that referenced this pull request Apr 23, 2020
Add `sse_kms_key_id` field to S3 config. This is to allow using an owned KMS key when having S3 server-side encryption.

Signed-off-by: Yi Wu <yiwu@pingcap.com>
kennytm pushed a commit that referenced this pull request May 6, 2020
* Add sse_kms_key_id for S3 backup (#607)

Add `sse_kms_key_id` field to S3 config. This is to allow using an owned KMS key when having S3 server-side encryption.

Signed-off-by: Yi Wu <yiwu@pingcap.com>

* update rust

Signed-off-by: Yi Wu <yiwu@pingcap.com>
kennytm added a commit to pingcap/br that referenced this pull request May 7, 2020
<!--
Thank you for working on BR! Please read BR's [CONTRIBUTING](https://github.com/pingcap/br/blob/master/CONTRIBUTING.md) document **BEFORE** filing this PR.
-->

Pass sse_kms_key_id when backup to S3. This is to support using user owned KMS key for server-side encryption.

Pass sse_kms_key_id when backup to S3 to both tikv and when storing backupmeta in S3.

Tests <!-- At least one of them must be included. -->
Manual test with BR. Try:
* specify kms key id on backup. restore success.
* disable the kms key and try restore again. restore failed.

Related changes

depends on kvproto change: pingcap/kvproto#607 and tikv change: tikv/tikv#7627

Signed-off-by: Yi Wu <yiwu@pingcap.com>

Co-authored-by: kennytm <kennytm@gmail.com>

Co-authored-by: kennytm <kennytm@gmail.com>
daimashusheng pushed a commit to daimashusheng/kvproto that referenced this pull request Sep 2, 2021
Add `sse_kms_key_id` field to S3 config. This is to allow using an owned KMS key when having S3 server-side encryption.

Signed-off-by: Yi Wu <yiwu@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

LGT1 LGTM1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants