Skip to content

Commit 911801a

Browse files
committed
backupccl: record backing file size during backup
Release note: none. Epic: none.
1 parent d3dda52 commit 911801a

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

pkg/ccl/backupccl/backuppb/backup.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ message BackupManifest {
4848
util.hlc.Timestamp start_time = 7 [(gogoproto.nullable) = false];
4949
util.hlc.Timestamp end_time = 8 [(gogoproto.nullable) = false];
5050
string locality_kv = 9 [(gogoproto.customname) = "LocalityKV"];
51+
uint64 backing_file_size = 10;
5152
}
5253

5354
message DescriptorRevision {

pkg/ccl/backupccl/file_sst_sink.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,14 @@ func (s *fileSSTSink) flushFile(ctx context.Context) error {
125125
log.Warningf(ctx, "failed to close write in fileSSTSink: % #v", pretty.Formatter(err))
126126
return errors.Wrap(err, "writing SST")
127127
}
128+
wroteSize := s.sst.Meta.Size
128129
s.outName = ""
129130
s.out = nil
130131

132+
for i := range s.flushedFiles {
133+
s.flushedFiles[i].BackingFileSize = wroteSize
134+
}
135+
131136
progDetails := backuppb.BackupManifest_Progress{
132137
RevStartTime: s.flushedRevStart,
133138
Files: s.flushedFiles,

pkg/storage/sst_writer.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ type SSTWriter struct {
3131
DataSize int64
3232
scratch []byte
3333

34+
Meta *sstable.WriterMetadata
3435
supportsRangeKeys bool // TODO(erikgrinaker): remove after 22.2
3536
}
3637

@@ -135,8 +136,10 @@ func (fw *SSTWriter) Finish() error {
135136
if err := fw.fw.Close(); err != nil {
136137
return err
137138
}
139+
var err error
140+
fw.Meta, err = fw.fw.Metadata()
138141
fw.fw = nil
139-
return nil
142+
return err
140143
}
141144

142145
// ClearRawRange implements the Engine interface.

0 commit comments

Comments
 (0)