Skip to content

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

Merged
ti-chi-bot[bot] merged 1 commit intopingcap:masterfrom
JaySon-Huang:fix_aws_apply_patch
Mar 14, 2025
Merged

disagg: Fix build under ASAN; Check each aws patch separately#9995
ti-chi-bot[bot] merged 1 commit intopingcap:masterfrom
JaySon-Huang:fix_aws_apply_patch

Conversation

@JaySon-Huang
Copy link
Contributor

@JaySon-Huang JaySon-Huang commented Mar 14, 2025

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

Signed-off-by: JaySon-Huang <tshent@qq.com>
@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-linked-issue size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-cherry-pick-release-8.5 Should cherry pick this PR to release-8.5 branch. and removed do-not-merge/needs-linked-issue labels Mar 14, 2025
@JaySon-Huang
Copy link
Contributor Author

/run-sanitizer-test asan

@JaySon-Huang JaySon-Huang changed the title Check each patch seperatly disagg: Fix build under ASAN; Check each aws patch separately Mar 14, 2025
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Mar 14, 2025
Copy link
Contributor

@yibin87 yibin87 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Mar 14, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Lloyd-Pottiger, yibin87

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [Lloyd-Pottiger,yibin87]

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 ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Mar 14, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Mar 14, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-03-14 03:37:50.458636757 +0000 UTC m=+499826.064165679: ☑️ agreed by Lloyd-Pottiger.
  • 2025-03-14 03:51:51.559095195 +0000 UTC m=+500667.164624122: ☑️ agreed by yibin87.

@ti-chi-bot ti-chi-bot bot merged commit ffcc193 into pingcap:master Mar 14, 2025
5 of 6 checks passed
ti-chi-bot pushed a commit to ti-chi-bot/tiflash that referenced this pull request Mar 14, 2025
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.5: #9996.
But this PR has conflicts, please resolve them!

@JaySon-Huang JaySon-Huang deleted the fix_aws_apply_patch branch March 14, 2025 04:01
JaySon-Huang added a commit to ti-chi-bot/tiflash that referenced this pull request Mar 14, 2025
…p#9995)

close pingcap#9955

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

Signed-off-by: JaySon-Huang <tshent@qq.com>
@ti-chi-bot ti-chi-bot bot removed the needs-cherry-pick-release-8.5 Should cherry pick this PR to release-8.5 branch. label Mar 27, 2025
yongman pushed a commit to yongman/tiflash that referenced this pull request Jun 18, 2025
…p#9995)

close pingcap#9955

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

Signed-off-by: JaySon-Huang <tshent@qq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved lgtm 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

aws s3 cause logging flood "Encountered enum member CRC64NVME which is not modeled in your clients"

4 participants