Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5311 from influxdata/dom/instrument-kafka-produce 

build: bump rskafka to latest
pull/24376/head
kodiakhq[bot] 2022-08-04 15:20:45 +00:00 committed by GitHub
parent 600617ec08 0ba3ae1e0d
commit 96419b78e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -196,7 +196,7 @@ jobs:
# setup multiple docker images (see https://circleci.com/docs/2.0/configuration-reference/#docker) # setup multiple docker images (see https://circleci.com/docs/2.0/configuration-reference/#docker)
docker: docker:
- image: quay.io/influxdb/rust:ci - image: quay.io/influxdb/rust:ci
- image: vectorized/redpanda:v21.9.2 - image: vectorized/redpanda:v22.1.5
command: redpanda start --overprovisioned --smp 1 --memory 1G --reserve-memory 0M command: redpanda start --overprovisioned --smp 1 --memory 1G --reserve-memory 0M
- image: postgres - image: postgres
environment: environment:

4
Cargo.lock generated
View File

@ -4246,8 +4246,8 @@ dependencies = [
[[package]] [[package]]
name = "rskafka" name = "rskafka"
version = "0.2.0" version = "0.3.0"
source = "git+https://github.com/influxdata/rskafka.git?rev=bb5c9c753b9595ea85dad65d9488859ae89c8456#bb5c9c753b9595ea85dad65d9488859ae89c8456" source = "git+https://github.com/influxdata/rskafka.git?rev=e34f6f485db9256a7614220cabea86f7c44f5eb6#e34f6f485db9256a7614220cabea86f7c44f5eb6"
dependencies = [ dependencies = [
"async-socks5", "async-socks5",
"async-trait", "async-trait",

2
write_buffer/Cargo.toml
View File

@ -22,7 +22,7 @@ observability_deps = { path = "../observability_deps" }
parking_lot = "0.12" parking_lot = "0.12"
pin-project = "1.0" pin-project = "1.0"
prost = "0.10" prost = "0.10"
rskafka = { git = "https://github.com/influxdata/rskafka.git", rev="bb5c9c753b9595ea85dad65d9488859ae89c8456", default-features = false, features = ["compression-snappy", "transport-socks5"] } rskafka = { git = "https://github.com/influxdata/rskafka.git", rev="e34f6f485db9256a7614220cabea86f7c44f5eb6", default-features = false, features = ["compression-snappy", "transport-socks5"] }
schema = { path = "../schema" } schema = { path = "../schema" }
tokio = { version = "1.20", features = ["fs", "macros", "parking_lot", "rt", "sync", "time"] } tokio = { version = "1.20", features = ["fs", "macros", "parking_lot", "rt", "sync", "time"] }
tokio-util = "0.7.3" tokio-util = "0.7.3"

12
write_buffer/src/kafka/mod.rs
View File

@ -257,9 +257,10 @@ impl WriteBufferStreamHandler for RSKafkaStreamHandler {
Err(e) => { Err(e) => {
terminated.store(true, Ordering::SeqCst); terminated.store(true, Ordering::SeqCst);
let kind = match e { let kind = match e {
RSKafkaError::ServerError(ProtocolError::OffsetOutOfRange, _) => { RSKafkaError::ServerError {
WriteBufferErrorKind::UnknownSequenceNumber protocol_error: ProtocolError::OffsetOutOfRange,
} ..
} => WriteBufferErrorKind::UnknownSequenceNumber,
_ => WriteBufferErrorKind::Unknown, _ => WriteBufferErrorKind::Unknown,
}; };
return Err(WriteBufferError::new(kind, e)); return Err(WriteBufferError::new(kind, e));
@ -439,7 +440,10 @@ async fn setup_topic(
{ {
Ok(_) => {} Ok(_) => {}
// race condition between check and creation action, that's OK // race condition between check and creation action, that's OK
Err(RSKafkaError::ServerError(ProtocolError::TopicAlreadyExists, _)) => {} Err(RSKafkaError::ServerError {
protocol_error: ProtocolError::TopicAlreadyExists,
..
}) => {}
Err(e) => { Err(e) => {
return Err(e.into()); return Err(e.into());
} }