storage: recreate cio_stream if storage type is different(#8259) #8290
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cio_load creates storage stream if directory exists. It prevents to create memory stream by input plugins. This patch is to recreate stream if the type is different. Signed-off-by: Takahiro Yamashita <[email protected]>
nokute78
requested review from
edsiper,
leonardo-albertovich,
fujimotos and
koleini
as code owners
edsiper
requested changes
Dec 16, 2023
src/flb_storage.c
Outdated
| @@ -532,6 +532,18 @@ int flb_storage_input_create(struct cio_ctx *cio, | |||
| return -1; | |||
| } | |||
| } | |||
| else if (stream->type != cio_storage_type) { | |||
| flb_info("[storage] storage type mismatch. input type=%s", | |||
There was a problem hiding this comment.
I will put this as a debug instead of info
There was a problem hiding this comment.
In this case user environment is need to be fixed.
- Remove storage
- Modify storage property
I think it is better the level is info or warn to notice it.
What do you think ?
There was a problem hiding this comment.
hmm, I would not remove the storage content for the user unless the directory is empty (no chunks), but I agree with better messaging.
There was a problem hiding this comment.
I modified log message. Could you check it ?
34c00a1
Signed-off-by: Takahiro Yamashita <[email protected]>
|
thank you |
shaerpour
pushed a commit
to shaerpour/fluent-bit
that referenced
this pull request
Jan 16, 2024
fluent#8290) * storage: recreate cio_stream if storage type is different(fluent#8259) cio_load creates storage stream if directory exists. It prevents to create memory stream by input plugins. This patch is to recreate stream if the type is different. Signed-off-by: Takahiro Yamashita <[email protected]> * storage: modify log message Signed-off-by: Takahiro Yamashita <[email protected]> --------- Signed-off-by: Takahiro Yamashita <[email protected]>
shaerpour
pushed a commit
to shaerpour/fluent-bit
that referenced
this pull request
Jan 16, 2024
fluent#8290) * storage: recreate cio_stream if storage type is different(fluent#8259) cio_load creates storage stream if directory exists. It prevents to create memory stream by input plugins. This patch is to recreate stream if the type is different. Signed-off-by: Takahiro Yamashita <[email protected]> * storage: modify log message Signed-off-by: Takahiro Yamashita <[email protected]> --------- Signed-off-by: Takahiro Yamashita <[email protected]> Signed-off-by: ahspw <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #8259
cio_load creates storage stream if directory exists before creating input chunks.
It prevents to create memory stream by input plugins.
This patch is to recreate stream if the stream type is different.
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
Configuration
Debug/Valgrind output
mkdir -p "$(pwd)/data/emitter.2"fluent-bit -c a.confFluent 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.