From d64162569d6a68568cd12f7573f106594ca288bc Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Tue, 10 Jan 2017 19:33:49 -0800 Subject: [PATCH] agent: update flag name --- agent/command.go | 4 ++-- agent/server.go | 2 +- agent/system_metrics.go | 4 ++-- agent/upload_log.go | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/agent/command.go b/agent/command.go index dfd8cca0..e63b896e 100644 --- a/agent/command.go +++ b/agent/command.go @@ -29,7 +29,7 @@ import ( type flags struct { agentLog string databaseLog string - systemMetricsLog string + systemMetricsCSV string javaExec string etcdExec string @@ -63,7 +63,7 @@ func init() { Command.PersistentFlags().StringVar(&globalFlags.agentLog, "agent-log", filepath.Join(homeDir(), "agent.log"), "agent log path.") Command.PersistentFlags().StringVar(&globalFlags.databaseLog, "database-log", filepath.Join(homeDir(), "database.log"), "Database log path.") - Command.PersistentFlags().StringVar(&globalFlags.systemMetricsLog, "system-metrics-log", filepath.Join(homeDir(), "system-metrics.csv"), "System metrics log path.") + Command.PersistentFlags().StringVar(&globalFlags.systemMetricsCSV, "system-metrics-csv", filepath.Join(homeDir(), "system-metrics.csv"), "System metrics log path.") Command.PersistentFlags().StringVar(&globalFlags.javaExec, "java-exec", "/usr/bin/java", "Java executable binary path (needed for Zookeeper).") Command.PersistentFlags().StringVar(&globalFlags.etcdExec, "etcd-exec", filepath.Join(os.Getenv("GOPATH"), "bin/etcd"), "etcd executable binary path.") diff --git a/agent/server.go b/agent/server.go index 95d08b5a..49019b29 100644 --- a/agent/server.go +++ b/agent/server.go @@ -89,7 +89,7 @@ func (t *transporterServer) Transfer(ctx context.Context, r *agentpb.Request) (* t.proxyDatabaseLogfile = pf plog.Infof("proxy-database log path: %q", proxyLog) } - plog.Infof("system metrics log path: %q", globalFlags.systemMetricsLog) + plog.Infof("system metrics CSV path: %q", globalFlags.systemMetricsCSV) switch r.Database { case agentpb.Request_ZooKeeper: diff --git a/agent/system_metrics.go b/agent/system_metrics.go index f98fd570..443cefba 100644 --- a/agent/system_metrics.go +++ b/agent/system_metrics.go @@ -30,13 +30,13 @@ func startMetrics(fs *flags, t *transporterServer) error { plog.Infof("starting collecting metrics [database %q | PID: %d | disk device: %q | network interface: %q]", t.req.Database, t.pid, fs.diskDevice, fs.networkInterface) - if err := os.RemoveAll(fs.systemMetricsLog); err != nil { + if err := os.RemoveAll(fs.systemMetricsCSV); err != nil { return err } if err := toFile(fmt.Sprintf("%d", t.req.ClientNum), t.clientNumPath); err != nil { return err } - t.metricsCSV = psn.NewCSV(fs.systemMetricsLog, t.pid, fs.diskDevice, fs.networkInterface, t.clientNumPath) + t.metricsCSV = psn.NewCSV(fs.systemMetricsCSV, t.pid, fs.diskDevice, fs.networkInterface, t.clientNumPath) if err := t.metricsCSV.Add(); err != nil { return err } diff --git a/agent/upload_log.go b/agent/upload_log.go index ebf997e9..5b5da885 100644 --- a/agent/upload_log.go +++ b/agent/upload_log.go @@ -77,10 +77,10 @@ func uploadLog(fs *flags, t *transporterServer) error { } } - srcMonitorResultPath := fs.systemMetricsLog - dstMonitorResultPath := filepath.Base(fs.systemMetricsLog) - if !strings.HasPrefix(filepath.Base(fs.systemMetricsLog), t.req.TestName) { - dstMonitorResultPath = fmt.Sprintf("%s-%d-%s", t.req.TestName, t.req.ServerIndex+1, filepath.Base(fs.systemMetricsLog)) + srcMonitorResultPath := fs.systemMetricsCSV + dstMonitorResultPath := filepath.Base(fs.systemMetricsCSV) + if !strings.HasPrefix(filepath.Base(fs.systemMetricsCSV), t.req.TestName) { + dstMonitorResultPath = fmt.Sprintf("%s-%d-%s", t.req.TestName, t.req.ServerIndex+1, filepath.Base(fs.systemMetricsCSV)) } dstMonitorResultPath = filepath.Join(t.req.GoogleCloudStorageSubDirectory, dstMonitorResultPath) plog.Infof("uploading monitor results [%q -> %q]", srcMonitorResultPath, dstMonitorResultPath)