Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Core changes for k6/x/execution JS module #1863

Merged
merged 22 commits into from
Jun 22, 2021
Merged

Core changes for k6/x/execution JS module #1863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
052bdf1
Embed ScenarioState in execution context
Jun 18, 2021
9adf101
Embed ExecutionState in context
Jun 18, 2021
84c32d4
Use uint64 for VU IDs
Feb 22, 2021
434e2a2
Add per scenario VU ID
Feb 22, 2021
fc487cf
Add per scenario VU iteration
Feb 22, 2021
edff038
Fix race condition activating VUs
Feb 22, 2021
6e52ab9
Add per scenario global VU iterations
Jun 18, 2021
6363829
Move and export SegmentedIndex to lib
Feb 26, 2021
58822d2
Add global segmented iterations to SharedIterations
Feb 26, 2021
13dd3f4
Add global segmented iterations to ConstantArrivalRate
Feb 26, 2021
d46a1bf
Add global segmented iterations to RampingArrivalRate
Feb 26, 2021
8a58c0c
Fix and silence some linter issues
Apr 12, 2021
bb9761c
Remove redundant nolint comments
May 14, 2021
0fdb1c2
Make scenario iteration local to VUs, fix iteration increment, start …
May 28, 2021
467759e
Fix sync of scenario iteration increments
Jun 2, 2021
85ae41b
Use uint64 for iterations
Jun 3, 2021
6de5a40
Return result from SegmentedIndex methods, remove superfluous locking
Jun 10, 2021
2e02ed4
Use a single segmented index for local and global iterations (#2057)
mstoykov Jun 11, 2021
19ae8de
Accept ExecutionTuple in SegmentedIndex constructor
Jun 11, 2021
ea2ebb1
Add global VU IDs
Jun 15, 2021
b515245
Fix unlikely data race when calling BaseExecutor methods
Jun 16, 2021
0279c67
Remove scenario specific VU IDs
Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions core/local/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,15 @@ func (e *ExecutionScheduler) GetExecutionPlan() []lib.ExecutionStep {
func (e *ExecutionScheduler) initVU(
samplesOut chan<- stats.SampleContainer, logger *logrus.Entry,
) (lib.InitializedVU, error) {
// Get the VU ID here, so that the VUs are (mostly) ordered by their
// Get the VU IDs here, so that the VUs are (mostly) ordered by their
// number in the channel buffer
vuID := e.state.GetUniqueVUIdentifier()
vu, err := e.runner.NewVU(int64(vuID), samplesOut)
vuIDLocal, vuIDGlobal := e.state.GetUniqueVUIdentifiers()
vu, err := e.runner.NewVU(vuIDLocal, vuIDGlobal, samplesOut)
if err != nil {
return nil, errext.WithHint(err, fmt.Sprintf("error while initializing VU #%d", vuID))
return nil, errext.WithHint(err, fmt.Sprintf("error while initializing VU #%d", vuIDGlobal))
}

logger.Debugf("Initialized VU #%d", vuID)
logger.Debugf("Initialized VU #%d", vuIDGlobal)
return vu, nil
}

Expand Down Expand Up @@ -362,6 +362,7 @@ func (e *ExecutionScheduler) Run(globalCtx, runCtx context.Context, engineOut ch

runResults := make(chan error, executorsCount) // nil values are successful runs

runCtx = lib.WithExecutionState(runCtx, e.state)
runSubCtx, cancel := context.WithCancel(runCtx)
defer cancel() // just in case, and to shut up go vet...

Expand Down
4 changes: 2 additions & 2 deletions js/bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func (b *Bundle) getExports(logger logrus.FieldLogger, rt *goja.Runtime, options
}

// Instantiate creates a new runtime from this bundle.
func (b *Bundle) Instantiate(logger logrus.FieldLogger, vuID int64) (bi *BundleInstance, instErr error) {
func (b *Bundle) Instantiate(logger logrus.FieldLogger, vuID uint64) (bi *BundleInstance, instErr error) {
// TODO: actually use a real context here, so that the instantiation can be killed
// Placeholder for a real context.
ctxPtr := new(context.Context)
Expand Down Expand Up @@ -283,7 +283,7 @@ func (b *Bundle) Instantiate(logger logrus.FieldLogger, vuID int64) (bi *BundleI

// Instantiates the bundle into an existing runtime. Not public because it also messes with a bunch
// of other things, will potentially thrash data and makes a mess in it if the operation fails.
func (b *Bundle) instantiate(logger logrus.FieldLogger, rt *goja.Runtime, init *InitContext, vuID int64) error {
func (b *Bundle) instantiate(logger logrus.FieldLogger, rt *goja.Runtime, init *InitContext, vuID uint64) error {
rt.SetParserOptions(parser.WithDisableSourceMaps)
rt.SetFieldNameMapper(common.FieldNameMapper{})
rt.SetRandSource(common.NewRandSource())
Expand Down
2 changes: 1 addition & 1 deletion js/bundle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ func TestBundleNotSharable(t *testing.T) {
t.Run(name, func(t *testing.T) {
t.Parallel()
for i := 0; i < vus; i++ {
bi, err := b.Instantiate(logger, int64(i))
bi, err := b.Instantiate(logger, uint64(i))
require.NoError(t, err)
for j := 0; j < iters; j++ {
bi.Runtime.Set("__ITER", j)
Expand Down
4 changes: 2 additions & 2 deletions js/console_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func TestConsole(t *testing.T) {
assert.NoError(t, err)

samples := make(chan stats.SampleContainer, 100)
initVU, err := r.newVU(1, samples)
initVU, err := r.newVU(1, 1, samples)
assert.NoError(t, err)

ctx, cancel := context.WithCancel(context.Background())
Expand Down Expand Up @@ -245,7 +245,7 @@ func TestFileConsole(t *testing.T) {
assert.NoError(t, err)

samples := make(chan stats.SampleContainer, 100)
initVU, err := r.newVU(1, samples)
initVU, err := r.newVU(1, 1, samples)
assert.NoError(t, err)

ctx, cancel := context.WithCancel(context.Background())
Expand Down
2 changes: 1 addition & 1 deletion js/empty_iteartions_bench_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func BenchmarkEmptyIteration(b *testing.B) {
for range ch {
}
}()
initVU, err := r.NewVU(1, ch)
initVU, err := r.NewVU(1, 1, ch)
if !assert.NoError(b, err) {
return
}
Expand Down
4 changes: 2 additions & 2 deletions js/http_bench_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func BenchmarkHTTPRequests(b *testing.B) {
for range ch {
}
}()
initVU, err := r.NewVU(1, ch)
initVU, err := r.NewVU(1, 1, ch)
if !assert.NoError(b, err) {
return
}
Expand Down Expand Up @@ -105,7 +105,7 @@ func BenchmarkHTTPRequestsBase(b *testing.B) {
for range ch {
}
}()
initVU, err := r.NewVU(1, ch)
initVU, err := r.NewVU(1, 1, ch)
if !assert.NoError(b, err) {
return
}
Expand Down
13 changes: 7 additions & 6 deletions js/init_and_modules_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,18 @@ import (
"testing"
"time"

"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/guregu/null.v3"

"go.k6.io/k6/js"
"go.k6.io/k6/js/common"
"go.k6.io/k6/js/modules"
"go.k6.io/k6/lib"
"go.k6.io/k6/lib/testutils"
"go.k6.io/k6/loader"
"go.k6.io/k6/stats"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/guregu/null.v3"
)

type CheckModule struct {
Expand Down Expand Up @@ -94,7 +95,7 @@ func TestNewJSRunnerWithCustomModule(t *testing.T) {
assert.Equal(t, checkModule.initCtxCalled, 1)
assert.Equal(t, checkModule.vuCtxCalled, 0)

vu, err := runner.NewVU(1, make(chan stats.SampleContainer, 100))
vu, err := runner.NewVU(1, 1, make(chan stats.SampleContainer, 100))
require.NoError(t, err)
assert.Equal(t, checkModule.initCtxCalled, 2)
assert.Equal(t, checkModule.vuCtxCalled, 0)
Expand All @@ -118,7 +119,7 @@ func TestNewJSRunnerWithCustomModule(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, checkModule.initCtxCalled, 3) // changes because we need to get the exported functions
assert.Equal(t, checkModule.vuCtxCalled, 2)
vuFromArc, err := runnerFromArc.NewVU(2, make(chan stats.SampleContainer, 100))
vuFromArc, err := runnerFromArc.NewVU(2, 2, make(chan stats.SampleContainer, 100))
require.NoError(t, err)
assert.Equal(t, checkModule.initCtxCalled, 4)
assert.Equal(t, checkModule.vuCtxCalled, 2)
Expand Down
20 changes: 10 additions & 10 deletions js/module_loading_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func TestLoadOnceGlobalVars(t *testing.T) {
t.Parallel()
ch := newDevNullSampleChannel()
defer close(ch)
initVU, err := r.NewVU(1, ch)
initVU, err := r.NewVU(1, 1, ch)

ctx, cancel := context.WithCancel(context.Background())
defer cancel()
Expand Down Expand Up @@ -167,7 +167,7 @@ func TestLoadExportsIsUsableInModule(t *testing.T) {
t.Parallel()
ch := newDevNullSampleChannel()
defer close(ch)
initVU, err := r.NewVU(1, ch)
initVU, err := r.NewVU(1, 1, ch)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
vu := initVU.Activate(&lib.VUActivationParams{RunContext: ctx})
Expand Down Expand Up @@ -215,7 +215,7 @@ func TestLoadDoesntBreakHTTPGet(t *testing.T) {
t.Parallel()
ch := newDevNullSampleChannel()
defer close(ch)
initVU, err := r.NewVU(1, ch)
initVU, err := r.NewVU(1, 1, ch)
require.NoError(t, err)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
Expand Down Expand Up @@ -261,7 +261,7 @@ func TestLoadGlobalVarsAreNotSharedBetweenVUs(t *testing.T) {
t.Parallel()
ch := newDevNullSampleChannel()
defer close(ch)
initVU, err := r.NewVU(1, ch)
initVU, err := r.NewVU(1, 1, ch)
require.NoError(t, err)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
Expand All @@ -270,7 +270,7 @@ func TestLoadGlobalVarsAreNotSharedBetweenVUs(t *testing.T) {
require.NoError(t, err)

// run a second VU
initVU, err = r.NewVU(2, ch)
initVU, err = r.NewVU(2, 2, ch)
require.NoError(t, err)
ctx, cancel = context.WithCancel(context.Background())
defer cancel()
Expand Down Expand Up @@ -326,7 +326,7 @@ func TestLoadCycle(t *testing.T) {
t.Parallel()
ch := newDevNullSampleChannel()
defer close(ch)
initVU, err := r.NewVU(1, ch)
initVU, err := r.NewVU(1, 1, ch)
require.NoError(t, err)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
Expand Down Expand Up @@ -389,7 +389,7 @@ func TestLoadCycleBinding(t *testing.T) {
t.Parallel()
ch := newDevNullSampleChannel()
defer close(ch)
initVU, err := r.NewVU(1, ch)
initVU, err := r.NewVU(1, 1, ch)
require.NoError(t, err)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
Expand Down Expand Up @@ -455,7 +455,7 @@ func TestBrowserified(t *testing.T) {
t.Parallel()
ch := make(chan stats.SampleContainer, 100)
defer close(ch)
initVU, err := r.NewVU(1, ch)
initVU, err := r.NewVU(1, 1, ch)
require.NoError(t, err)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
Expand Down Expand Up @@ -499,7 +499,7 @@ func TestLoadingUnexistingModuleDoesntPanic(t *testing.T) {
t.Parallel()
ch := newDevNullSampleChannel()
defer close(ch)
initVU, err := r.NewVU(1, ch)
initVU, err := r.NewVU(1, 1, ch)
require.NoError(t, err)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
Expand Down Expand Up @@ -534,7 +534,7 @@ func TestLoadingSourceMapsDoesntErrorOut(t *testing.T) {
t.Parallel()
ch := newDevNullSampleChannel()
defer close(ch)
initVU, err := r.NewVU(1, ch)
initVU, err := r.NewVU(1, 1, ch)
require.NoError(t, err)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
Expand Down
2 changes: 1 addition & 1 deletion js/modules/k6/marshalling_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func TestSetupDataMarshalling(t *testing.T) {
if !assert.NoError(t, runner.Setup(context.Background(), samples)) {
return
}
initVU, err := runner.NewVU(1, samples)
initVU, err := runner.NewVU(1, 1, samples)
if assert.NoError(t, err) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
Expand Down
Loading