Fix: generate tiflash config hash by combining tiflash config and proxy config #6027
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## feature/v2 #6027 +/- ##
==============================================
+ Coverage 53.07% 53.09% +0.01%
==============================================
Files 154 154
Lines 9445 9448 +3
==============================================
+ Hits 5013 5016 +3
Misses 4432 4432
Flags with carried forward coverage won't be shown. Click here to find out more. |
| @@ -24,3 +29,7 @@ func PersistentVolumeClaimName(tiflashName string, volIndex int) string { | |||
| // ref: https://github.com/pingcap/tidb-operator/blob/486cc85c8380efc4f36b3125a1abba9e3146a2c8/pkg/apis/pingcap/v1alpha1/helpers.go#L105 | |||
| return fmt.Sprintf("data%d-%s", volIndex, tiflashName) | |||
| } | |||
|
|
|||
| func combineConfigFile(cfg1, cfg2 v1alpha1.ConfigFile) v1alpha1.ConfigFile { | |||
| return v1alpha1.ConfigFile(strings.Join([]string{string(cfg1), string(cfg2)}, "\n")) | |||
There was a problem hiding this comment.
use a separator which will never appear in config file
fgksgf
force-pushed
the
huaxi/fix-tiflash-config
branch
from
00a0a96 to
0ad7003
Compare
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: liubog2008 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:
Approvers can indicate their approval by writing |
|
/run-pull-e2e-kind-v2 |
[LGTM Timeline notifier]Timeline:
|
|
New changes are detected. LGTM label has been removed. |
|
@fgksgf: Your PR was out of date, I have automatically updated it for you. 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 ti-community-infra/tichi repository. |
What problem does this PR solve?
What is changed and how does it work?
Code changes
Tests
Side effects
Related changes
Release Notes
Please refer to Release Notes Language Style Guide before writing the release note.