* ci: use same feature set in `build_dev` and `build_release`

* ci: also enable unstable tokio for `build_dev`

* chore: update tokio to 1.21 (to fix console-subscriber 0.1.8

* fix: "must use"
pull/24376/head
Marco Neumann 2022-09-06 14:13:28 +00:00 committed by GitHub
parent b494c73cb3
commit adeacf416c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 44 additions and 43 deletions

View File

@ -263,9 +263,10 @@ jobs:
environment:
# Disable incremental compilation to avoid overhead. We are not preserving these files anyway.
CARGO_INCREMENTAL: "0"
# Disable full debug symbol generation to speed up CI build
# "1" means line tables only, which is useful for panic tracebacks.
RUSTFLAGS: "-C debuginfo=1"
# - Disable full debug symbol generation to speed up CI build
# "1" means line tables only, which is useful for panic tracebacks.
# - Enable tokio-console
RUSTFLAGS: "-C debuginfo=1 --cfg tokio_unstable"
# https://github.com/rust-lang/cargo/issues/10280
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
# The `2xlarge` resource class that we use has 32GB RAM but also 16 CPUs. This means we have 2GB RAM per core on
@ -282,8 +283,8 @@ jobs:
name: Check benches compile
command: cargo check --workspace --benches
- run:
name: Check object store + exporter support + HEAP profiling compiles
command: cargo check --no-default-features --features="aws,gcp,azure,heappy,pprof"
name: Check extra features (like prod image)
command: cargo check --no-default-features --features="aws,gcp,azure,jemalloc_replacing_malloc,tokio_console,pprof"
- run:
# Validate that the data generator compiles (in the same way as it does in release builds)
name: Check iox_data_generator compiles

4
Cargo.lock generated
View File

@ -5151,9 +5151,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
version = "1.20.1"
version = "1.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581"
checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42"
dependencies = [
"autocfg",
"bytes",

View File

@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"
[dependencies]
tokio = { version = "1.20", features = ["macros", "time"] }
tokio = { version = "1.21", features = ["macros", "time"] }
observability_deps = { path = "../observability_deps" }
rand = "0.8"
snafu = "0.7"

View File

@ -11,7 +11,7 @@ metric = { path = "../metric" }
observability_deps = { path = "../observability_deps" }
parking_lot = { version = "0.12", features = ["arc_lock"] }
pdatastructs = { version = "0.7", default-features = false, features = ["fixedbitset"] }
tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
tokio-util = { version = "0.7.3" }
trace = { path = "../trace"}
workspace-hack = { path = "../workspace-hack"}

View File

@ -13,4 +13,4 @@ tower = "0.4"
workspace-hack = { path = "../workspace-hack"}
[dev-dependencies]
tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread"] }
tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread"] }

View File

@ -23,7 +23,7 @@ schema = { path = "../schema" }
snafu = "0.7"
thiserror = "1.0"
iox_time = { path = "../iox_time" }
tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
tokio-util = { version = "0.7.3" }
uuid = { version = "1", features = ["v4"] }
workspace-hack = { path = "../workspace-hack"}

View File

@ -11,7 +11,7 @@ datafusion = { path = "../datafusion" }
futures = "0.3"
observability_deps = { path = "../observability_deps" }
pin-project = "1.0"
tokio = { version = "1.20", features = ["parking_lot", "sync"] }
tokio = { version = "1.21", features = ["parking_lot", "sync"] }
tokio-stream = "0.1"
workspace-hack = { path = "../workspace-hack"}

View File

@ -8,7 +8,7 @@ futures = "0.3"
observability_deps = { path = "../observability_deps" }
parking_lot = "0.12"
pin-project = "1.0"
tokio = { version = "1.20" }
tokio = { version = "1.21" }
tokio-util = { version = "0.7.3" }
workspace-hack = { path = "../workspace-hack"}

View File

@ -197,7 +197,7 @@ impl DedicatedExecutor {
}
// Wait for all tasks to finish
join.write().await;
let _guard = join.write().await;
// signal shutdown, but it's OK if the other side is gone
tx_shutdown.send(()).ok();

View File

@ -18,5 +18,5 @@ uuid = { version = "1", features = ["v4"] }
mockito = "0.31"
once_cell = { version = "1.14.0", features = ["parking_lot"] }
parking_lot = "0.12"
tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
test_helpers = { path = "../test_helpers" }

View File

@ -58,7 +58,7 @@ serde_json = "1.0.83"
snafu = "0.7"
thiserror = "1.0.34"
tikv-jemalloc-ctl = { version = "0.5.0", optional = true }
tokio = { version = "1.20", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
tokio-stream = { version = "0.1", features = ["net"] }
tokio-util = { version = "0.7.3" }
tonic = "0.8"

View File

@ -30,4 +30,4 @@ thiserror = "1.0.34"
tonic = { version = "0.8" }
[dev-dependencies] # In alphabetical order
tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread"] }
tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread"] }

View File

@ -36,7 +36,7 @@ schema = { path = "../schema" }
snafu = "0.7"
thiserror = "1.0"
iox_time = { path = "../iox_time" }
tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
tonic = { version = "0.8" }
tracker = { path = "../tracker" }
uuid = { version = "1", features = ["v4"] }

View File

@ -16,7 +16,7 @@ snafu = "0.7"
sqlx = { version = "0.6", features = [ "runtime-tokio-rustls" , "postgres", "uuid" ] }
sqlx-hotswap-pool = { path = "../sqlx-hotswap-pool" }
thiserror = "1.0.34"
tokio = { version = "1.20", features = ["io-util", "macros", "parking_lot", "rt-multi-thread", "time"] }
tokio = { version = "1.21", features = ["io-util", "macros", "parking_lot", "rt-multi-thread", "time"] }
uuid = { version = "1", features = ["v4"] }
workspace-hack = { path = "../workspace-hack"}

View File

@ -19,7 +19,7 @@ regex = "1.6"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.83"
snafu = "0.7"
tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
toml = "0.5.9"
tracing = "0.1"
tracing-subscriber = "0.3"

View File

@ -31,7 +31,7 @@ parking_lot = "0.12"
query_functions = { path = "../query_functions"}
schema = { path = "../schema" }
snafu = "0.7"
tokio = { version = "1.20", features = ["macros", "parking_lot"] }
tokio = { version = "1.21", features = ["macros", "parking_lot"] }
tokio-stream = "0.1"
trace = { path = "../trace" }
predicate = { path = "../predicate" }

View File

@ -7,7 +7,7 @@ description = "Time functionality for IOx"
[dependencies]
chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }
parking_lot = "0.12"
tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
workspace-hack = { path = "../workspace-hack"}
[dev-dependencies]

View File

@ -43,7 +43,7 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.83"
serde_urlencoded = "0.7.0"
snafu = "0.7"
tokio = { version = "1.20", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
tokio-stream = { version = "0.1", features = ["net"] }
tokio-util = { version = "0.7.3" }
tonic = "0.8"

View File

@ -26,7 +26,7 @@ arrow-flight = "21.0.0"
async-trait = "0.1"
hyper = "0.14"
thiserror = "1.0.34"
tokio = { version = "1.20", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
tonic = "0.8"
workspace-hack = { path = "../workspace-hack"}
parquet_file = { version = "0.1.0", path = "../parquet_file" }

View File

@ -24,6 +24,6 @@ async-trait = "0.1"
hashbrown = "0.12"
hyper = "0.14"
thiserror = "1.0.34"
tokio = { version = "1.20", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
tokio-util = { version = "0.7.3" }
workspace-hack = { path = "../workspace-hack"}

View File

@ -12,10 +12,10 @@ iox_time = { version = "0.1.0", path = "../iox_time" }
metric = { version = "0.1.0", path = "../metric" }
object_store = "0.4.0"
pin-project = "1.0.12"
tokio = { version = "1.20", features = ["io-util"] }
tokio = { version = "1.21", features = ["io-util"] }
workspace-hack = { path = "../workspace-hack" }
[dev-dependencies] # In alphabetical order
dotenvy = "0.15.1"
snafu = "0.7"
tokio = { version = "1.20", features = ["macros", "io-util"] }
tokio = { version = "1.21", features = ["macros", "io-util"] }

View File

@ -25,7 +25,7 @@ prost = "0.11"
schema = { path = "../schema" }
snafu = "0.7"
thrift = "0.13"
tokio = { version = "1.20", features = ["macros", "parking_lot", "rt", "rt-multi-thread", "sync"] }
tokio = { version = "1.21", features = ["macros", "parking_lot", "rt", "rt-multi-thread", "sync"] }
uuid = { version = "1", features = ["v4"] }
zstd = "0.11"
workspace-hack = { path = "../workspace-hack"}

View File

@ -34,7 +34,7 @@ sharder = { path = "../sharder" }
snafu = "0.7"
thiserror = "1.0"
iox_time = { path = "../iox_time" }
tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
tokio-util = { version = "0.7.3" }
tonic = { version = "0.8" }
trace = { path = "../trace" }

View File

@ -19,5 +19,5 @@ snafu = "0.7"
workspace-hack = { path = "../workspace-hack"}
[dev-dependencies]
tokio = { version = "1.20", features = ["macros", "parking_lot"] }
tokio = { version = "1.21", features = ["macros", "parking_lot"] }
datafusion_util = { path = "../datafusion_util" }

View File

@ -27,7 +27,7 @@ once_cell = { version = "1.14.0", features = ["parking_lot"] }
predicate = { path = "../predicate" }
schema = { path = "../schema" }
sharder = { path = "../sharder" }
tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "time"] }
tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "time"] }
querier = { path = "../querier" }
iox_query = { path = "../iox_query" }
workspace-hack = { path = "../workspace-hack"}

View File

@ -28,7 +28,7 @@ prost = "0.11"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.83"
snafu = "0.7"
tokio = { version = "1.20", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
tonic = "0.8"
workspace-hack = { path = "../workspace-hack"}

View File

@ -28,7 +28,7 @@ regex = "1.6.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.83"
snafu = "0.7"
tokio = { version = "1.20", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
tokio-stream = { version = "0.1", features = ["net"] }
tonic = "0.8"
workspace-hack = { path = "../workspace-hack"}

View File

@ -11,7 +11,7 @@ publish = false
[dependencies]
sqlx = { version = "0.6.1", features = ["runtime-tokio-rustls", "postgres", "json", "tls"] }
either = "1.7.0"
tokio = { version = "1.20", features = ["rt-multi-thread", "macros", "parking_lot"] }
tokio = { version = "1.21", features = ["rt-multi-thread", "macros", "parking_lot"] }
futures = "0.3"
workspace-hack = { path = "../workspace-hack"}

View File

@ -24,7 +24,7 @@ reqwest = { version = "0.11", default-features = false, features = ["json", "rus
sqlx = { version = "0.6", features = [ "runtime-tokio-rustls" , "postgres", "uuid" ] }
tempfile = "3.1.0"
test_helpers = { path = "../test_helpers", features = ["future_timeout"] }
tokio = { version = "1.20", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
tokio-util = "0.7"
tonic = "0.8"
workspace-hack = { path = "../workspace-hack"}

View File

@ -14,7 +14,7 @@ futures = "0.3"
observability_deps = { path = "../observability_deps" }
snafu = "0.7"
thrift = { version = "0.13.0" }
tokio = { version = "1.20", features = ["macros", "parking_lot", "rt", "sync"] }
tokio = { version = "1.21", features = ["macros", "parking_lot", "rt", "sync"] }
trace = { path = "../trace" }
workspace-hack = { path = "../workspace-hack"}

View File

@ -15,11 +15,11 @@ observability_deps = { path = "../observability_deps" }
parking_lot = "0.12"
pin-project = "1.0"
iox_time = { path = "../iox_time" }
tokio = { version = "1.20", features = ["macros", "parking_lot", "sync", "time"] }
tokio = { version = "1.21", features = ["macros", "parking_lot", "sync", "time"] }
tokio-util = { version = "0.7.3" }
trace = { path = "../trace"}
workspace-hack = { path = "../workspace-hack"}
[dev-dependencies]
# Need the multi-threaded executor for testing
tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "time"] }
tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "time"] }

View File

@ -62,7 +62,7 @@ sha2 = { version = "0.10", features = ["std"] }
smallvec = { version = "1", default-features = false, features = ["union"] }
sqlx = { version = "0.6", features = ["_rt-tokio", "json", "macros", "migrate", "postgres", "runtime-tokio-rustls", "sqlx-macros", "tls", "uuid"] }
sqlx-core = { version = "0.6", default-features = false, features = ["_rt-tokio", "_tls-rustls", "any", "base64", "crc", "dirs", "hkdf", "hmac", "json", "md-5", "migrate", "postgres", "rand", "runtime-tokio-rustls", "rustls", "rustls-pemfile", "serde", "serde_json", "sha-1", "sha2", "tokio-stream", "uuid", "webpki-roots", "whoami"] }
tokio = { version = "1", features = ["bytes", "fs", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "time", "tokio-macros", "tracing"] }
tokio = { version = "1", features = ["bytes", "fs", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "time", "tokio-macros", "tracing"] }
tokio-stream = { version = "0.1", features = ["fs", "net", "time"] }
tokio-util = { version = "0.7", features = ["codec", "tracing"] }
tonic = { version = "0.8", features = ["async-trait", "axum", "channel", "codegen", "h2", "hyper", "hyper-timeout", "prost", "prost-derive", "prost1", "tokio", "tower", "tracing-futures", "transport"] }
@ -121,7 +121,7 @@ smallvec = { version = "1", default-features = false, features = ["union"] }
sqlx-core = { version = "0.6", default-features = false, features = ["_rt-tokio", "_tls-rustls", "any", "base64", "crc", "dirs", "hkdf", "hmac", "json", "md-5", "migrate", "postgres", "rand", "runtime-tokio-rustls", "rustls", "rustls-pemfile", "serde", "serde_json", "sha-1", "sha2", "tokio-stream", "uuid", "webpki-roots", "whoami"] }
sqlx-macros = { version = "0.6", default-features = false, features = ["_rt-tokio", "json", "migrate", "postgres", "runtime-tokio-rustls", "serde_json", "sha2", "uuid"] }
syn = { version = "1", features = ["clone-impls", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
tokio = { version = "1", features = ["bytes", "fs", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "time", "tokio-macros", "tracing"] }
tokio = { version = "1", features = ["bytes", "fs", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "time", "tokio-macros", "tracing"] }
tokio-stream = { version = "0.1", features = ["fs", "net", "time"] }
tonic-build = { version = "0.8", features = ["prost", "prost-build", "transport"] }
uuid = { version = "1", features = ["private_getrandom", "rng", "std", "v4"] }
@ -163,7 +163,7 @@ once_cell = { version = "1", default-features = false, features = ["unstable"] }
scopeguard = { version = "1", features = ["use_std"] }
tokio = { version = "1", default-features = false, features = ["winapi"] }
tokio-util = { version = "0.7", default-features = false, features = ["io"] }
winapi = { version = "0.3", default-features = false, features = ["activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "ntstatus", "objbase", "processenv", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] }
winapi = { version = "0.3", default-features = false, features = ["accctrl", "aclapi", "activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "ntstatus", "objbase", "processenv", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] }
windows-sys = { version = "0.36", features = ["Win32", "Win32_Foundation", "Win32_Networking", "Win32_Networking_WinSock", "Win32_Security", "Win32_Storage", "Win32_Storage_FileSystem", "Win32_System", "Win32_System_IO", "Win32_System_LibraryLoader", "Win32_System_Pipes", "Win32_System_SystemServices", "Win32_System_WindowsProgramming"] }
[target.x86_64-pc-windows-msvc.build-dependencies]
@ -171,7 +171,7 @@ getrandom = { version = "0.2", default-features = false, features = ["std"] }
once_cell = { version = "1", default-features = false, features = ["unstable"] }
scopeguard = { version = "1", features = ["use_std"] }
tokio = { version = "1", default-features = false, features = ["winapi"] }
winapi = { version = "0.3", default-features = false, features = ["activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "ntstatus", "objbase", "processenv", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] }
winapi = { version = "0.3", default-features = false, features = ["accctrl", "aclapi", "activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "ntstatus", "objbase", "processenv", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] }
windows-sys = { version = "0.36", features = ["Win32", "Win32_Foundation", "Win32_Networking", "Win32_Networking_WinSock", "Win32_Security", "Win32_Storage", "Win32_Storage_FileSystem", "Win32_System", "Win32_System_IO", "Win32_System_LibraryLoader", "Win32_System_Pipes", "Win32_System_SystemServices", "Win32_System_WindowsProgramming"] }
### END HAKARI SECTION

View File

@ -24,7 +24,7 @@ pin-project = "1.0"
prost = "0.11"
rskafka = { git = "https://github.com/influxdata/rskafka.git", rev="59295beeae2106c2536008065e171dd88fd1c64e", default-features = false, features = ["compression-snappy", "transport-socks5"] }
schema = { path = "../schema" }
tokio = { version = "1.20", features = ["fs", "macros", "parking_lot", "rt", "sync", "time"] }
tokio = { version = "1.21", features = ["fs", "macros", "parking_lot", "rt", "sync", "time"] }
tokio-util = "0.7.3"
trace = { path = "../trace" }
trace_http = { path = "../trace_http" }