-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
core: flb_scheduler fix for macOS #2463
Merged
Merged
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
src/flb_scheduler.c: cosumer_bytes() gives errors in macOS (10.13,... ?). function flb_pipe_r can return value 0 if is considered as error. This patch allows return value zero. Signed-off-by: Jukka Pihl <jukka.pihl@iki.fi>
bluebike
force-pushed
the
macos-scheduler-fix
branch
from
August 12, 2020 09:35
a510111
to
b19df8f
Compare
Test run after patch
|
thanks |
edsiper
pushed a commit
that referenced
this pull request
Aug 14, 2020
src/flb_scheduler.c: cosumer_bytes() gives errors in macOS (10.13,... ?). function flb_pipe_r can return value 0 if is considered as error. This patch allows return value zero. Signed-off-by: Jukka Pihl <jukka.pihl@iki.fi>
girgen
added a commit
to girgen/fluent-bit
that referenced
this pull request
Nov 17, 2020
This is partly related to fluent#2463 for MacOS. The first one is in flb_pipe_r() function returning 0 on FreeBSD 12+ and that brings up errors similar to "[error] [src/flb_scheduler.c:52 errno=0] No error: 0". This patch will fix it the same way as it was fixed by upstream code for MacOS. The second issue is a SIGSEGV that is caused by incorrect section structure of the resulting binary file generated by clang due to some gcc specific code in libco. Since there are two copies of libco (flb_libco) code in the fluent-bit sources - one in the lib/flb_libco folder and another one in lib/monkey/deps/flb_libco - they are both patched the same way. This patches were tested on FreeBSD 11.4 and 12.2 amd64. The resulting binaries was tested with "elfdump -a" to contain only one ".text" section and their startup logs were tested running "fluent-bit -v -i dummy -o stdout". Submitted by: Yuri Pankov and Artyom Davidov Signed-off-by: Palle Girgensohn <girgen@FreeBSD.org>
4 tasks
girgen
pushed a commit
to girgen/fluent-bit
that referenced
this pull request
Nov 19, 2020
This is partly related to fluent#2463 for MacOS. The first one is in flb_pipe_r() function returning 0 on FreeBSD 12+ and that brings up errors similar to "[error] [src/flb_scheduler.c:52 errno=0] No error: 0". This patch will fix it the same way as it was fixed by upstream code for MacOS. The second issue is a SIGSEGV that is caused by incorrect section structure of the resulting binary file generated by clang due to some gcc specific code in libco. Since there are two copies of libco (flb_libco) code in the fluent-bit sources - one in the lib/flb_libco folder and another one in lib/monkey/deps/flb_libco - they are both patched the same way. This patches were tested on FreeBSD 11.4 and 12.2 amd64. The resulting binaries was tested with "elfdump -a" to contain only one ".text" section and their startup logs were tested running "fluent-bit -v -i dummy -o stdout". Submitted by: Yuri Pankov and Artyom Davidov Signed-off-by: Palle Girgensohn <girgen@FreeBSD.org>
girgen
pushed a commit
to girgen/fluent-bit
that referenced
this pull request
Nov 19, 2020
This is related to fluent#2463 for MacOS. In flb_pipe_r() function is returning 0 on FreeBSD 12+ and that brings up errors similar to "[error] [src/flb_scheduler.c:52 errno=0] No error: 0". This patch will fix it the same way as it was previously fixed for MacOS. This patch was tested on FreeBSD 11.4 and 12.2 amd64. The resulting binaries was tested with "elfdump -a" to contain only one ".text" section and their startup logs were tested running "fluent-bit -v -i dummy -o stdout". See also: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=250825 Submitted by: Yuri Pankov and Artyom Davidov Signed-off-by: Palle Girgensohn <girgen@FreeBSD.org>
edsiper
pushed a commit
that referenced
this pull request
Nov 20, 2020
This is related to #2463 for MacOS. In flb_pipe_r() function is returning 0 on FreeBSD 12+ and that brings up errors similar to "[error] [src/flb_scheduler.c:52 errno=0] No error: 0". This patch will fix it the same way as it was previously fixed for MacOS. This patch was tested on FreeBSD 11.4 and 12.2 amd64. The resulting binaries was tested with "elfdump -a" to contain only one ".text" section and their startup logs were tested running "fluent-bit -v -i dummy -o stdout". See also: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=250825 Submitted by: Yuri Pankov and Artyom Davidov Signed-off-by: Palle Girgensohn <girgen@FreeBSD.org> Co-authored-by: Palle Girgensohn <girgen@FreeBSD.org>
edsiper
pushed a commit
that referenced
this pull request
Nov 20, 2020
This is related to #2463 for MacOS. In flb_pipe_r() function is returning 0 on FreeBSD 12+ and that brings up errors similar to "[error] [src/flb_scheduler.c:52 errno=0] No error: 0". This patch will fix it the same way as it was previously fixed for MacOS. This patch was tested on FreeBSD 11.4 and 12.2 amd64. The resulting binaries was tested with "elfdump -a" to contain only one ".text" section and their startup logs were tested running "fluent-bit -v -i dummy -o stdout". See also: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=250825 Submitted by: Yuri Pankov and Artyom Davidov Signed-off-by: Palle Girgensohn <girgen@FreeBSD.org> Co-authored-by: Palle Girgensohn <girgen@FreeBSD.org>
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.
fluent-bit/src/flb_scheduler.c
Lines 46 to 50 in d1bcfa8
src/flb_scheduler.c: cosumer_bytes() gives errors in macOS (10.13,... ?).
function flb_pipe_r can return value 0 which is consider as error.
This patch allows return value zero.
Probably we should test if ret == 0 is ok in other operating systems.
Fixes #2460
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:
Documentation
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.