Merge pull request #1064 from actiontech/diagnosis

sjjian · web-flow · commit d023f0400169 · 2023-08-17T18:31:51.000+08:00
fix diagnosis bug : archive tar/: write too long
diff --git a/api/handler/v2/job.go b/api/handler/v2/job.go
@@ -2216,10 +2216,9 @@ func DiagnosisJobAndTarFile(logger g.LoggerType, jobId, src, dst string) (err er
 		if err != nil {
 			return err
 		}
-
-		_, err = io.Copy(tw, fr)
+		_, err = io.CopyN(tw, fr, fi.Size())
 		if err != nil {
-			return err
+			return fmt.Errorf("write file %s err: %v", hdr.Name, err)
 		}
 		return nil
 	})

Original file line number	Diff line number	Diff line change
`@@ -2216,10 +2216,9 @@ func DiagnosisJobAndTarFile(logger g.LoggerType, jobId, src, dst string) (err er`
`2216`	`2216`	`if err != nil {`
`2217`	`2217`	`return err`
`2218`	`2218`	`}`
`2219`		`-`
`2220`		`- _, err = io.Copy(tw, fr)`
	`2219`	`+ _, err = io.CopyN(tw, fr, fi.Size())`
`2221`	`2220`	`if err != nil {`
`2222`		`- return err`
	`2221`	`+ return fmt.Errorf("write file %s err: %v", hdr.Name, err)`
`2223`	`2222`	`}`
`2224`	`2223`	`return nil`
`2225`	`2224`	`})`