input_chunk: express specific errors using negative encoded numerical error values. #9919
Conversation
pwhelan
requested review from
edsiper,
leonardo-albertovich,
fujimotos and
koleini
as code owners
pwhelan
changed the title
| @@ -237,6 +237,9 @@ static int in_emitter_ingest_ring_buffer(struct flb_input_instance *in, | |||
| flb_sds_destroy(ec.tag); | |||
| msgpack_sbuffer_destroy(&ec.mp_sbuf); | |||
| } | |||
| if (ret < 0) { | |||
| return -1; | |||
| } | |||
There was a problem hiding this comment.
Why the two conditions, why not return in the previous < 0?
There was a problem hiding this comment.
I think I was trying to avoid problems where the buffer would not be drained if there was a single append that caused an error.
I am still thinking if the approach of halting the draining of the ring buffer is the right approach. @edsiper any thoughts?
There was a problem hiding this comment.
I've been looking at this and pondering what to do about it. This code could wind up dropping ring buffers if flb_log_append ever throws an error as it is. Fixing this seems out of scope for this PR but we should tackle it. I actually started working on a solution that uses lwrb_peek and lwrb_skip to leave the ring buffer untouched when flb_log_append returns an error.
…rno. Not all errors will be the same es the errno values and this code does not set the actuall errno variable. Signed-off-by: Phillip Adair Stewart Whelan <[email protected]>
…k return codes. Signed-off-by: Phillip Adair Stewart Whelan <[email protected]>
Signed-off-by: Phillip Whelan <[email protected]>
pwhelan
force-pushed
the
pwhelan-ret-values-input-chunk
branch
from
1a1c23f to
ff42ee9
Compare
Summary
Change some internal
flb_input_chunkAPIs to return a negative value encoding specificerrnocodes in them instead of just return-1.The semantics of the calls should not change but it does force callers of the relevant functions to check for negative values instead of
-1.This PR also has a fix for
in_emitterto accept negative values as errors instead of just the value-1.Description
This PR includes everal changes to the
flb_input_chunkAPI so it is possible to know the nature of the error when a call toflb_log_appendfails.There is a refactor of the function
input_chunk_getto return a negative value encoded with anerrnonumber to specify the following possible errors:The function
input_chunk_append_rawhas been refactored to return the negative value oferrnoif it is set during the call if there is an error or the negative value ofEIOif not.These changes are necessary for a forth-coming change in
in_httpwhich uses these errors and others to generate more verbose HTTP error response codes.Enter
[N/A]in the box, if an item is not applicable to your change.Testing
Before we can approve your change; please submit the following in a comment:
If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
ok-package-testlabel to test for all targets (requires maintainer to do).Documentation
Backporting
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.