Merge pull request #104207 from cockroachdb/blathers/backport-release…

…-22.2-104187 release-22.2: backupccl: always track opened writer
cockroachdb · Jun 1, 2023 · 82c5c2e · 82c5c2e
2 parents 645cfb2 + 77253be
commit 82c5c2e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/ccl/backupccl/file_sst_sink.go b/pkg/ccl/backupccl/file_sst_sink.go
@@ -264,14 +264,14 @@ func (s *fileSSTSink) open(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+	s.out = w
 	if s.conf.enc != nil {
-		var err error
-		w, err = storageccl.EncryptingWriter(w, s.conf.enc.Key)
+		e, err := storageccl.EncryptingWriter(w, s.conf.enc.Key)
 		if err != nil {
 			return err
 		}
+		s.out = e
 	}
-	s.out = w
 	s.sst = storage.MakeBackupSSTWriter(ctx, s.dest.Settings(), s.out)
 
 	return nil