Fixed race condition in http.batch()

grafana · Jun 12, 2017 · b2e140c · b2e140c
1 parent 0793b18
commit b2e140c
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/js/modules/k6/http/http.go b/js/modules/k6/http/http.go
@@ -91,10 +91,7 @@ func (res *HTTPResponse) Html(selector ...string) html.Selection {
 
 type HTTP struct{}
 
-func (*HTTP) Request(ctx context.Context, method string, url goja.Value, args ...goja.Value) (*HTTPResponse, error) {
-	rt := common.GetRuntime(ctx)
-	state := common.GetState(ctx)
-
+func (*HTTP) request(ctx context.Context, rt *goja.Runtime, state *common.State, method string, url goja.Value, args ...goja.Value) (*HTTPResponse, []stats.Sample, error) {
 	var bodyReader io.Reader
 	var contentType string
 	if len(args) > 0 && !goja.IsUndefined(args[0]) && !goja.IsNull(args[0]) {
@@ -125,7 +122,7 @@ func (*HTTP) Request(ctx context.Context, method string, url goja.Value, args ..
 
 	req, err := http.NewRequest(method, urlStr, bodyReader)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	if contentType != "" {
 		req.Header.Set("Content-Type", contentType)
@@ -237,7 +234,6 @@ func (*HTTP) Request(ctx context.Context, method string, url goja.Value, args ..
 		}
 	}
 
-	state.Samples = append(state.Samples, trail.Samples(tags)...)
 	if resErr != nil {
 		// Do *not* log errors about the contex being cancelled.
 		select {
@@ -247,10 +243,19 @@ func (*HTTP) Request(ctx context.Context, method string, url goja.Value, args ..
 		}
 
 		if throw {
-			return nil, resErr
+			return nil, nil, resErr
 		}
 	}
-	return resp, nil
+	return resp, trail.Samples(tags), nil
+}
+
+func (http *HTTP) Request(ctx context.Context, method string, url goja.Value, args ...goja.Value) (*HTTPResponse, error) {
+	rt := common.GetRuntime(ctx)
+	state := common.GetState(ctx)
+
+	res, samples, err := http.request(ctx, rt, state, method, url, args...)
+	state.Samples = append(state.Samples, samples...)
+	return res, err
 }
 
 func (http *HTTP) Get(ctx context.Context, url goja.Value, args ...goja.Value) (*HTTPResponse, error) {
@@ -283,6 +288,7 @@ func (http *HTTP) Del(ctx context.Context, url goja.Value, args ...goja.Value) (
 
 func (http *HTTP) Batch(ctx context.Context, reqsV goja.Value) (goja.Value, error) {
 	rt := common.GetRuntime(ctx)
+	state := common.GetState(ctx)
 
 	errs := make(chan error)
 	retval := rt.NewObject()
@@ -323,12 +329,13 @@ func (http *HTTP) Batch(ctx context.Context, reqsV goja.Value) (goja.Value, erro
 		}
 
 		go func() {
-			res, err := http.Request(ctx, method, url, args...)
+			res, samples, err := http.request(ctx, rt, state, method, url, args...)
 			if err != nil {
 				errs <- err
 			}
 			mutex.Lock()
 			_ = retval.Set(k, res)
+			state.Samples = append(state.Samples, samples...)
 			mutex.Unlock()
 			errs <- nil
 		}()