Skip to content

exclude userspace cache for memory overload warning#87610

Merged
bharatnc merged 2 commits intomasterfrom
ncb/fix-mem-overload-warning
Sep 25, 2025
Merged

exclude userspace cache for memory overload warning#87610
bharatnc merged 2 commits intomasterfrom
ncb/fix-mem-overload-warning

Conversation

@bharatnc
Copy link
Copy Markdown
Contributor

@bharatnc bharatnc commented Sep 25, 2025

Follow up for #86838

Changelog category (leave one):

  • Bug Fix (user-visible misbehavior in an official stable release)

Changelog entry (a user-readable short description of the changes that goes into CHANGELOG.md):

Exclude userspace page cache bytes (if possible) when computing memory overload warning.

Documentation entry for user-facing changes

  • Documentation is written (mandatory for new features)

@bharatnc bharatnc requested a review from azat September 25, 2025 00:49
@clickhouse-gh
Copy link
Copy Markdown
Contributor

clickhouse-gh bot commented Sep 25, 2025 •
edited
Loading

Workflow [PR], commit [9460ec9]

Summary: ❌

job_name test_name status info comment
Integration tests (amd_asan, old analyzer, 1/6) failure
test_storage_delta/test.py::test_replicated_database_and_unavailable_s3[1] FAIL
test_storage_delta/test.py::test_replicated_database_and_unavailable_s3[0] FAIL
Integration tests (amd_binary, 1/5) failure
test_storage_delta/test.py::test_replicated_database_and_unavailable_s3[0] FAIL
test_storage_delta/test.py::test_replicated_database_and_unavailable_s3[1] FAIL
Integration tests (arm_binary, distributed plan, 1/4) failure
test_storage_delta/test.py::test_replicated_database_and_unavailable_s3[1] FAIL
test_storage_delta/test.py::test_replicated_database_and_unavailable_s3[0] FAIL
Integration tests (amd_tsan, 1/6) failure
test_storage_delta/test.py::test_replicated_database_and_unavailable_s3[1] FAIL
test_storage_delta/test.py::test_replicated_database_and_unavailable_s3[0] FAIL
Finish Workflow failure
python3 ./ci/jobs/scripts/workflow_hooks/new_tests_check.py failure

@clickhouse-gh clickhouse-gh bot added the pr-bugfix Pull request with bugfix, not backported by default label Sep 25, 2025
bharatnc
bharatnc commented Sep 25, 2025
View reviewed changes
src/Common/AsynchronousMetrics.cpp
memory_resident = cgroup_memory_used->value;
memory_total = cgroup_memory_total->value;
}
else if (const auto * os_memory_used = getAsynchronousMetricValue(new_values, "OSMemoryResident"),
Copy link
Copy Markdown
Contributor Author

@bharatnc bharatnc Sep 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this was changed accidentally in one of the commits in #86838.

azat
azat approved these changes Sep 25, 2025
View reviewed changes
@bharatnc @azat
Update src/Common/AsynchronousMetrics.cpp
9460ec9 
Co-authored-by: Azat Khuzhin <a3at.mail@gmail.com>
@bharatnc
Copy link
Copy Markdown
Contributor Author

bharatnc commented Sep 25, 2025

Test failures not related, all related to test_storage_delta/test.py and related ones.

@bharatnc bharatnc added this pull request to the merge queue Sep 25, 2025
Merged via the queue into master with commit 485a331 Sep 25, 2025
118 of 123 checks passed
@bharatnc bharatnc deleted the ncb/fix-mem-overload-warning branch September 25, 2025 15:34
@robot-ch-test-poll1 robot-ch-test-poll1 added the pr-synced-to-cloud The PR is synced to the cloud repo label Sep 25, 2025
@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added pr-backports-created-cloud deprecated label, NOOP pr-must-backport-synced The `*-must-backport` labels are synced into the cloud Sync PR labels Sep 25, 2025
@robot-clickhouse robot-clickhouse mentioned this pull request Sep 25, 2025
Merged
robot-clickhouse added a commit that referenced this pull request Sep 25, 2025
@robot-clickhouse
Merge pull request #87641 from ClickHouse/cherrypick/25.9/87610
4a0a83d 
Cherry pick #87610 to 25.9: exclude userspace cache for memory overload warning
robot-clickhouse added a commit that referenced this pull request Sep 25, 2025
@robot-clickhouse
Backport #87610 to 25.9: exclude userspace cache for memory overload …
69bcfe7 
…warning
@robot-clickhouse robot-clickhouse mentioned this pull request Sep 25, 2025
Merged
@robot-ch-test-poll2 robot-ch-test-poll2 added the pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore label Sep 25, 2025
clickhouse-gh bot added a commit that referenced this pull request Sep 25, 2025
@clickhouse-gh
Merge pull request #87642 from ClickHouse/backport/25.9/87610
84c859f 
Backport #87610 to 25.9: exclude userspace cache for memory overload warning
@primeroz primeroz mentioned this pull request Apr 1, 2026
Open
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@azat azat azat approved these changes

Assignees

@azat azat

Labels

pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore pr-backports-created-cloud deprecated label, NOOP pr-bugfix Pull request with bugfix, not backported by default pr-must-backport-synced The `*-must-backport` labels are synced into the cloud Sync PR pr-synced-to-cloud The PR is synced to the cloud repo

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@bharatnc @azat @alexey-milovidov @robot-ch-test-poll1 @robot-ch-test-poll2 @robot-clickhouse-ci-2