Skip to content

disagg: Fix build under ASAN; Check each aws patch separately (#9995)#9996

Closed
ti-chi-bot wants to merge 1 commit intopingcap:release-8.5from
ti-chi-bot:cherry-pick-9995-to-release-8.5
Closed

disagg: Fix build under ASAN; Check each aws patch separately (#9995)#9996
ti-chi-bot wants to merge 1 commit intopingcap:release-8.5from
ti-chi-bot:cherry-pick-9995-to-release-8.5

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Mar 14, 2025

This is an automated cherry-pick of #9995

What problem does this PR solve?

Issue Number: close #9955

Problem Summary:

Ref #9957

cmake /home/jenkins/agent/workspace/tiflash-sanitizer-daily/tiflash -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=ASan -DUSE_CCACHE=ON -DRUN_HAVE_STD_REGEX=0 -DCMAKE_PREFIX_PATH=/usr/local -DUSE_GM_SSL=0 -GNinja
...
[2025-03-09T18:47:24.402Z] -- aws patch not apply: 1, patching...
[2025-03-09T18:47:24.402Z] 'git' 'apply' '-v' '/home/jenkins/agent/workspace/tiflash-sanitizer-daily/tiflash/contrib/aws-cmake/0001-More-reliable-way-to-check-if-there-is-anything-in-r.patch'
[2025-03-09T18:47:24.402Z] Checking patch src/aws-cpp-sdk-core/source/client/AWSJsonClient.cpp...
[2025-03-09T18:47:24.402Z] Checking patch src/aws-cpp-sdk-core/source/client/AWSXmlClient.cpp...
[2025-03-09T18:47:24.402Z] Checking patch src/aws-cpp-sdk-core/source/internal/AWSHttpResourceClient.cpp...
[2025-03-09T18:47:24.402Z] Applied patch src/aws-cpp-sdk-core/source/client/AWSJsonClient.cpp cleanly.
[2025-03-09T18:47:24.402Z] Applied patch src/aws-cpp-sdk-core/source/client/AWSXmlClient.cpp cleanly.
[2025-03-09T18:47:24.402Z] Applied patch src/aws-cpp-sdk-core/source/internal/AWSHttpResourceClient.cpp cleanly.
[2025-03-09T18:47:24.402Z] 'git' 'apply' '-v' '/home/jenkins/agent/workspace/tiflash-sanitizer-daily/tiflash/contrib/aws-cmake/0002-Reduce-verbose-error-logging-and-404-for-HEAD-reques.patch'
[2025-03-09T18:47:24.402Z] Checking patch src/aws-cpp-sdk-core/source/client/AWSClient.cpp...
[2025-03-09T18:47:24.402Z] Checking patch src/aws-cpp-sdk-core/source/client/AWSXmlClient.cpp...
[2025-03-09T18:47:24.402Z] Applied patch src/aws-cpp-sdk-core/source/client/AWSClient.cpp cleanly.
[2025-03-09T18:47:24.402Z] Applied patch src/aws-cpp-sdk-core/source/client/AWSXmlClient.cpp cleanly.
[2025-03-09T18:47:24.402Z] -- aws patch done
[2025-03-09T18:47:24.402Z] 'git' 'apply' '-v' '/home/jenkins/agent/workspace/tiflash-sanitizer-daily/tiflash/contrib/aws-cmake/0003-Suppress-enum-overflow.patch'
[2025-03-09T18:47:24.402Z] Checking patch src/aws-cpp-sdk-core/source/utils/EnumParseOverflowContainer.cpp...
[2025-03-09T18:47:24.402Z] error: src/aws-cpp-sdk-core/source/utils/EnumParseOverflowContainer.cpp: No such file or directory
[2025-03-09T18:47:24.402Z] CMake Error at contrib/aws-cmake/CMakeLists.txt:134 (message):
[2025-03-09T18:47:24.402Z]   Can not apply aws patch
[2025-03-09T18:47:24.403Z]   /home/jenkins/agent/workspace/tiflash-sanitizer-daily/tiflash/contrib/aws-cmake/0003-Suppress-enum-overflow.patch
[2025-03-09T18:47:24.403Z] 
[2025-03-09T18:47:24.403Z] 
[2025-03-09T18:47:24.403Z] -- Configuring incomplete, errors occurred!

What is changed and how it works?

disagg: Fix build under ASAN; Check each aws patch separately
* Use "${AWS_SDK_DIR}" as working directory

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

@JaySon-Huang @ti-chi-bot
This is an automated cherry-pick of pingcap#9995
993e7fd 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels Mar 14, 2025
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 14, 2025
Merged
12 tasks
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Mar 14, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign schrodingerzhu for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Mar 14, 2025

@JaySon-Huang This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Mar 14, 2025

@ti-chi-bot: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-unit-test 993e7fd link true /test pull-unit-test
pull-integration-test 993e7fd link true /test pull-integration-test

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@JaySon-Huang
Copy link
Contributor

JaySon-Huang commented Mar 14, 2025

The changes are merged into #9978

@ti-chi-bot ti-chi-bot bot added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Mar 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@JaySon-Huang JaySon-Huang

Labels

cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ti-chi-bot @JaySon-Huang