go/store/datas/pull: pull_table_file_writer_test.go: Make sure to close readers some more.

go/store/datas/pull/pull_table_file_writer.go

@@ -148,15 +148,24 @@ func (w *PullTableFileWriter) reqRespThread() (err error) {
 		})
 	}
 
+	var curWr *nbs.CmpChunkTableWriter
+
 	defer func() {
 		close(reqCh)
 		egErr := eg.Wait()
 		if err == nil {
 			err = egErr
 		}
-	}()
 
-	var curWr *nbs.CmpChunkTableWriter
+		if curWr != nil {
+			// Cleanup dangling writer, whose contents will never be used.
+			curWr.Finish()
+			rd, _ := curWr.Reader()
+			if rd != nil {
+				rd.Close()
+			}
+		}
+	}()
 
 	for {
 		if closed && len(pendingUploads) == 0 && outstandingUploads == 0 {

go/store/datas/pull/pull_table_file_writer_test.go

@@ -308,6 +308,10 @@ func (s *noopTableFileDestStore) WriteTableFile(ctx context.Context, id string,
 		time.Sleep(s.writeDelay)
 	}
 	s.writeCalled.Add(1)
+	rd, _, _ := getRd()
+	if rd != nil {
+		rd.Close()
+	}
 	return nil
 }
 
@@ -351,6 +355,10 @@ type errTableFileDestStore struct {
 }
 
 func (s *errTableFileDestStore) WriteTableFile(ctx context.Context, id string, numChunks int, contentHash []byte, getRd func() (io.ReadCloser, uint64, error)) error {
+	rd, _, _ := getRd()
+	if rd != nil {
+		rd.Close()
+	}
 	if s.onAdd {
 		return nil
 	}