-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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
Fix cAdvisor constantly polls data that has been disabled #2900
Conversation
/ok-to-test |
/retest |
2397163
to
aed51d3
Compare
c552073
to
6260164
Compare
build/integration.sh
Outdated
@@ -26,7 +26,8 @@ printf "" # Refresh sudo credentials if necessary. | |||
function start { | |||
set +e # We want to handle errors if cAdvisor crashes. | |||
echo ">> starting cAdvisor locally" | |||
GORACE="halt_on_error=1" ./cadvisor --docker_env_metadata_whitelist=TEST_VAR --v=6 --logtostderr $CADVISOR_ARGS &> "$log_file" | |||
# This cpu, cpuset, percpu, app, memory, disk, diskIO, network, perf_event metrics should be enabled. |
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.
This -> The ?
Btw. If this PR would depend on PR#2902, it would be enough to change "disable_metrics" for "enable_metrics" option, to document what metrics the testing actually needs.
Signed-off-by: Paweł Szulik <pawel.szulik@intel.com>
6260164
to
dbf633f
Compare
Signed-off-by: Paweł Szulik <pawel.szulik@intel.com>
Signed-off-by: Paweł Szulik <pawel.szulik@intel.com>
dbf633f
to
de4c2e2
Compare
@@ -26,7 +26,8 @@ printf "" # Refresh sudo credentials if necessary. | |||
function start { | |||
set +e # We want to handle errors if cAdvisor crashes. | |||
echo ">> starting cAdvisor locally" | |||
GORACE="halt_on_error=1" ./cadvisor --docker_env_metadata_whitelist=TEST_VAR --v=6 --logtostderr $CADVISOR_ARGS &> "$log_file" | |||
# This cpuset, percpu, memory, disk, diskIO, network, perf_event metrics should be enabled. |
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.
Now that -enable_metrics is used, this could say e.g. "enable only metrics required by the test", or be even removed.
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.
In my opinion, that comment is more accurate than "enable only metrics required by the test"
.
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.
Comment metrics list just duplicates -enable_metrics argument, so it's redundant / can get out of sync later. Comment is a bit weirdly at the moment too ("This" -> "The"?). But feel free to ignore my comment "bike-shedding", it's not really important, like rest of this PR.
Btw. Do integration tests need also "app" and "cpu" metrics? Currently they are always enabled, as those two (are only ones that) are not in the ignoreWhitelist, but that is going to change with PR #2910. |
@bobbypage, @iwankgb, @dims, @mrunalp PTAL |
Thanks @Creatone for the fix. LGTM! |
Fixes #2897