close file and refactor function (talent-plan#185)

* close file
HDT3213 · May 28, 2020 · 16b8058 · 16b8058
1 parent bc06cdf
commit 16b8058
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/kv/raftstore/cmd_resp.go b/kv/raftstore/cmd_resp.go
@@ -55,7 +55,7 @@ func ErrRespRegionNotFound(regionID uint64) *raft_cmdpb.RaftCmdResponse {
 	}
 }
 
-func newCmdRespForReq(req *raft_cmdpb.RaftCmdRequest) *raft_cmdpb.RaftCmdResponse {
+func newCmdResp() *raft_cmdpb.RaftCmdResponse {
 	return &raft_cmdpb.RaftCmdResponse{
 		Header: &raft_cmdpb.RaftResponseHeader{},
 	}

diff --git a/kv/raftstore/snap/snap.go b/kv/raftstore/snap/snap.go
@@ -690,6 +690,9 @@ func (s *Snap) Apply(opts ApplyOptions) error {
 		externalFiles = append(externalFiles, file)
 	}
 	n, err := opts.DB.IngestExternalFiles(externalFiles)
+	for _, file := range externalFiles {
+		file.Close()
+	}
 	if err != nil {
 		log.Errorf("ingest sst failed (first %d files succeeded): %s", n, err)
 		return err