-
Notifications
You must be signed in to change notification settings - Fork 3.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
storage: remove obsolete encryption-at-rest code #74314
Conversation
bf546e3
to
a56b813
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: complete! 0 of 0 LGTMs obtained
pkg/storage/pebble_file_registry.go, line 397 at r1 (raw file):
} r.mu.entries[update.Filename] = update.Entry }
This logic is moved from the enginepb.FileRegistry
type, because we no longer need the indirection of holding a enginepb.FileRegistry
on PebbleFileRegistry
. Instead we maintain just the map[string]*enginepb.FileEntry
map directly.
ba4bd75
to
a75489b
Compare
Will need to rebase once #74270 lands. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't look carefully at the testdata files
Reviewed 6 of 14 files at r1, 1 of 5 files at r2, 9 of 10 files at r3.
Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @itsbilal and @jbowens)
pkg/ccl/storageccl/engineccl/pebble_key_manager.go, line 239 at r3 (raw file):
return err } }
// Else there is no DataKeysRegistry file yet.
pkg/storage/pebble_file_registry.go, line 397 at r1 (raw file):
Previously, jbowens (Jackson Owens) wrote…
This logic is moved from the
enginepb.FileRegistry
type, because we no longer need the indirection of holding aenginepb.FileRegistry
onPebbleFileRegistry
. Instead we maintain just themap[string]*enginepb.FileEntry
map directly.
ack
Remove encryption-at-rest code that handles the upgrade process to the 21.2 encryption-at-rest formats and all code that reads the 21.1 and earlier formats. Fix cockroachdb#72520. Release note: None
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TFTR!
bors r=sumeerbhola
Reviewable status: complete! 0 of 0 LGTMs obtained (and 1 stale) (waiting on @itsbilal, @jbowens, and @sumeerbhola)
pkg/ccl/storageccl/engineccl/pebble_key_manager.go, line 239 at r3 (raw file):
Previously, sumeerbhola wrote…
// Else there is no DataKeysRegistry file yet.
Done.
Build succeeded: |
Remove the migration server DeprecateBaseEncryptionRegistry RPC. It was used for the migration of the encryption-at-rest registry format in 21.2 and is no longer relevant. Missed this in cockroachdb#74314. Release note: None
75870: rfc: pgwire-compatible query cancellation r=otan,knz a=rafiss refs #41335 Release note: None 76007: physicalplan: add support for multi-stage execution of regr_avgx, regr_avgy, regr_intercept, regr_r2, and regr_slope aggregate functions. r=yuzefovich a=mneverov physicalplan: add support for multi-stage execution of regr_avgx, regr_avgy, regr_intercept, regr_r2, and regr_slope aggregate functions. See #58347. Release note (performance improvement): regr_avgx, regr_avgy, regr_intercept, regr_r2, and regr_slope aggregate functions are now evaluated more efficiently in a distributed setting 76115: sql: use 16 as default bucket count for hash index r=chengxiong-ruan a=chengxiong-ruan for some reason I forgot to modify it in my previous pr :( Release note (sql change): 16 is used as the default bucket count for hash sharded index. 76262: server: remove DeprecateBaseEncryptionRegistry r=jbowens a=jbowens Remove the migration server DeprecateBaseEncryptionRegistry RPC. It was used for the migration of the encryption-at-rest registry format in 21.2 and is no longer relevant. Missed this in #74314. Release note: None Co-authored-by: Rafi Shamim <[email protected]> Co-authored-by: Max Neverov <[email protected]> Co-authored-by: Chengxiong Ruan <[email protected]> Co-authored-by: Jackson Owens <[email protected]>
Remove the migration server DeprecateBaseEncryptionRegistry RPC. It was used for the migration of the encryption-at-rest registry format in 21.2 and is no longer relevant. Missed this in cockroachdb#74314. Release note: None
Remove encryption-at-rest code that handles the upgrade process to the 21.2
encryption-at-rest formats and all code that reads the 21.1 and earlier
formats.
Fix #72520.
Release note: None