build(flux): update flux to v0.185.0 (#23775)

pull/23784/head
Nathaniel Cook 2022-10-05 08:25:58 -06:00 committed by GitHub
parent aa5c1c0bae
commit a321e72d15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 29 deletions

View File

@ -276,7 +276,7 @@ func queryPoints(ctx context.Context, t *testing.T, l *launcher.TestLauncher, op
if d.verbose {
t.Logf("query:\n%s", qs)
}
pkg, err := runtime.ParseToJSON(qs)
pkg, err := runtime.ParseToJSON(context.Background(), qs)
if err != nil {
t.Fatal(err)
}
@ -291,10 +291,10 @@ func queryPoints(ctx context.Context, t *testing.T, l *launcher.TestLauncher, op
}
// This test:
// - initializes a default launcher and sets memory limits;
// - writes some data;
// - queries the data;
// - verifies that the query fails (or not) and that the memory was de-allocated.
// - initializes a default launcher and sets memory limits;
// - writes some data;
// - queries the data;
// - verifies that the query fails (or not) and that the memory was de-allocated.
func TestLauncher_QueryMemoryLimits(t *testing.T) {
tcs := []struct {
name string
@ -385,12 +385,12 @@ func TestLauncher_QueryMemoryLimits(t *testing.T) {
}
// This test:
// - initializes a default launcher and sets memory limits;
// - writes some data;
// - launches a query that does not error;
// - launches a query that gets canceled while executing;
// - launches a query that does not error;
// - verifies after each query run the used memory.
// - initializes a default launcher and sets memory limits;
// - writes some data;
// - launches a query that does not error;
// - launches a query that gets canceled while executing;
// - launches a query that does not error;
// - verifies after each query run the used memory.
func TestLauncher_QueryMemoryManager_ExceedMemory(t *testing.T) {
t.Skip("this test is flaky, occasionally get error: \"memory allocation limit reached\" on OK query")
@ -429,12 +429,12 @@ func TestLauncher_QueryMemoryManager_ExceedMemory(t *testing.T) {
}
// This test:
// - initializes a default launcher and sets memory limits;
// - writes some data;
// - launches a query that does not error;
// - launches a query and cancels its context;
// - launches a query that does not error;
// - verifies after each query run the used memory.
// - initializes a default launcher and sets memory limits;
// - writes some data;
// - launches a query that does not error;
// - launches a query and cancels its context;
// - launches a query that does not error;
// - verifies after each query run the used memory.
func TestLauncher_QueryMemoryManager_ContextCanceled(t *testing.T) {
t.Skip("this test is flaky, occasionally get error: \"memory allocation limit reached\"")
@ -467,13 +467,14 @@ func TestLauncher_QueryMemoryManager_ContextCanceled(t *testing.T) {
}
// This test:
// - initializes a default launcher and sets memory limits;
// - writes some data;
// - launches (concurrently) a mixture of
// - OK queries;
// - queries that exceed the memory limit;
// - queries that get canceled;
// - verifies the used memory.
// - initializes a default launcher and sets memory limits;
// - writes some data;
// - launches (concurrently) a mixture of
// - OK queries;
// - queries that exceed the memory limit;
// - queries that get canceled;
// - verifies the used memory.
//
// Concurrency limit is set to 1, so only 1 query runs at a time and the others are queued.
// OK queries do not overcome the soft limit, so that they can run concurrently with the ones that exceed limits.
// The aim of this test is to verify that memory tracking works properly in the controller,

View File

@ -126,6 +126,9 @@ vec_with_unary_exists
vectorize_div_by_zero_int_const
vectorize_div_by_zero_int_const_const
vec_with_float_typed_null
vec_with_float_untyped_null
# Other skipped tests
align_time
buckets

2
go.mod
View File

@ -29,7 +29,7 @@ require (
github.com/google/go-jsonnet v0.17.0
github.com/hashicorp/vault/api v1.0.2
github.com/influxdata/cron v0.0.0-20201006132531-4bb0a200dcbe
github.com/influxdata/flux v0.184.2
github.com/influxdata/flux v0.185.0
github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69
github.com/influxdata/influx-cli/v2 v2.2.1-0.20220318222112-88ba3464cd07
github.com/influxdata/influxql v1.1.1-0.20211004132434-7e7d61973256

4
go.sum
View File

@ -503,8 +503,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/influxdata/cron v0.0.0-20201006132531-4bb0a200dcbe h1:7j4SdN/BvQwN6WoUq7mv0kg5U9NhnFBxPGMafYRKym0=
github.com/influxdata/cron v0.0.0-20201006132531-4bb0a200dcbe/go.mod h1:XabtPPW2qsCg0tl+kjaPU+cFS+CjQXEXbT1VJvHT4og=
github.com/influxdata/flux v0.184.2 h1:WKrnNs2cfufg/27DMhklUwUyIPmlG9HzPn8C0t3Nqes=
github.com/influxdata/flux v0.184.2/go.mod h1:OpNt6KbBOOOfpYdyF+SR/gBnf4s4R5dI1X5HFtJJX2M=
github.com/influxdata/flux v0.185.0 h1:6hKu0+TX3lPKoF++6LFXwCyQcc1aubZIVp+fICZLRV4=
github.com/influxdata/flux v0.185.0/go.mod h1:OpNt6KbBOOOfpYdyF+SR/gBnf4s4R5dI1X5HFtJJX2M=
github.com/influxdata/gosnowflake v1.6.9 h1:BhE39Mmh8bC+Rvd4QQsP2gHypfeYIH1wqW1AjGWxxrE=
github.com/influxdata/gosnowflake v1.6.9/go.mod h1:9W/BvCXOKx2gJtQ+jdi1Vudev9t9/UDOEHnlJZ/y1nU=
github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 h1:WQsmW0fXO4ZE/lFGIE84G6rIV5SJN3P3sjIXAP1a8eU=

View File

@ -180,6 +180,7 @@ func TestReadWindowAggregateSource(t *testing.T) {
orgID, bucketID := platform2.ID(1), platform2.ID(2)
executetest.RunSourceHelper(t,
context.Background(),
[]*executetest.Table{
{
ColMeta: []flux.ColMeta{

View File

@ -633,7 +633,7 @@ func exhaustResultIterators(res flux.Result) error {
// NewASTCompiler parses a Flux query string into an AST representation.
func NewASTCompiler(ctx context.Context, query string, ts CompilerBuilderTimestamps) (flux.Compiler, error) {
pkg, err := runtime.ParseToJSON(query)
pkg, err := runtime.ParseToJSON(ctx, query)
if err != nil {
return nil, err
}

View File

@ -32,7 +32,7 @@ type fakeQueryService struct {
var _ query.AsyncQueryService = (*fakeQueryService)(nil)
func makeAST(q string) lang.ASTCompiler {
pkg, err := runtime.ParseToJSON(q)
pkg, err := runtime.ParseToJSON(context.Background(), q)
if err != nil {
panic(err)
}