etcd-io
/
dbtester
mirror of https://github.com/etcd-io/dbtester.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*: use 'linux-inspect' (replace 'psn') 

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyu-Ho Lee 2017-05-09 19:07:08 -07:00
parent 489950d918
commit d8bc2ec2c2
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/command.go
View File

@ -21,9 +21,10 @@ import (
"github.com/coreos/dbtester/dbtesterpb"
"github.com/coreos/dbtester/pkg/ntp"
"github.com/coreos/etcd/pkg/netutil"
"github.com/coreos/pkg/capnslog"
"github.com/gyuho/linux-inspect/psn"
"github.com/gyuho/linux-inspect/df"
"github.com/spf13/cobra"
"google.golang.org/grpc"
)
@ -55,7 +56,7 @@ type flags struct {
var globalFlags flags
func init() {
dn, err := psn.GetDevice("/")
dn, err := df.GetDevice("/")
if err != nil {
plog.Warningf("cannot get disk device mounted at '/' (%v)", err)
}

4
agent/server.go
View File

@ -25,7 +25,7 @@ import (
"github.com/coreos/dbtester/dbtesterpb"
"github.com/coreos/dbtester/pkg/fileinspect"
"github.com/gyuho/linux-inspect/psn"
"github.com/gyuho/linux-inspect/inspect"
"golang.org/x/net/context"
)
@ -49,7 +49,7 @@ type transporterServer struct {
proxyCmdWait chan struct{}
proxyPid int64
metricsCSV *psn.CSV
metricsCSV *inspect.CSV
// trigger log uploads to cloud storage
// this should be triggered before we shut down

17
agent/server_system_metrics.go
View File

@ -19,7 +19,8 @@ import (
"os"
"time"
"github.com/gyuho/linux-inspect/psn"
"github.com/gyuho/linux-inspect/inspect"
"github.com/gyuho/linux-inspect/top"
)
// startMetrics starts collecting metrics.
@ -37,12 +38,12 @@ func startMetrics(fs *flags, t *transporterServer) (err error) {
return err
}
tcfg := &psn.TopConfig{
Exec: psn.DefaultTopPath,
tcfg := &top.Config{
Exec: top.DefaultExecPath,
IntervalSecond: 1,
PID: t.pid,
}
t.metricsCSV, err = psn.NewCSV(
t.metricsCSV, err = inspect.NewCSV(
fs.systemMetricsCSV,
t.pid,
fs.diskDevice,
@ -59,7 +60,7 @@ func startMetrics(fs *flags, t *transporterServer) (err error) {
select {
case <-time.After(time.Second):
if err := t.metricsCSV.Add(); err != nil {
plog.Errorf("psn.CSV.Add error (%v)", err)
plog.Errorf("inspect.CSV.Add error (%v)", err)
continue
}
@ -67,18 +68,18 @@ func startMetrics(fs *flags, t *transporterServer) (err error) {
plog.Infof("upload signal received; saving CSV at %q", t.metricsCSV.FilePath)
if err := t.metricsCSV.Save(); err != nil {
plog.Errorf("psn.CSV.Save(%q) error %v", t.metricsCSV.FilePath, err)
plog.Errorf("inspect.CSV.Save(%q) error %v", t.metricsCSV.FilePath, err)
} else {
plog.Infof("CSV saved at %q", t.metricsCSV.FilePath)
}
interpolated, err := t.metricsCSV.Interpolate()
if err != nil {
plog.Fatalf("psn.CSV.Interpolate(%q) failed with %v", t.metricsCSV.FilePath, err)
plog.Fatalf("inspect.CSV.Interpolate(%q) failed with %v", t.metricsCSV.FilePath, err)
}
interpolated.FilePath = fs.systemMetricsCSVInterpolated
if err := interpolated.Save(); err != nil {
plog.Errorf("psn.CSV.Save(%q) error %v", interpolated.FilePath, err)
plog.Errorf("inspect.CSV.Save(%q) error %v", interpolated.FilePath, err)
} else {
plog.Infof("CSV saved at %q", interpolated.FilePath)
}

2
analyze/02_read_all_metrics_to_analyze_data.go
View File

@ -131,7 +131,7 @@ func (data *analyzeData) aggSystemMetrics() error {
}
case "EXTRA":
// dbtester uses psn 'EXTRA' column as 'CLIENT-NUM'
// dbtester uses linux-inspect 'EXTRA' column as 'CLIENT-NUM'
header = "CLIENT-NUM"
}