This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 54f11971ac64ead7f42185f9ac16956954ea5b37 Author: Chesnay Schepler <[email protected]> AuthorDate: Thu Mar 24 17:00:45 2022 +0100 [FLINK-21585][tests] Use filter to reduce amount of logged metrics --- flink-end-to-end-tests/test-scripts/common.sh | 5 +++-- .../test-scripts/test_resume_externalized_checkpoints.sh | 2 +- flink-end-to-end-tests/test-scripts/test_resume_savepoint.sh | 2 +- .../test-scripts/test_rocksdb_state_memory_control.sh | 2 +- .../test-scripts/test_stateful_stream_job_upgrade.sh | 2 +- flink-end-to-end-tests/test-scripts/test_stream_state_ttl.sh | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/flink-end-to-end-tests/test-scripts/common.sh b/flink-end-to-end-tests/test-scripts/common.sh index 01e12b4..588d310 100644 --- a/flink-end-to-end-tests/test-scripts/common.sh +++ b/flink-end-to-end-tests/test-scripts/common.sh @@ -628,9 +628,10 @@ function kill_random_taskmanager { } function setup_flink_slf4j_metric_reporter() { - INTERVAL="${1:-1 SECONDS}" + METRIC_NAME_PATTERN="${1:-"*"}" set_config_key "metrics.reporter.slf4j.factory.class" "org.apache.flink.metrics.slf4j.Slf4jReporterFactory" - set_config_key "metrics.reporter.slf4j.interval" "${INTERVAL}" + set_config_key "metrics.reporter.slf4j.interval" "1 SECONDS" + set_config_key "metrics.reporter.slf4j.filter.includes" "*:${METRIC_NAME_PATTERN}" } function get_job_metric { diff --git a/flink-end-to-end-tests/test-scripts/test_resume_externalized_checkpoints.sh b/flink-end-to-end-tests/test-scripts/test_resume_externalized_checkpoints.sh index c9b1848..601733e 100755 --- a/flink-end-to-end-tests/test-scripts/test_resume_externalized_checkpoints.sh +++ b/flink-end-to-end-tests/test-scripts/test_resume_externalized_checkpoints.sh @@ -40,7 +40,7 @@ function run_resume_externalized_checkpoints() { set_config_key "taskmanager.numberOfTaskSlots" "${NUM_SLOTS}" set_config_key "metrics.fetcher.update-interval" "2000" - setup_flink_slf4j_metric_reporter + setup_flink_slf4j_metric_reporter "numRecordsIn" start_cluster CHECKPOINT_DIR="$TEST_DATA_DIR/externalized-chckpt-e2e-backend-dir" diff --git a/flink-end-to-end-tests/test-scripts/test_resume_savepoint.sh b/flink-end-to-end-tests/test-scripts/test_resume_savepoint.sh index e0526fa..2ea41f6 100755 --- a/flink-end-to-end-tests/test-scripts/test_resume_savepoint.sh +++ b/flink-end-to-end-tests/test-scripts/test_resume_savepoint.sh @@ -65,7 +65,7 @@ run_resume_savepoint_test() { fi set_config_key "metrics.fetcher.update-interval" "2000" - setup_flink_slf4j_metric_reporter + setup_flink_slf4j_metric_reporter "numRecordsIn" start_cluster diff --git a/flink-end-to-end-tests/test-scripts/test_rocksdb_state_memory_control.sh b/flink-end-to-end-tests/test-scripts/test_rocksdb_state_memory_control.sh index d42e806..3e9749e 100755 --- a/flink-end-to-end-tests/test-scripts/test_rocksdb_state_memory_control.sh +++ b/flink-end-to-end-tests/test-scripts/test_rocksdb_state_memory_control.sh @@ -51,7 +51,7 @@ set_config_key "state.backend.rocksdb.metrics.num-immutable-mem-table" "true" set_config_key "state.backend.rocksdb.metrics.block-cache-usage" "true" set_config_key "state.backend.rocksdb.metrics.estimate-table-readers-mem" "true" set_config_key "metrics.fetcher.update-interval" "1000" -setup_flink_slf4j_metric_reporter +setup_flink_slf4j_metric_reporter "numRecordsIn,block-cache-usage" start_cluster echo "Running RocksDB state backend memory control test" diff --git a/flink-end-to-end-tests/test-scripts/test_stateful_stream_job_upgrade.sh b/flink-end-to-end-tests/test-scripts/test_stateful_stream_job_upgrade.sh index 1c48528..c52c10e 100755 --- a/flink-end-to-end-tests/test-scripts/test_stateful_stream_job_upgrade.sh +++ b/flink-end-to-end-tests/test-scripts/test_stateful_stream_job_upgrade.sh @@ -29,7 +29,7 @@ else fi set_config_key "taskmanager.numberOfTaskSlots" "${NUM_SLOTS}" -setup_flink_slf4j_metric_reporter +setup_flink_slf4j_metric_reporter "numRecordsIn" set_config_key "metrics.fetcher.update-interval" "2000" start_cluster diff --git a/flink-end-to-end-tests/test-scripts/test_stream_state_ttl.sh b/flink-end-to-end-tests/test-scripts/test_stream_state_ttl.sh index 5306842..5eb16cd 100755 --- a/flink-end-to-end-tests/test-scripts/test_stream_state_ttl.sh +++ b/flink-end-to-end-tests/test-scripts/test_stream_state_ttl.sh @@ -31,7 +31,7 @@ TEST=flink-stream-state-ttl-test TEST_PROGRAM_NAME=DataStreamStateTTLTestProgram TEST_PROGRAM_JAR=${END_TO_END_DIR}/$TEST/target/$TEST_PROGRAM_NAME.jar -setup_flink_slf4j_metric_reporter +setup_flink_slf4j_metric_reporter "numRecordsIn" set_config_key "metrics.fetcher.update-interval" "2000"
