perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Report usage statistics after transfer bench

Browse Source
This commit is contained in:
Jakob Borg
2015-04-30 08:43:57 +02:00
parent 9638dcda0a
commit c9da8237df
8 changed files with 51 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/filetype_test.go
+12 -12
View File
@@ -122,7 +122,7 @@ func testFileTypeChange(t *testing.T) {
} }
err = receiver.start() err = receiver.start()
if err != nil { if err != nil {
_ = sender.stop() sender.stop()
t.Fatal(err) t.Fatal(err)
} }
@@ -133,27 +133,27 @@ func testFileTypeChange(t *testing.T) {
time.Sleep(time.Second) time.Sleep(time.Second)
continue continue
} }
_ = sender.stop() sender.stop()
_ = receiver.stop() receiver.stop()
t.Fatal(err) t.Fatal(err)
} }
curComp := comp[id2] curComp := comp[id2]
if curComp == 100 { if curComp == 100 {
_ = sender.stop() sender.stop()
_ = receiver.stop() receiver.stop()
break break
} }
time.Sleep(time.Second) time.Sleep(time.Second)
} }
err = sender.stop() _, err = sender.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
err = receiver.stop() _, err = receiver.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -212,7 +212,7 @@ func testFileTypeChange(t *testing.T) {
err = receiver.start() err = receiver.start()
if err != nil { if err != nil {
_ = sender.stop() sender.stop()
t.Fatal(err) t.Fatal(err)
} }
@@ -223,8 +223,8 @@ func testFileTypeChange(t *testing.T) {
time.Sleep(time.Second) time.Sleep(time.Second)
continue continue
} }
_ = sender.stop() sender.stop()
_ = receiver.stop() receiver.stop()
t.Fatal(err) t.Fatal(err)
} }
@@ -237,11 +237,11 @@ func testFileTypeChange(t *testing.T) {
time.Sleep(time.Second) time.Sleep(time.Second)
} }
err = sender.stop() _, err = sender.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
err = receiver.stop() _, err = receiver.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
test/httpstress_test.go
+1 -1
View File
@@ -148,7 +148,7 @@ func TestStressHTTP(t *testing.T) {
t.Error(firstError) t.Error(firstError)
} }
err = sender.stop() _, err = sender.stop()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
test/parallell_scan_test.go
+1 -1
View File
@@ -84,7 +84,7 @@ func TestParallellScan(t *testing.T) {
// This is where the real test is currently, since stop() checks for data // This is where the real test is currently, since stop() checks for data
// race output in the log. // race output in the log.
log.Println("Stopping...") log.Println("Stopping...")
err = st.stop() _, err = st.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
test/reconnect_test.go
+9 -9
View File
@@ -63,7 +63,7 @@ func testRestartDuringTransfer(t *testing.T, restartSender, restartReceiver bool
} }
err = receiver.start() err = receiver.start()
if err != nil { if err != nil {
_ = sender.stop() sender.stop()
t.Fatal(err) t.Fatal(err)
} }
@@ -75,19 +75,19 @@ func testRestartDuringTransfer(t *testing.T, restartSender, restartReceiver bool
time.Sleep(250 * time.Millisecond) time.Sleep(250 * time.Millisecond)
continue continue
} }
_ = sender.stop() sender.stop()
_ = receiver.stop() receiver.stop()
t.Fatal(err) t.Fatal(err)
} }
curComp := comp[id2] curComp := comp[id2]
if curComp == 100 { if curComp == 100 {
err = sender.stop() _, err = sender.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
err = receiver.stop() _, err = receiver.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -97,7 +97,7 @@ func testRestartDuringTransfer(t *testing.T, restartSender, restartReceiver bool
if curComp > prevComp { if curComp > prevComp {
if restartReceiver { if restartReceiver {
log.Printf("Stopping receiver...") log.Printf("Stopping receiver...")
err = receiver.stop() _, err = receiver.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -105,7 +105,7 @@ func testRestartDuringTransfer(t *testing.T, restartSender, restartReceiver bool
if restartSender { if restartSender {
log.Printf("Stopping sender...") log.Printf("Stopping sender...")
err = sender.stop() _, err = sender.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -141,11 +141,11 @@ func testRestartDuringTransfer(t *testing.T, restartSender, restartReceiver bool
time.Sleep(time.Second) time.Sleep(time.Second)
} }
err = sender.stop() _, err = sender.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
err = receiver.stop() _, err = receiver.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
test/symlink_test.go
+10 -10
View File
@@ -186,7 +186,7 @@ func testSymlinks(t *testing.T) {
} }
err = receiver.start() err = receiver.start()
if err != nil { if err != nil {
_ = sender.stop() sender.stop()
t.Fatal(err) t.Fatal(err)
} }
@@ -197,8 +197,8 @@ func testSymlinks(t *testing.T) {
time.Sleep(time.Second) time.Sleep(time.Second)
continue continue
} }
_ = sender.stop() sender.stop()
_ = receiver.stop() receiver.stop()
t.Fatal(err) t.Fatal(err)
} }
@@ -211,11 +211,11 @@ func testSymlinks(t *testing.T) {
time.Sleep(time.Second) time.Sleep(time.Second)
} }
err = sender.stop() _, err = sender.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
err = receiver.stop() _, err = receiver.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -311,7 +311,7 @@ func testSymlinks(t *testing.T) {
err = receiver.start() err = receiver.start()
if err != nil { if err != nil {
_ = sender.stop() sender.stop()
t.Fatal(err) t.Fatal(err)
} }
@@ -322,8 +322,8 @@ func testSymlinks(t *testing.T) {
time.Sleep(time.Second) time.Sleep(time.Second)
continue continue
} }
_ = sender.stop() sender.stop()
_ = receiver.stop() receiver.stop()
t.Fatal(err) t.Fatal(err)
} }
@@ -336,11 +336,11 @@ func testSymlinks(t *testing.T) {
time.Sleep(time.Second) time.Sleep(time.Second)
} }
err = sender.stop() _, err = sender.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
err = receiver.stop() _, err = receiver.stop()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
test/sync_test.go
+3 -3
View File
@@ -287,7 +287,7 @@ func scStartProcesses() ([]syncthingProcess, error) {
} }
err = p[1].start() err = p[1].start()
if err != nil { if err != nil {
_ = p[0].stop() p[0].stop()
return nil, err return nil, err
} }
@@ -299,8 +299,8 @@ func scStartProcesses() ([]syncthingProcess, error) {
} }
err = p[2].start() err = p[2].start()
if err != nil { if err != nil {
_ = p[0].stop() p[0].stop()
_ = p[1].stop() p[1].stop()
return nil, err return nil, err
} }
test/syncthingprocess.go
+3 -3
View File
@@ -106,13 +106,13 @@ func (p *syncthingProcess) start() error {
} }
} }
func (p *syncthingProcess) stop() error { func (p *syncthingProcess) stop() (*os.ProcessState, error) {
p.cmd.Process.Signal(os.Kill) p.cmd.Process.Signal(os.Kill)
p.cmd.Wait() p.cmd.Wait()
fd, err := os.Open(p.logfd.Name()) fd, err := os.Open(p.logfd.Name())
if err != nil { if err != nil {
return err return p.cmd.ProcessState, err
} }
defer fd.Close() defer fd.Close()
@@ -148,7 +148,7 @@ func (p *syncthingProcess) stop() error {
} }
} }
} }
return err return p.cmd.ProcessState, err
} }
func (p *syncthingProcess) get(path string) (*http.Response, error) { func (p *syncthingProcess) get(path string) (*http.Response, error) {
test/transfer-bench_test.go
+12 -2
View File
@@ -10,6 +10,7 @@ package integration
import ( import (
"log" "log"
"syscall"
"testing" "testing"
"time" "time"
) )
@@ -116,7 +117,10 @@ loop:
} }
sender.stop() sender.stop()
receiver.stop() proc, err := receiver.stop()
if err != nil {
t.Fatal(err)
}
log.Println("Verifying...") log.Println("Verifying...")
@@ -129,5 +133,11 @@ loop:
t.Fatal(err) t.Fatal(err)
} }
log.Println("Sync took", t1.Sub(t0)) log.Println("Result: Wall time:", t1.Sub(t0))
if rusage, ok := proc.SysUsage().(*syscall.Rusage); ok {
log.Println("Result: Utime:", time.Duration(rusage.Utime.Nano()))
log.Println("Result: Stime:", time.Duration(rusage.Stime.Nano()))
log.Println("Result: MaxRSS:", rusage.Maxrss/1024, "KiB")
}
} }