encryption: let diskSideloadStorage read from RocksDB env.#25806
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom May 23, 2018
Merged
encryption: let diskSideloadStorage read from RocksDB env.#25806craig[bot] merged 1 commit intocockroachdb:masterfrom
diskSideloadStorage read from RocksDB env.#25806craig[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
Member
|
This change is |
mberhault
reviewed
May 23, 2018
c-deps/libroach/engine.cc
Outdated
| rocksdb::unique_ptr<rocksdb::RandomRWFile> file; | ||
| uint64_t filesize; | ||
|
|
||
| status = this->rep->GetEnv()->FileExists(ToString(path)); |
Contributor
There was a problem hiding this comment.
You can replace pretty much all of this by just calling Status rocksdb::ReadFileToString(Env* env, const std::string& fname, std::string* data)
Contributor
Author
There was a problem hiding this comment.
Good to know there's such a function. I will update shortly.
`diskSideloadStorage` used to read directly from the disk through `os.ReadFile()`. However, after encryption at rest is introduced, the content read directly from the disk will be garbage. This commit addresses this issue by letting it read through RocksDB's env, which decrypts the content as it reads it. Release note: None
Contributor
Author
|
@mberhault Updated! Thanks! |
29 tasks
Contributor
Author
|
bors r+ |
craig bot
pushed a commit
that referenced
this pull request
May 23, 2018
25806: encryption: let `diskSideloadStorage` read from RocksDB env. r=windchan7 a=windchan7 `diskSideloadStorage` used to read directly from the disk through `os.ReadFile()`. However, after encryption at rest is introduced, the content read directly from the disk will be garbage. This commit addresses this issue by letting it read through RocksDB's env, which decrypts the content as it reads it. Release note: None Co-authored-by: Victor Chen <victor@cockroachlabs.com>
Contributor
Build succeeded |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
diskSideloadStorageused to read directly from the disk throughos.ReadFile().However, after encryption at rest is introduced, the content read directly from
the disk will be garbage. This commit addresses this issue by letting it read
through RocksDB's env, which decrypts the content as it reads it.
Release note: None