Ensure Vault can access the underlying snapshotInstaller. #501
Conversation
| @@ -119,12 +119,28 @@ func newCountingReader(r io.Reader) *countingReader { | |||
|
|
|||
| type countingReadCloser struct { | |||
| *countingReader | |||
| io.Closer | |||
| readCloser io.ReadCloser | |||
There was a problem hiding this comment.
So the gist here is that the vault restore code expected that the io.ReadCloser arg passed to FSM.Restore was of a known type before, so it could call methods other than just Read and Close on it, and since #490 wrapped your io.ReadCloser you need a way to unwrap it. I guess this also means the restore progress reporting is going to be strange or non-existent for vault since you won't be using the Read method provided by countingReader at all.
There was a problem hiding this comment.
Oh, true, hadn't thought about that. Hmm.
There was a problem hiding this comment.
Actually no, I think it won't be an issue. We're only casting to snapshotInstaller so we can call the Install method on it to rename the file in place. The writing of the file to disk is still done by the raft library, so we should still see progress reporting. I'll verify this.
There was a problem hiding this comment.
Verified:
2022-04-26T13:39:07.959-0400 [INFO] raft-c050bf27-97cb-224d-9c25-e8c4f0526924: snapshot restore progress: id=2-204-1650994747692 last-index=204 last-term=2 size-in-bytes=0 read-bytes=0 percent-complete="NaN%"
...
2022-04-26T13:39:08.079-0400 [INFO] raft-ab3535b0-0eef-3c41-8ceb-6bf7a3cf4385: snapshot network transfer progress: read-bytes=1880 percent-complete="100.00%"
This code: https://github.com/hashicorp/vault/blob/main/physical/raft/fsm.go#L785
is broken since #490. To allow Vault to upgrade to a current Raft release, I'm introducing a new interface that exposes the underlying ReadCloser clients passed in for a restore.