fix(connectors): bring quickwit_sink up to convention - #3523
Conversation
|
Thanks for the PR. It is labeled Slash commands (own line, regular comment) move it around the queue:
See CONTRIBUTING.md for details. |
- AGENTS.md: 104→75 lines. Removed redundant repo structure (derivable by ls), collapsed principles to iggy-specific rules only, merged Jenkins/QW infra into Infra section, updated handover block. - TODO.md: replaced stale checked items with 4 open PRs (apache#3516 apache#3517 apache#3523 apache#3525) + QW 0.9 upgrade task. - DONE.md: added sessions 5-10 block (QW sink pipeline, collector cutover, InvalidOffset bug + fix). - quickwit_sink/src/lib.rs: cargo fmt reformatting only.
| info!("Created index: {}", self.index_id); | ||
| Ok(()) | ||
| } | ||
|
|
There was a problem hiding this comment.
lib.rs:ingest() — create_index() treats 409 Conflict as InitError; concurrent open() calls (multi-instance, restart race) both see has_index()=false, both POST, second gets 4xx → InitError → connector
never opens. Fix: absorb 409 (and 400 "already exists") as Ok(()) in create_index(). Retry middleware also retries a 5xx create that succeeded server-side; on retry, server returns 409 → same path. Same fix
covers both.
There was a problem hiding this comment.
Sorry for the late response -- I was running a local benchmark to make sure the setup is working end-to-end.
Fixed in 512b71f04: create_index now handles 409 CONFLICT as a success case -- another instance beat us to it, but the index exists, which is what we wanted. Only other 4xx errors propagate as InitError.
| self.config.open_retry_max_delay.as_deref(), | ||
| DEFAULT_OPEN_RETRY_MAX_DELAY, | ||
| ); | ||
|
|
There was a problem hiding this comment.
reqwest::Client::new() has no timeout; health probe and has_index()/create_index() can hang indefinitely under network partition or slow-starting Quickwit. Fix: reqwest::Client::builder().timeout(...) with configurable or sensible default (e.g. 30s)
There was a problem hiding this comment.
Fixed in 512b71f04: added request_timeout: Option<String> to QuickwitSinkConfig (default "30s") and wired it into reqwest::Client::builder().timeout(request_timeout).build() in open(). The example config TOML has the field commented in as a reference.
|
@mfyuce - all the above are minors. I am not sure of quickwit s production data set distribution to mention about the need for circuit breakers (if there are huge number of records/documents for the same cursor key for a given batch size) . Please make a judgement call about the need for circuit breaker implementation . otherwise it is all set for second reviewer's comments before merging. |
|
/author |
…t timeout 409 CONFLICT (and 400 "already exists" for older QW) returned by create_index() no longer fails connector open. This covers two races: concurrent open() calls where both see has_index()=false, and retry middleware retrying a 5xx create that already succeeded server-side. Add request_timeout (default 30s) on the underlying reqwest Client so health probes and index management calls time out under network partition instead of hanging indefinitely. Fixes review feedback from ryerraguntla on PR apache#3523.
|
Thanks for the thorough review @ryerraguntla! Both issues addressed in the latest push: 409 / "already exists" on No timeout on /ready |
|
@ryerraguntla — judgment call on the circuit breaker: The existing QuickWit is typically an internal service in the same cluster, so prolonged partition is rare, and the runtime already isolates failures per connector. A full half-open / trip-threshold circuit breaker on top of this would add complexity without clear benefit for this specific sink. Happy to revisit if the second reviewer sees a concrete failure mode that the existing retry policy doesn't cover. |
apache#3523 review addressed (409 absorb + request_timeout). Four PRs all S-waiting-on-review; pipeline live and clean.
72→60 lines: removed iggy-bench infra line, dropped unwrap/expect and BDD-naming rules (standard Rust / discoverable from tests), folded connectors-overview note into Skills section header. Handover updated: apache#3523 review addressed (409 + timeout), five PRs all S-waiting-on-review, next steps clarified.
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #3523 +/- ##
=============================================
- Coverage 75.99% 63.28% -12.72%
Complexity 969 969
=============================================
Files 1325 1324 -1
Lines 162383 151242 -11141
Branches 135262 124200 -11062
=============================================
- Hits 123406 95715 -27691
- Misses 35317 51762 +16445
- Partials 3660 3765 +105
🚀 New features to boost your workflow:
|
|
Can you please add a brief rationale/problem statement/why behind the change? I am finding the PR hard to review without clarity on the goal being achieved. |
|
Sorry for the late response -- was doing a local benchmark to make sure the setup is working. @kriti-sc good call, here is the rationale: The original 1. No request timeout -- 2. No connectivity check on 3. No retry middleware -- transient 5xx or 429 responses from QuickWit caused immediate batch failure and offset advancement. This PR wires 4. 409 Conflict on The goal is to bring |
- AGENTS.md: 245→74 lines. Removed ToC, Structure tree, Where-to-look table, Tooling table, Discussion section (all derivable or static). Compressed principles to iggy-specific rules only. - TOBEDECIDED.md: commit unstaged segment compression design section. - Handover updated: apache#3523 review addressed (409 absorb, request_timeout, circuit-breaker judgment); all 5 PRs S-waiting-on-review.
- AGENTS.md: 245→74 lines. Removed ToC, Structure tree, Where-to-look table, Tooling table, Discussion section (all derivable or static). Compressed principles to iggy-specific rules only. - TOBEDECIDED.md: commit unstaged segment compression design section. - Handover updated: apache#3523 review addressed (409 absorb, request_timeout, circuit-breaker judgment); all 5 PRs S-waiting-on-review.
| DEFAULT_OPEN_RETRY_MAX_DELAY, | ||
| ); | ||
|
|
||
| let request_timeout = parse_duration(self.config.request_timeout.as_deref(), "30s"); |
There was a problem hiding this comment.
instead of 30s, define a const like the DEFAULT_* defined at the top of this file, and use that here
There was a problem hiding this comment.
Fixed in 3807e63. Added const DEFAULT_REQUEST_TIMEOUT: &str = "30s"; at the top of the file and updated the parse_duration call in open() to use it as the fallback. Also added explicit logs for server (5xx) versus client (4xx) errors on index creation.
| self.index_id, self.id | ||
| ); | ||
| Ok(()) | ||
| } else if status.is_client_error() { |
There was a problem hiding this comment.
this and the else arm below are the same. is this intentioanl? what kind of errors is the else arm expected to catch?
also, would be good to add an error! to the else arm.
There was a problem hiding this comment.
Good catch. The two arms are intentional -- 4xx (client errors) are permanent failures such as invalid index YAML or a misconfigured URL; 5xx (server errors) are transient and normally handled by the retry middleware, but they surface here when retries are exhausted.
The error! on the else arm was missing by mistake. Fixed in the latest push: both arms now log at error! level with distinct messages (Permanent client error vs Server error) so they are easy to tell apart in operator logs.
| error!( | ||
| "Received an invalid HTTP response when ingesting messages for index: {}. Status code: {status}, reason: {text}", | ||
| self.index_id | ||
| "Permanent error ingesting into Quickwit index: {} for connector ID: {}. status: {status}, reason: {text}", |
There was a problem hiding this comment.
these errors are the same pattern as in create_index above. here PermanentError and HttpRequestFailed error is used, while above InitError. What is the difference and is this intentional?
There was a problem hiding this comment.
Intentional -- the two functions are called from different lifecycle phases:
create_indexis called fromopen()(the initialization phase). Failure there means the connector cannot start at all, soInitErroris correct -- the runtime treats it as a fatal setup failure.ingestis called fromconsume()(the operation phase). Failure there is an HTTP-level error during normal operation, soHttpRequestFailedis correct.
The distinction matters for how the runtime handles each: InitError aborts the connector on first open; HttpRequestFailed during consume is subject to the retry/backoff policy.
kriti-sc
left a comment
There was a problem hiding this comment.
PR largely ok. A few minor changes + justification of some changes requested.
- AGENTS.md: removed 3 generic Rust rules (idiomatic Rust, tokio Mutex, forward-compat config); updated handover: apache#3517 merged upstream, 4 PRs remain open. - TODO.md: removed apache#3517 (merged) and segment cleaner (enabled); consolidated open items. - DONE.md: added sessions 14-18 (otlp_source fixes, otlp_sink HTTP transport, TCP first() bug docs, segment cleaner enabled, apache#3517 merged, apache#3523 review addressed).
|
@kriti-sc The requested |
|
/ready |
|
/author please check the prechecks issues and resolve the conflicts |
3807e63 to
0f9d09a
Compare
0f9d09a to
329a751
Compare
|
/ready Hi @ryerraguntla, I have resolved the conflicts and cleaned up the branch:
|
|
@mfyuce - while I review, please add the issue it is closing and the motivation for implementing. Follow the published Iggy PR template . Try to add code coverage to the maximum possible with out significantly increasing the test time. |
hubcio
left a comment
There was a problem hiding this comment.
this is a clear improvement overall (drops the old panic, adds retry + a startup probe, handles raw/text payloads). inline notes are the should-fix items.
PR description nits (no line to anchor to): says "5 unit tests" but there are 11; the "map 4xx so the circuit breaker is not tripped" line describes a mechanism this sink doesn't have (no circuit breaker here); and "drop unused dashmap / once_cell" - once_cell was never a dependency here, only dashmap was.
one runtime-wide caveat, already tracked so not this pr's job: a permanently-failing consume() batch is silently dropped because the offset is already committed at poll and the FFI return code is ignored. that's #2927 (consume return discarded) + #2928 (commit-before-processing ordering) - together they make at-least-once unachievable for any sink today, which is worth keeping in mind next to the at-least-once comment inline. one small thing not yet noted on #2927: the dropped batch is still counted by the messages-processed metric, so dashboards read clean while data is lost.
| index_id: String, | ||
| } | ||
|
|
||
| #[derive(Debug, Serialize, Deserialize)] |
There was a problem hiding this comment.
QuickwitSinkConfig is missing #[serde(deny_unknown_fields)]. with every knob optional, a typo'd key like max_retires is silently ignored and the connector just runs on defaults with no error. influxdb_sink (the sink this mirrors) sets it.
two smaller things on this struct: the Serialize derive is unused (the config is only ever deserialized; the runtime serializes an untyped value, not this type) so it can be dropped, and the retry/timeout knobs are undocumented while http_sink documents each field with its default.
There was a problem hiding this comment.
All three done. #[serde(deny_unknown_fields)] is on QuickwitSinkConfig, the
Serialize derive is gone, and every field carries a doc comment with its
default. I dropped the same unused Serialize from the private IndexConfig
while I was there.
| pub verbose_logging: Option<bool>, | ||
| pub max_retries: Option<u32>, | ||
| pub retry_delay: Option<String>, | ||
| pub max_retry_delay: Option<String>, |
There was a problem hiding this comment.
max_retry_delay reads backwards from the rest. influxdb, where this startup-probe path is copied from, calls the same knob retry_max_delay and pairs it with open_retry_max_delay. worth renaming the field + the DEFAULT_MAX_RETRY_DELAY const to match, since config keys turn into a compat contract once this ships.
There was a problem hiding this comment.
Renamed to retry_max_delay, with the const following as
DEFAULT_RETRY_MAX_DELAY, so it pairs with open_retry_max_delay the way
influxdb does.
| pub max_retry_delay: Option<String>, | ||
| pub max_open_retries: Option<u32>, | ||
| pub open_retry_max_delay: Option<String>, | ||
| pub request_timeout: Option<String>, |
There was a problem hiding this comment.
every other http sink names this timeout (influxdb, http_sink, doris) - request_timeout is the lone outlier. rename the field + DEFAULT_REQUEST_TIMEOUT const before release, config keys are hard to change later.
There was a problem hiding this comment.
Renamed the field to timeout and the const to DEFAULT_TIMEOUT.
|
|
||
| pub async fn ingest(&self, messages: Vec<simd_json::OwnedValue>) -> Result<(), Error> { | ||
| let client = self.client()?; | ||
| // At-least-once: Quickwit ingest carries no dedup key, so a retry after a |
There was a problem hiding this comment.
this comment only covers the duplicate-write window. it's silent on the loss window: on a permanent 4xx, or once retries are exhausted, the offset was already committed at poll, so the batch is dropped and never redelivered. worth stating both so the real guarantee (at-most-once on final failure) is clear.
There was a problem hiding this comment.
Rewritten to state both windows:
// At-least-once during transient retries, but at-most-once on final failure:
// Quickwit ingest carries no dedup key, so a retry after a transient 5xx/timeout
// that actually committed double-writes those rows. Conversely, if a batch permanently
// fails (e.g. 4xx client error or retries exhausted), the offset was already committed
// at poll, so the batch is silently dropped and never redelivered.| let client = self.client()?; | ||
| // At-least-once: Quickwit ingest carries no dedup key, so a retry after a | ||
| // 5xx/timeout that actually committed (commit=auto) double-writes those rows. | ||
| let url = format!( |
There was a problem hiding this comment.
these urls (here, plus has_index and create_index) are rebuilt with format! on every batch, and none trim a trailing slash - a url ending in / produces //api/v1/.... build them once in open() and trim_end_matches('/') the base, like influxdb's base_url().
There was a problem hiding this comment.
base_url is now resolved once in new() with trim_end_matches('/') and
reused by has_index, create_index and ingest, so a configured
http://host:7280/ no longer produces //api/v1/....
|
|
||
| let response = self | ||
| .client | ||
| let mut ndjson = String::new(); |
There was a problem hiding this comment.
ndjson starts from String::new() and reallocs as it grows over the batch (up to batch_length records). pre-size it with String::with_capacity(...) - the commit says "optimize allocations" but this is the main alloc site.
separately: records where to_string fails get skipped silently while messages_count still counts them, so the success log can overcount.
There was a problem hiding this comment.
About NDJSON Pre-allocation & Memory Footprint: To optimize the ndjson allocation without introducing magic numbers or overhead, a few approaches:
Pre-serializing all records to get the exact length: Cons=> holding all individual Strings in a Vec alongside the final joined String doubles the peak memory consumption of the batch payload.
Sample-and-estimate (using the first message length): Can lead to over/under-allocation in heterogeneous batches.
Current locally:
let mut ndjson = String::with_capacity(messages.len() * 512);
This prevents most reallocations without any CPU or memory overhead.
Does this standard messages.len() * 512 pre-allocation heuristic look good to you, or would you prefer a different approach here?
There was a problem hiding this comment.
Following up: ndjson is pre-sized with
String::with_capacity(messages.len() * 512). The 512 is a rough per-record
estimate rather than a measured figure, so it trades a little slack for dropping
the realloc chain. Happy to change it if you would rather see a different basis.
The overcounting is fixed separately: messages_count now increments inside the
if let Ok(...) arm, so records that fail to serialize are no longer counted in
the success log.
| "Permanent error ingesting into Quickwit index: {} for connector ID: {}. status: {status}, reason: {text}", | ||
| self.index_id, self.id | ||
| ); | ||
| Err(Error::PermanentHttpError(format!( |
There was a problem hiding this comment.
this permanent-vs-transient split has no runtime effect: the error is collapsed to a return code at the ffi boundary and the runtime discards it, and this sink owns no circuit breaker - so the description's "so the circuit breaker is not tripped" doesn't apply here. the two distinct log lines are still handy for triage, keep those; it's just the error variant that doesn't gate anything.
There was a problem hiding this comment.
You are right that the split is inert in this sink today. consume() collapses
every Err into a return code at the FFI boundary (sdk/src/sink.rs:154), and
per #2927 the runtime discards that code for all sinks, so nothing reads the
classification.
I kept PermanentHttpError rather than flattening it, for two reasons. It is
what the other HTTP sinks already return for non-retryable 4xx
(clickhouse_sink/src/client.rs:232, doris_sink/src/lib.rs:263,
meilisearch_sink/src/lib.rs:566, influxdb_sink/src/lib.rs:700), and in
influxdb it is not inert: the circuit breaker skips record_failure for
permanent errors (influxdb_sink/src/lib.rs:825-831). Making quickwit the one
sink that drops the distinction would be the odd case, and if this sink ever
grows the same guard the classification is already in the right place.
The two log lines stay, as you suggested. That is also the workaround #2927
itself recommends: log inside consume() before returning Err.
The "so the circuit breaker is not tripped" line in the PR description was wrong
and I have removed it.
| self.index_id, self.id | ||
| ); | ||
| Ok(()) | ||
| } else if status.is_client_error() { |
There was a problem hiding this comment.
these two arms build an identical Err(InitError(...)) and differ only in the log wording, and the status is already in the message. collapse them into one else. keep the success and 409 arms separate - the 409-absorb is load-bearing for the create race.
There was a problem hiding this comment.
Collapsed into a single else. The success and 409 / 400-already-exists arms
stay separate.
| match simd_json::from_slice::<OwnedValue>(&mut bytes_copy) { | ||
| Ok(value) => value, | ||
| Err(_) => { | ||
| if let Ok(text) = String::from_utf8(bytes.clone()) { |
There was a problem hiding this comment.
String::from_utf8(bytes.clone()) clones a second time. from_utf8(bytes) can consume the buffer, and on the error path e.into_bytes() hands it back for the base64 branch. the earlier clone at the parse call is load-bearing (simd parses destructively) so keep that one.
| .timeout(request_timeout) | ||
| .build() | ||
| .map_err(|e| Error::InitError(format!("reqwest client: {e}")))?; | ||
| let health_url = Url::parse(&format!("{}/health/livez", self.config.url)) |
There was a problem hiding this comment.
/health/livez is liveness - the node can be live but not yet ready to serve. /health/readyz is the readiness gate you actually want before create_index/ingest. minor, since the retry client papers over an early 5xx, but readyz is the more correct probe.
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed in 7 days if no further activity occurs. If you need a review, please ensure CI is green and the PR is rebased on the latest master. Don't hesitate to ping the maintainers - either Thank you for your contribution! |
The quickwit sink diverged from how the other HTTP sinks are written: no retry middleware, no request timeout, no index-creation race handling, and it only accepted JSON payloads. Align it with influxdb_sink so operators get the same knobs and the same failure behaviour. Retries now go through reqwest-middleware with configurable delay bounds, open() probes the node before creating the index, a 409 or a 400 'already exists' on create is absorbed so concurrent instances do not deadlock each other, and raw/text payloads are wrapped instead of dropped.
cf6a1a2 to
076773f
Compare
|
@mfyuce when PR is ready for re-review, please put |
|
/ready
Done, all three. On coverage: the sink had no tests, this adds 11 covering payload handling (JSON, raw JSON, raw text, raw binary, unsupported), config defaults, and index_id extraction. They are pure functions with no I/O, so the suite runs in under a second. The four integration tests in core/integration/tests/connectors/quickwit/ are unchanged and pass against a real Quickwit container, so total test time is unaffected. |
Which issue does this PR address?
Closes #3814
Rationale
quickwit_sinkwas written before the shared connector retry helpers existedand never caught up with them. Compared to the other HTTP sinks it had no
request timeout, no retry middleware, no readiness probe, and no handling for
two instances racing to create the same index. It also accepted only JSON
payloads and dropped everything else. Each of those is a way for the connector
to hang or lose data in a real deployment rather than fail visibly.
What changed?
reqwest::Client::new()has no timeout, so a network partition or aslow-starting Quickwit left
has_index()andingest()hanging forever, and a5xx during startup killed the connector outright. Two instances opening at once
both saw
has_index() == false, both POSTed, and the loser got a 409 it treatedas a fatal
InitError.The client is now built in
open()with a configurable timeout and wrapped inthe SDK's retry middleware, after
check_connectivity_with_retrywaits for/health/readyz.create_indexabsorbs a 409, and a 400 whose body says theindex already exists, as success. Non-JSON payloads are wrapped instead of
discarded: raw bytes are parsed as JSON when they can be, otherwise carried as
text or base64.
Local Execution
The four integration tests run against a real Quickwit container and pass. Note
for anyone reproducing them locally: on this host they only get as far as
starting the container unless
create_shard_executorkeeps a worker pool. Theunconditional
proactor.thread_pool_limit(0)incore/server_common/src/executor.rsmakesiggy-serverabort on startup with"the thread pool is needed but no worker thread is running", which takes down
every connectors integration test, not just these. That is unrelated to this PR
and is not touched here.
AI Usage
unit tests, and auditing the diff against reviewer comments.
integration tests against a real Quickwit container, and by reading the diff
against
influxdb_sink, which this sink mirrors.