-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Eliminate application-level quantization of throughput measurement. * Added websocket c2s unit tests and added better logging for flaky e2e test. * Clarified measurement code.
- Loading branch information
Showing
6 changed files
with
215 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| package c2s | ||
|
|
||
| import ( | ||
| "context" | ||
| "net" | ||
| "net/http" | ||
| "strconv" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/gorilla/websocket" | ||
| "github.com/m-lab/ndt-server/ndt5/singleserving" | ||
|
|
||
| "github.com/m-lab/ndt-server/ndt5/tcplistener" | ||
|
|
||
| "github.com/m-lab/go/rtx" | ||
| "github.com/m-lab/ndt-server/ndt5/protocol" | ||
| ) | ||
|
|
||
| func MustMakeNetConnection(ctx context.Context) (protocol.MeasuredConnection, net.Conn) { | ||
| listener, err := net.Listen("tcp", "127.0.0.1:0") | ||
| rtx.Must(err, "Could not listen") | ||
| tl := &tcplistener.RawListener{TCPListener: listener.(*net.TCPListener)} | ||
| conns := make(chan net.Conn) | ||
| defer close(conns) | ||
| go func() { | ||
| clientConn, err := net.Dial("tcp", listener.Addr().String()) | ||
| rtx.Must(err, "Could not dial temp conn") | ||
| conns <- clientConn | ||
| }() | ||
| conn, err := tl.Accept() | ||
| rtx.Must(err, "Could not accept") | ||
| return protocol.AdaptNetConn(conn, conn), <-conns | ||
| } | ||
|
|
||
| func Test_DrainForeverButMeasureFor_NormalOperation(t *testing.T) { | ||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| defer cancel() | ||
| sConn, cConn := MustMakeNetConnection(ctx) | ||
| defer sConn.Close() | ||
| defer cConn.Close() | ||
| // Send for longer than we measure. | ||
| go func() { | ||
| ctx2, cancel2 := context.WithTimeout(ctx, 10*time.Second) | ||
| defer cancel2() // Useless, but makes the linter happpy. | ||
| for ctx2.Err() == nil { | ||
| cConn.Write([]byte("hello")) | ||
| } | ||
| cConn.Close() | ||
| }() | ||
| count, err := drainForeverButMeasureFor(ctx, sConn, time.Duration(100*time.Millisecond)) | ||
| if err != nil { | ||
| t.Error("Should not have gotten error:", err) | ||
| } | ||
| if count <= 0 { | ||
| t.Errorf("Expected positive byte count but got %d", count) | ||
| } | ||
| } | ||
|
|
||
| func Test_DrainForeverButMeasureFor_EarlyClientQuit(t *testing.T) { | ||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| defer cancel() | ||
| sConn, cConn := MustMakeNetConnection(ctx) | ||
| defer sConn.Close() | ||
| defer cConn.Close() | ||
| // Measure longer than we send. | ||
| go func() { | ||
| cConn.Write([]byte("hello")) | ||
| time.Sleep(100 * time.Millisecond) // Give the drainForever process time to get going | ||
| cConn.Close() | ||
| }() | ||
| count, err := drainForeverButMeasureFor(ctx, sConn, time.Duration(1*time.Second)) | ||
| if err == nil { | ||
| t.Error("Should have gotten an error") | ||
| } | ||
| if count <= 0 { | ||
| t.Errorf("Expected positive byte count but got %d", count) | ||
| } | ||
| } | ||
|
|
||
| func MustMakeWsConnection(ctx context.Context) (protocol.MeasuredConnection, *websocket.Conn) { | ||
| srv, err := singleserving.ListenWS("c2s") | ||
| rtx.Must(err, "Could not listen") | ||
| conns := make(chan *websocket.Conn) | ||
| defer close(conns) | ||
| go func() { | ||
| d := websocket.Dialer{} | ||
| // This will actually result in a failed websocket connection attempt because | ||
| // we aren't setting any headers. That's okay for testing purposes, as we are | ||
| // trying to make sure that the underlying socket stats are counted, and the | ||
| // failed upgrade will still result in non-zero socket stats. | ||
| clientConn, _, err := d.Dial("ws://localhost:"+strconv.Itoa(srv.Port())+"/ndt_protocol", http.Header{}) | ||
| rtx.Must(err, "Could not dial temp conn") | ||
| conns <- clientConn | ||
| }() | ||
| conn, err := srv.ServeOnce(ctx) | ||
| rtx.Must(err, "Could not accept") | ||
| return conn, <-conns | ||
| } | ||
|
|
||
| func Test_DrainForeverButMeasureFor_CountsAllBytesNotJustWsGoodput(t *testing.T) { | ||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| defer cancel() | ||
| sConn, cConn := MustMakeWsConnection(ctx) | ||
| defer sConn.Close() | ||
| defer cConn.Close() | ||
| // Send for longer than we measure. | ||
| go func() { | ||
| // Send nothing. But the websocket handshake used some bytes, so the underlying socket should not measure zero. | ||
| ctx2, cancel2 := context.WithTimeout(ctx, 1*time.Second) | ||
| defer cancel2() // Useless, but makes the linter happpy. | ||
| <-ctx2.Done() | ||
| cConn.Close() | ||
| }() | ||
| count, err := drainForeverButMeasureFor(ctx, sConn, time.Duration(1*time.Millisecond)) | ||
| if err != nil { | ||
| t.Error("Should not have gotten error:", err) | ||
| } | ||
| if count <= 0 { | ||
| t.Errorf("Expected positive byte count but got %d", count) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.