Skip to content
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.

Sign up for GitHub

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

[libbeat] Fix / clarify the module reload logic #16440

Merged
merged 14 commits into from
Feb 26, 2020
Merged

[libbeat] Fix / clarify the module reload logic #16440

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
276c6cb
Fix / clarify the module reload logic
faec Feb 19, 2020
b987226
Clean up error output
faec Feb 20, 2020
3a64cae
Merge branch 'master' into module-reload
faec Feb 21, 2020
9982772
Add new monitoring variable libbeat.config.scans, add tests
faec Feb 24, 2020
7cd61b0
update changelog
faec Feb 24, 2020
beadaf3
reload tests should only be in the integration build
faec Feb 24, 2020
5066edc
remove no-longer-needed mock structures
faec Feb 24, 2020
a14ecc5
increase unit test timeout
faec Feb 25, 2020
c1ca81b
Merge branch 'master' into module-reload
faec Feb 25, 2020
11cdbf5
increase time limit on preexisting flaky reloader test
faec Feb 25, 2020
3840fcc
increase the timing for the right test_reload.py
faec Feb 26, 2020
181f081
(system test troubleshooting) always trigger config reloader
faec Feb 26, 2020
eb763e8
turn real reload detection back on
faec Feb 26, 2020
fdf2c03
fix flaky reloader tests
faec Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix flaky reloader tests
  • Loading branch information
@faec
faec committed Feb 26, 2020
commit fdf2c030ddb127e176bf38dad5f42ba27158530d
7 changes: 5 additions & 2 deletions heartbeat/tests/system/test_reload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ def test_config_add(self):
"""
self.setup_dynamic()

# Wait until the beat is running and has performed its first load of
# the config directory.
self.wait_until(lambda: self.log_contains(
"Starting reload procedure, current runners: 0"))

Expand All @@ -77,9 +79,10 @@ def test_config_add(self):
self.write_dyn_config(
"test.yml", self.http_cfg("myid", "http://localhost:{}".format(server.server_port)))

# The beat should recognize there is a new runner to start.
self.wait_until(lambda: self.log_contains(
"Starting reload procedure, current runners: 1"),
max_timeout=15)
"Start list: 1, Stop list: 0"),
max_timeout=10)

self.wait_until(lambda: self.output_lines() > 0)

Expand Down
12 changes: 5 additions & 7 deletions metricbeat/tests/system/test_reload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ def test_reload(self):

@unittest.skipUnless(re.match("(?i)win|linux|darwin|freebsd|openbsd", sys.platform), "os")
def test_start_stop(self):
def reload_line(
num_runners): return "Starting reload procedure, current runners: %d" % num_runners
"""
Test if module is properly started and stopped
"""
Expand All @@ -61,7 +59,7 @@ def reload_line(

# Ensure no modules are loaded
self.wait_until(
lambda: self.log_contains(reload_line(0)),
lambda: self.log_contains("Start list: 0, Stop list: 0"),
max_timeout=10)

systemConfig = """
Expand All @@ -73,17 +71,17 @@ def reload_line(
with open(config_path, 'w') as f:
f.write(systemConfig)

# Ensure the module was successfully loaded
# Ensure the module is started
self.wait_until(
lambda: self.log_contains(reload_line(1)),
lambda: self.log_contains("Start list: 1, Stop list: 0"),
max_timeout=10)

# Remove config again
os.remove(config_path)

# Ensure the module was successfully unloaded
# Ensure the module is stopped
self.wait_until(
lambda: self.log_contains(reload_line(0)),
lambda: self.log_contains("Start list: 0, Stop list: 1"),
max_timeout=10)

time.sleep(1)
Expand Down