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

Merge pull request #78 from gyuho/control 

control: fix upload (after error count printing)
This commit is contained in:
Gyu-Ho Lee 2016-11-15 16:07:55 -08:00 committed by GitHub
parent 6997a734bc a7e6ce4cab
commit d6402ab653
2 changed files with 56 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
control/control.go
View File

@ -18,11 +18,13 @@ import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
"sync"
"time"
"github.com/coreos/dbtester/agent"
"github.com/coreos/dbtester/remotestorage"
"github.com/spf13/cobra"
"golang.org/x/net/context"
"google.golang.org/grpc"
@ -151,6 +153,52 @@ func generateReport(cfg Config, h []ReqHandler, reqGen func(chan<- request)) {
close(results)
<-pdoneC
{
u, err := remotestorage.NewGoogleCloudStorage([]byte(cfg.GoogleCloudStorageKey), cfg.GoogleCloudProjectName)
if err != nil {
plog.Fatal(err)
}
srcCSVResultPath := cfg.ResultPathTimeSeries
dstCSVResultPath := filepath.Base(cfg.ResultPathTimeSeries)
if !strings.HasPrefix(dstCSVResultPath, cfg.TestName) {
dstCSVResultPath = fmt.Sprintf("%s-%s", cfg.TestName, dstCSVResultPath)
}
dstCSVResultPath = filepath.Join(cfg.GoogleCloudStorageSubDirectory, dstCSVResultPath)
var uerr error
for k := 0; k < 15; k++ {
if uerr = u.UploadFile(cfg.GoogleCloudStorageBucketName, srcCSVResultPath, dstCSVResultPath); uerr != nil {
plog.Printf("#%d: UploadFile error %v", k, uerr)
time.Sleep(2 * time.Second)
continue
}
break
}
}
{
u, err := remotestorage.NewGoogleCloudStorage([]byte(cfg.GoogleCloudStorageKey), cfg.GoogleCloudProjectName)
if err != nil {
plog.Fatal(err)
}
srcCSVResultPath := cfg.ResultPathLog
dstCSVResultPath := filepath.Base(cfg.ResultPathLog)
if !strings.HasPrefix(dstCSVResultPath, cfg.TestName) {
dstCSVResultPath = fmt.Sprintf("%s-%s", cfg.TestName, dstCSVResultPath)
}
dstCSVResultPath = filepath.Join(cfg.GoogleCloudStorageSubDirectory, dstCSVResultPath)
var uerr error
for k := 0; k < 15; k++ {
if uerr = u.UploadFile(cfg.GoogleCloudStorageBucketName, srcCSVResultPath, dstCSVResultPath); uerr != nil {
plog.Printf("#%d: UploadFile error %v", k, uerr)
time.Sleep(2 * time.Second)
continue
}
break
}
}
}
func step2(cfg Config) error {

70
control/report.go
View File

@ -17,12 +17,9 @@ package control
import (
"fmt"
"math"
"path/filepath"
"sort"
"strings"
"time"
"github.com/coreos/dbtester/remotestorage"
)
const (
@ -119,7 +116,6 @@ func (r *report) print() {
r.printSecondSample()
}
fmt.Println("ERROR COUNT:", r.errorDist)
plog.Println("ERROR COUNT:", r.errorDist)
}
@ -150,66 +146,16 @@ func (r *report) printLatencies() {
}
func (r *report) printSecondSample() {
cfg := r.cfg
{
plog.Println("getTimeSeries starts for", len(r.sps.tm), "points")
txt := r.sps.getTimeSeries().String()
plog.Println("getTimeSeries finished for", len(r.sps.tm), "points")
fmt.Println(txt)
plog.Println("getTimeSeries starts for", len(r.sps.tm), "points")
txt := r.sps.getTimeSeries().String()
plog.Println("getTimeSeries finished for", len(r.sps.tm), "points")
fmt.Println(txt)
if err := toFile(txt, cfg.ResultPathTimeSeries); err != nil {
plog.Fatal(err)
}
plog.Println("time series saved... Uploading to Google cloud storage...")
u, err := remotestorage.NewGoogleCloudStorage([]byte(cfg.GoogleCloudStorageKey), cfg.GoogleCloudProjectName)
if err != nil {
plog.Fatal(err)
}
srcCSVResultPath := cfg.ResultPathTimeSeries
dstCSVResultPath := filepath.Base(cfg.ResultPathTimeSeries)
if !strings.HasPrefix(dstCSVResultPath, cfg.TestName) {
dstCSVResultPath = fmt.Sprintf("%s-%s", cfg.TestName, dstCSVResultPath)
}
dstCSVResultPath = filepath.Join(cfg.GoogleCloudStorageSubDirectory, dstCSVResultPath)
plog.Printf("Uploading %s to %s", srcCSVResultPath, dstCSVResultPath)
var uerr error
for k := 0; k < 15; k++ {
if uerr = u.UploadFile(cfg.GoogleCloudStorageBucketName, srcCSVResultPath, dstCSVResultPath); uerr != nil {
plog.Println(k, "UploadFile error:", uerr)
time.Sleep(2 * time.Second)
continue
}
break
}
}
{
u, err := remotestorage.NewGoogleCloudStorage([]byte(cfg.GoogleCloudStorageKey), cfg.GoogleCloudProjectName)
if err != nil {
plog.Fatal(err)
}
srcCSVResultPath := cfg.ResultPathLog
dstCSVResultPath := filepath.Base(cfg.ResultPathLog)
if !strings.HasPrefix(dstCSVResultPath, cfg.TestName) {
dstCSVResultPath = fmt.Sprintf("%s-%s", cfg.TestName, dstCSVResultPath)
}
dstCSVResultPath = filepath.Join(cfg.GoogleCloudStorageSubDirectory, dstCSVResultPath)
plog.Printf("Uploading %s to %s", srcCSVResultPath, dstCSVResultPath)
var uerr error
for k := 0; k < 15; k++ {
if uerr = u.UploadFile(cfg.GoogleCloudStorageBucketName, srcCSVResultPath, dstCSVResultPath); uerr != nil {
plog.Println(uerr)
time.Sleep(2 * time.Second)
continue
}
break
}
plog.Println("saving time series at", r.cfg.ResultPathTimeSeries)
if err := toFile(txt, r.cfg.ResultPathTimeSeries); err != nil {
plog.Fatal(err)
}
plog.Println("saved time series at", r.cfg.ResultPathTimeSeries)
}
func (r *report) printHistogram() {