-
Notifications
You must be signed in to change notification settings - Fork 1.9k
in_exec: run collector in threaded mode #11782
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
Open
edsiper
wants to merge
2
commits into
master
Choose a base branch
from
http-deadlock-update
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+84
−0
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
19 changes: 19 additions & 0 deletions
19
...integration/scenarios/internal_http_server/config/internal_http_server_exec_deadlock.yaml
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| service: | ||
| flush: 1 | ||
| grace: 1 | ||
| log_level: info | ||
| http_server: on | ||
| http_listen: 127.0.0.1 | ||
| http_port: ${FLUENT_BIT_HTTP_MONITORING_PORT} | ||
|
|
||
| pipeline: | ||
| inputs: | ||
| - name: exec | ||
| tag: test | ||
| command: curl -s http://127.0.0.1:${FLUENT_BIT_HTTP_MONITORING_PORT}/api/v1/metrics/prometheus | ||
| interval_sec: 1 | ||
| buf_size: 128k | ||
|
|
||
| outputs: | ||
| - name: "null" | ||
| match: "*" |
64 changes: 64 additions & 0 deletions
64
...ation/scenarios/internal_http_server/tests/test_internal_http_server_exec_deadlock_001.py
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import os | ||
| import time | ||
|
|
||
| from utils.http_matrix import run_curl_request | ||
| from utils.test_service import FluentBitTestService | ||
|
|
||
|
|
||
| class Service: | ||
| def __init__(self): | ||
| self.config_file = os.path.abspath( | ||
| os.path.join( | ||
| os.path.dirname(__file__), | ||
| "../config/internal_http_server_exec_deadlock.yaml", | ||
| ) | ||
| ) | ||
| self.service = FluentBitTestService(self.config_file) | ||
|
|
||
| def start(self): | ||
| self.service.start() | ||
| self.flb = self.service.flb | ||
| self.base_url = f"http://127.0.0.1:{self.flb.http_monitoring_port}" | ||
|
|
||
| def stop(self): | ||
| self.service.stop() | ||
|
|
||
| def request(self, path, *, method="GET", http_mode="http1.1"): | ||
| return run_curl_request( | ||
| f"{self.base_url}{path}", | ||
| method=method, | ||
| http_mode=http_mode, | ||
| ) | ||
|
|
||
|
|
||
| def test_http_server_responsive_after_exec_self_request(): | ||
| """The built-in HTTP server must remain responsive after the exec input | ||
| plugin makes an HTTP request to it. Before the fix, the exec child | ||
| process (curl) and the HTTP server shared the same event loop, causing | ||
| a deadlock that made the server permanently unresponsive.""" | ||
|
|
||
| service = Service() | ||
|
|
||
| try: | ||
| service.start() | ||
|
|
||
| result = service.request("/api/v1/uptime") | ||
| assert result["status_code"] == 200 | ||
| assert "uptime_sec" in result["body"] | ||
|
|
||
| time.sleep(2) | ||
|
|
||
| result = service.service.wait_for_condition( | ||
| lambda: ( | ||
| response | ||
| if response["status_code"] == 200 and "uptime_sec" in response["body"] | ||
| else None | ||
| ) if (response := service.request("/api/v1/uptime")) else None, | ||
| timeout=10, | ||
| interval=1, | ||
| description="HTTP server responsive after exec self-request", | ||
| ) | ||
| assert result["status_code"] == 200 | ||
| assert "uptime_sec" in result["body"] | ||
|
cosmo0920 marked this conversation as resolved.
|
||
| finally: | ||
| service.stop() | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Making every
execinstance threaded disables an existing routing feature for this plugin:flb_input_log_append()explicitly skips conditional/per-record routes whenflb_input_is_threaded(ins)is true (src/flb_input_log.c:1021-1025) and falls back to normal routing. Anyexecinput configured withroutes.logsconditions or per-record routing will now send records to the default matched outputs instead of the conditional destinations, whereas it was non-threaded before this line. Please either keepexecnon-threaded for configurations that use conditional routes or add threaded-input support for that routing path.Useful? React with 👍 / 👎.