br/storage: add scope to support service_account type of credential file & remove default GCS httpclient #49363

D3Hunter · 2023-12-12T06:25:47Z

What problem does this PR solve?

Issue Number: ref #49340

Problem Summary:

What changed and how does it work?

remove default GCS httpclient and init httpclient on need, as BR might cause some issue when reading many metadata
https://www.googleapis.com/auth/cloud-platform must be add to scope to use service_account type of credential-file, else it report:

oauth2: cannot fetch token: 400 Bad Request\nResponse: {\"error\":\"invalid_scope\",\"error_description\":\"Invalid OAuth scope or ID token audience provided.\"}"

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
run TestReadFileConcurrently with a service_account type of credential file
No need to test
- I checked and no code files have been changed.

Side effects

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

Documentation

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

tiprow · 2023-12-12T06:26:06Z

Hi @D3Hunter. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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/test-infra repository.

ti-chi-bot · 2023-12-12T06:27:32Z

[LGTM Timeline notifier]

Timeline:

2023-12-12 06:27:08.293158617 +0000 UTC m=+337519.330385530: ☑️ agreed by tangenta.
2023-12-12 06:27:30.849672771 +0000 UTC m=+337541.886899683: ☑️ agreed by lance6716.

codecov · 2023-12-12T06:39:53Z

Codecov Report

Additional details and impacted files

@@               Coverage Diff                @@
##             master     #49363        +/-   ##
================================================
+ Coverage   71.0493%   74.2352%   +3.1858%     
================================================
  Files          1368       1414        +46     
  Lines        401715     416162     +14447     
================================================
+ Hits         285416     308939     +23523     
+ Misses        96443      87239      -9204     
- Partials      19856      19984       +128

Flag	Coverage Δ
integration	`49.7979% <27.5000%> (?)`
unit	`71.0500% <ø> (+0.0006%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components	Coverage Δ
dumpling	`53.9663% <ø> (ø)`
parser	`∅ <ø> (∅)`
br	`65.4920% <28.9473%> (+12.5986%)`	⬆️

YuJuncen · 2023-12-12T07:28:54Z

/run-integration-br-tests

D3Hunter · 2023-12-12T07:46:27Z

/test pull-br-integration-test
/test pull-lightning-integration-test

tiprow · 2023-12-12T07:46:50Z

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

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/test-infra repository.

D3Hunter · 2023-12-12T07:56:02Z

/test pull-br-integration-test

tiprow · 2023-12-12T07:56:25Z

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

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/test-infra repository.

YuJuncen · 2023-12-12T07:57:59Z

br/pkg/storage/gcs.go

 		var err error
-		httpClient.Transport, err = htransport.NewTransport(ctx, httpClient.Transport, clientOps...)
+		httpClient.Transport, err = htransport.NewTransport(ctx, httpClient.Transport,
+			append(clientOps, option.WithScopes(storage.ScopeFullControl, "https://www.googleapis.com/auth/cloud-platform"))...)


Maybe ignore this when user provides endpoint.

D3Hunter · 2023-12-12T08:28:27Z

/retest

D3Hunter · 2023-12-12T08:28:43Z

/hold

tiprow · 2023-12-12T08:28:48Z

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

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/test-infra repository.

code changed

D3Hunter · 2023-12-12T12:30:38Z

/test pull-br-integration-test

ti-chi-bot · 2023-12-12T12:30:41Z

@D3Hunter: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test build
/test check-dev
/test check-dev2
/test mysql-test
/test unit-test

The following commands are available to trigger optional jobs:

/test canary-notify-when-compatibility-sections-changed
/test pingcap/tidb/canary_ghpr_unit_test
/test pull-br-integration-test
/test pull-common-test
/test pull-e2e-test
/test pull-integration-common-test
/test pull-integration-copr-test
/test pull-integration-ddl-test
/test pull-integration-jdbc-test
/test pull-integration-mysql-test
/test pull-integration-nodejs-test
/test pull-lightning-integration-test
/test pull-mysql-client-test
/test pull-sqllogic-test
/test pull-tiflash-test

Use /test all to run the following jobs that were automatically triggered:

pingcap/tidb/canary_ghpr_unit_test
pingcap/tidb/ghpr_build
pingcap/tidb/ghpr_check
pingcap/tidb/ghpr_check2
pingcap/tidb/ghpr_mysql_test
pingcap/tidb/ghpr_unit_test

In response to this:

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/test-infra repository.

tiprow · 2023-12-12T12:31:01Z

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

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/test-infra repository.

D3Hunter · 2023-12-12T12:31:27Z

/test pull-br-integration-test

ti-chi-bot · 2023-12-12T12:31:30Z

@D3Hunter: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test build
/test check-dev
/test check-dev2
/test mysql-test
/test unit-test

The following commands are available to trigger optional jobs:

/test canary-notify-when-compatibility-sections-changed
/test pingcap/tidb/canary_ghpr_unit_test
/test pull-br-integration-test
/test pull-common-test
/test pull-e2e-test
/test pull-integration-common-test
/test pull-integration-copr-test
/test pull-integration-ddl-test
/test pull-integration-jdbc-test
/test pull-integration-mysql-test
/test pull-integration-nodejs-test
/test pull-lightning-integration-test
/test pull-mysql-client-test
/test pull-sqllogic-test
/test pull-tiflash-test

Use /test all to run the following jobs that were automatically triggered:

pingcap/tidb/canary_ghpr_unit_test
pingcap/tidb/ghpr_build
pingcap/tidb/ghpr_check
pingcap/tidb/ghpr_check2
pingcap/tidb/ghpr_mysql_test
pingcap/tidb/ghpr_unit_test

In response to this:

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/test-infra repository.

tiprow · 2023-12-12T12:31:49Z

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

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/test-infra repository.

D3Hunter · 2023-12-12T12:32:45Z

/test pull-br-integration-test

tiprow · 2023-12-12T12:33:08Z

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

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/test-infra repository.

D3Hunter · 2023-12-12T13:47:14Z

/retest

tiprow · 2023-12-12T13:47:37Z

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

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/test-infra repository.

Benjamin2037

LGTM

ti-chi-bot · 2023-12-12T14:21:35Z

@D3Hunter: The following test 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-br-integration-test	`0bd5663`	link	false	`/test pull-br-integration-test`

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

D3Hunter · 2023-12-12T15:56:28Z

/test pull-lightning-integration-test

tiprow · 2023-12-12T15:56:52Z

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

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/test-infra repository.

D3Hunter · 2023-12-12T16:40:33Z

https://do.pingcap.net/jenkins/blue/organizations/jenkins/pingcap%2Ftidb%2Fpull_lightning_integration_test/detail/pull_lightning_integration_test/13/pipeline/280
lightning ci pass which include a lightghtning_gcs case

https://do.pingcap.net/jenkins/blue/organizations/jenkins/pingcap%2Ftidb%2Fpull_br_integration_test/detail/pull_br_integration_test/544/pipeline/227
2 test in br ci failed, but it's not related to gcs
so will merge it

D3Hunter · 2023-12-12T16:40:46Z

/approve

ti-chi-bot · 2023-12-12T16:40:57Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Benjamin2037, D3Hunter, Leavrth

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [Benjamin2037,D3Hunter,Leavrth]
~~br/OWNERS~~ [Leavrth]
~~br/pkg/lightning/OWNERS~~ [Benjamin2037,D3Hunter]
~~pkg/ddl/OWNERS~~ [Benjamin2037]
~~pkg/executor/importer/OWNERS~~ [D3Hunter]

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

D3Hunter · 2023-12-12T16:42:23Z

/unhold

change

4869fdb

ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 12, 2023

tangenta previously approved these changes Dec 12, 2023

View reviewed changes

ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 12, 2023

lance6716 previously approved these changes Dec 12, 2023

View reviewed changes

ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 12, 2023

YuJuncen previously approved these changes Dec 12, 2023

View reviewed changes

ti-chi-bot bot added the approved label Dec 12, 2023

ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 12, 2023

D3Hunter added 2 commits December 12, 2023 18:26

change

b161b0e

bazel

0bd5663

ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 12, 2023

D3Hunter requested review from lance6716, tangenta and YuJuncen December 12, 2023 10:28

ti-chi-bot bot removed the approved label Dec 12, 2023

D3Hunter changed the title ~~br/storage: add scope to support service_account type of credential file~~ br/storage: add scope to support service_account type of credential file & remove default GCS httpclient Dec 12, 2023

Leavrth approved these changes Dec 12, 2023

View reviewed changes

Benjamin2037 approved these changes Dec 12, 2023

View reviewed changes

ti-chi-bot bot added the approved label Dec 12, 2023

ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 12, 2023

ti-chi-bot bot merged commit 9322568 into pingcap:master Dec 12, 2023

D3Hunter deleted the fix-sa-cre branch December 13, 2023 02:37

wd0517 mentioned this pull request Jan 16, 2024

Bump tidb version to fix bug when init gcloud service_account credentials file pingcap-inc/tidb2dw#85

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

br/storage: add scope to support service_account type of credential file & remove default GCS httpclient #49363

br/storage: add scope to support service_account type of credential file & remove default GCS httpclient #49363

D3Hunter commented Dec 12, 2023 •

edited

Loading

tiprow bot commented Dec 12, 2023

ti-chi-bot bot commented Dec 12, 2023

codecov bot commented Dec 12, 2023 •

edited

Loading

YuJuncen commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

YuJuncen Dec 12, 2023

D3Hunter commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

ti-chi-bot bot commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

ti-chi-bot bot commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

Benjamin2037 left a comment

ti-chi-bot bot commented Dec 12, 2023 •

edited

Loading

D3Hunter commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

ti-chi-bot bot commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

br/storage: add scope to support service_account type of credential file & remove default GCS httpclient #49363

br/storage: add scope to support service_account type of credential file & remove default GCS httpclient #49363

Conversation

D3Hunter commented Dec 12, 2023 • edited Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

tiprow bot commented Dec 12, 2023

ti-chi-bot bot commented Dec 12, 2023

[LGTM Timeline notifier]

codecov bot commented Dec 12, 2023 • edited Loading

Codecov Report

YuJuncen commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

YuJuncen Dec 12, 2023

Choose a reason for hiding this comment

D3Hunter commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

ti-chi-bot bot commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

ti-chi-bot bot commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

Benjamin2037 left a comment

Choose a reason for hiding this comment

ti-chi-bot bot commented Dec 12, 2023 • edited Loading

D3Hunter commented Dec 12, 2023

tiprow bot commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

ti-chi-bot bot commented Dec 12, 2023

D3Hunter commented Dec 12, 2023

D3Hunter commented Dec 12, 2023 •

edited

Loading

codecov bot commented Dec 12, 2023 •

edited

Loading

ti-chi-bot bot commented Dec 12, 2023 •

edited

Loading