Skip to content

Conversation

@mberhault
Copy link
Contributor

Add some safeguards around the encryption flag.
When we have a COCKROACH_REGISTRY file, we absolutely must keep using
it to keep track of all files.

It gets created the first time a file is created when using the
file_registry which currently only happens when
--enterprise-encryption is specified.

This means that if we have a registry file, we MUST have encryption
options (and be using a CCL build).

Also add a simple interactive test to check encryption transition and
handling of some bad args (wrong keys, no encryption flag)

Release note: None

@mberhault mberhault requested a review from bdarnell August 16, 2018 16:55
@mberhault mberhault requested a review from a team as a code owner August 16, 2018 16:55
@mberhault mberhault requested review from a team August 16, 2018 16:55
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@mberhault mberhault mentioned this pull request Aug 16, 2018
29 tasks
Add some safeguards around the encryption flag.
When we have a `COCKROACH_REGISTRY` file, we absolutely must keep using
it to keep track of all files.

It gets created the first time a file is created when using the
file_registry which currently only happens when
`--enterprise-encryption` is specified.

This means that if we have a registry file, we MUST have encryption
options (and be using a CCL build).

Also add a simple interactive test to check encryption transition and
handling of some bad args (wrong keys, no encryption flag)

Release note: None
@mberhault mberhault force-pushed the marc/ensure_encryption_flags branch from 92a85f0 to fda5612 Compare August 16, 2018 16:57
Copy link
Contributor

@bdarnell bdarnell left a comment

Choose a reason for hiding this comment

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

Reviewed 6 of 6 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained

@mberhault
Copy link
Contributor Author

bors r+

@craig
Copy link
Contributor

craig bot commented Aug 16, 2018

Build failed

@mberhault
Copy link
Contributor Author

bors retry

@mberhault
Copy link
Contributor Author

bors r+

craig bot pushed a commit that referenced this pull request Aug 16, 2018
28710: libroach: ensure encryption flags are passed if previously used. r=mberhault a=mberhault

Add some safeguards around the encryption flag.
When we have a `COCKROACH_REGISTRY` file, we absolutely must keep using
it to keep track of all files.

It gets created the first time a file is created when using the
file_registry which currently only happens when
`--enterprise-encryption` is specified.

This means that if we have a registry file, we MUST have encryption
options (and be using a CCL build).

Also add a simple interactive test to check encryption transition and
handling of some bad args (wrong keys, no encryption flag)

Release note: None

Co-authored-by: marc <marc@cockroachlabs.com>
@craig
Copy link
Contributor

craig bot commented Aug 16, 2018

Build succeeded

@craig craig bot merged commit fda5612 into cockroachdb:master Aug 16, 2018
@mberhault mberhault deleted the marc/ensure_encryption_flags branch August 16, 2018 23:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants