jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

return the correct benchamrk path (#2272)

mine
Jayson Wang 2023-11-08 23:37:16 +08:00 committed by GitHub
parent d19c792feb
commit 68afb3d9ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/perf/benchmark.go
View File

@ -25,7 +25,6 @@ const (
k9sUA = "k9s/" k9sUA = "k9s/"
) )
var ( var (
// K9sBenchDir directory to store K9s Benchmark files. // K9sBenchDir directory to store K9s Benchmark files.
K9sBenchDir = filepath.Join(os.TempDir(), fmt.Sprintf("k9s-bench-%s", config.MustK9sUser())) K9sBenchDir = filepath.Join(os.TempDir(), fmt.Sprintf("k9s-bench-%s", config.MustK9sUser()))
@ -107,7 +106,7 @@ func (b *Benchmark) Canceled() bool {
return b.canceled return b.canceled
} }
// Run starts a benchmark,. // Run starts a benchmark.
func (b *Benchmark) Run(cluster string, done func()) { func (b *Benchmark) Run(cluster string, done func()) {
log.Debug().Msgf("Running benchmark on cluster %s", cluster) log.Debug().Msgf("Running benchmark on cluster %s", cluster)
buff := new(bytes.Buffer) buff := new(bytes.Buffer)
@ -115,7 +114,7 @@ func (b *Benchmark) Run(cluster string, done func()) {
// this call will block until the benchmark is complete or times out. // this call will block until the benchmark is complete or times out.
b.worker.Run() b.worker.Run()
b.worker.Stop() b.worker.Stop()
if len(buff.Bytes()) > 0 { if buff.Len() > 0 {
if err := b.save(cluster, buff); err != nil { if err := b.save(cluster, buff); err != nil {
log.Error().Err(err).Msg("Saving Benchmark") log.Error().Err(err).Msg("Saving Benchmark")
} }
@ -141,11 +140,7 @@ func (b *Benchmark) save(cluster string, r io.Reader) error {
} }
}() }()
bb, err := io.ReadAll(r) if _, err = io.Copy(f, r); err != nil {
if err != nil {
return err
}
if _, err := f.Write(bb); err != nil {
return err return err
} }

2
internal/view/benchmark.go
View File

@ -65,7 +65,7 @@ func fileToSubject(path string) string {
} }
func benchDir(cfg *config.Config) string { func benchDir(cfg *config.Config) string {
return filepath.Join(perf.K9sBenchDir, cfg.K9s.CurrentContextDir()) return filepath.Join(perf.K9sBenchDir, cfg.K9s.CurrentCluster)
} }
func readBenchFile(cfg *config.Config, n string) (string, error) { func readBenchFile(cfg *config.Config, n string) (string, error) {