Fix MySQL and Postgres service file path bug#29220
Merged
GavinFrazar merged 1 commit intomasterfrom Jul 20, 2023
Merged
Conversation
GavinFrazar
added
bug
tsh
2 tasks
nklaassen
reviewed
Jul 18, 2023
smallinsky
approved these changes
Jul 20, 2023
strideynet
approved these changes
Jul 20, 2023
public-teleport-github-review-bot
Bot
removed the request for review
from camscale
* add test-specific override flags instead of reusing .tsh dir override.
GavinFrazar
force-pushed
the
gavinfrazar/mock-pg-and-mysql-conf-filepath-properly
branch
from
2b2f3cb to
2e55b44
Compare
GavinFrazar
deleted the
gavinfrazar/mock-pg-and-mysql-conf-filepath-properly
branch
Contributor
Author
|
Backport included in #29163 |
GavinFrazar
added a commit
that referenced
this pull request
Jul 20, 2023
Backports #29220 to branch/v13
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes a bug introduced in unreleased master changes.
In #28505 I needed to speed up tsh db tests substantially to pass the flaky test detector timeout.
A problem I ran into was that parallel tests involving
tsh db login/logoutwith postgres/mysql databases were racing becausetshupdates the same config file for each in the user's home dir, so sometimes the tests would fail as they clobbered eachother's pg/mysql config file.So, I mocked postgres and mysql config file path locations by reusing
TeleportClient.HomePath.However, I realized today that this introduced a bug with
tsh db login- when a user setsTELEPORT_HOMEenv var,HomePathwill be set to match that, sotsh db loginwill save/load/update those mysql/postgres config files in~/.tsh(or whereverTELEPORT_HOMEpoints to), rather than the user's home dir (the prior behavior).I'll merge these changes into the v13 backport as well before I merge that: #29163