Also rename the IngestFailureReason proto naming

quickwit-oss · Jan 29, 2025 · 2a9da60 · 2a9da60
1 parent c28f6a3
commit 2a9da60
Show file tree

Hide file tree

Showing 7 changed files with 185 additions and 127 deletions.
diff --git a/quickwit/quickwit-ingest/src/error.rs b/quickwit/quickwit-ingest/src/error.rs
@@ -113,7 +113,7 @@ impl From<IngestFailure> for IngestServiceError {
             IngestFailureReason::NoShardsAvailable => {
                 IngestServiceError::Unavailable("no shards available".to_string())
             }
-            IngestFailureReason::ShardRateLimited => {
+            IngestFailureReason::AttemptedShardsRateLimited => {
                 IngestServiceError::RateLimited(RateLimitingCause::AttemptedShardsRateLimited)
             }
             IngestFailureReason::AllShardsRateLimited => {

diff --git a/quickwit/quickwit-ingest/src/ingest_v2/router.rs b/quickwit/quickwit-ingest/src/ingest_v2/router.rs
@@ -538,7 +538,7 @@ fn update_ingest_metrics(ingest_result: &IngestV2Result<IngestResponseV2>, num_s
                     IngestFailureReason::NoShardsAvailable => {
                         ingest_results_metrics.no_shards_available.inc()
                     }
-                    IngestFailureReason::ShardRateLimited => {
+                    IngestFailureReason::AttemptedShardsRateLimited => {
                         ingest_results_metrics.attempted_shards_rate_limited.inc()
                     }
                     IngestFailureReason::AllShardsRateLimited => {
@@ -2171,7 +2171,7 @@ mod tests {
         assert_eq!(ingest_response.failures.len(), 1);
         assert_eq!(
             ingest_response.failures[0].reason(),
-            IngestFailureReason::ShardRateLimited
+            IngestFailureReason::AttemptedShardsRateLimited
         );
     }
 }
diff --git a/quickwit/quickwit-ingest/src/ingest_v2/workbench.rs b/quickwit/quickwit-ingest/src/ingest_v2/workbench.rs
@@ -360,7 +360,7 @@ impl SubworkbenchFailure {
                 RateLimitingCause::WalFull => IngestFailureReason::WalFull,
                 RateLimitingCause::CircuitBreaker => IngestFailureReason::CircuitBreaker,
                 RateLimitingCause::AttemptedShardsRateLimited => {
-                    IngestFailureReason::ShardRateLimited
+                    IngestFailureReason::AttemptedShardsRateLimited
                 }
                 RateLimitingCause::AllShardsRateLimited => {
                     IngestFailureReason::AllShardsRateLimited

diff --git a/quickwit/quickwit-proto/protos/quickwit/router.proto b/quickwit/quickwit-proto/protos/quickwit/router.proto
@@ -62,14 +62,12 @@ enum IngestFailureReason {
   INGEST_FAILURE_REASON_SOURCE_NOT_FOUND = 2;
   INGEST_FAILURE_REASON_INTERNAL = 3;
   INGEST_FAILURE_REASON_NO_SHARDS_AVAILABLE = 4;
-  // the shards we tried to write to are rate limited
-  INGEST_FAILURE_REASON_SHARD_RATE_LIMITED = 5;
+  INGEST_FAILURE_REASON_ATTEMPTED_SHARDS_RATE_LIMITED = 5;
   INGEST_FAILURE_REASON_WAL_FULL = 6;
   INGEST_FAILURE_REASON_TIMEOUT = 7;
   INGEST_FAILURE_REASON_ROUTER_LOAD_SHEDDING = 8;
   INGEST_FAILURE_REASON_LOAD_SHEDDING = 9;
   INGEST_FAILURE_REASON_CIRCUIT_BREAKER = 10;
-  // all the known open shards are rate limited
   INGEST_FAILURE_REASON_ALL_SHARDS_RATE_LIMITED = 11;
 }