This repository has been archived by the owner on Jun 21, 2022. It is now read-only.
PMM-4879 Adding support for defaults-file in new mysql service. #1068
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // pmm-managed | ||
| // Copyright (C) 2017 Percona LLC | ||
| // | ||
| // This program is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU Affero General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU Affero General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU Affero General Public License | ||
| // along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
|
|
||
| package models | ||
|
|
||
| // ParseDefaultsFileResult contains result of parsing defaults file. | ||
| type ParseDefaultsFileResult struct { | ||
| Username string | ||
| Password string | ||
| Host string | ||
| Port uint32 | ||
| Socket string | ||
| } |
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,98 @@ | ||||||
| // pmm-managed | ||||||
| // Copyright (C) 2017 Percona LLC | ||||||
| // | ||||||
| // This program is free software: you can redistribute it and/or modify | ||||||
| // it under the terms of the GNU Affero General Public License as published by | ||||||
| // the Free Software Foundation, either version 3 of the License, or | ||||||
| // (at your option) any later version. | ||||||
| // | ||||||
| // This program is distributed in the hope that it will be useful, | ||||||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||||||
| // GNU Affero General Public License for more details. | ||||||
| // | ||||||
| // You should have received a copy of the GNU Affero General Public License | ||||||
| // along with this program. If not, see <https://www.gnu.org/licenses/>. | ||||||
|
|
||||||
| package agents | ||||||
|
|
||||||
| import ( | ||||||
| "context" | ||||||
| "time" | ||||||
|
|
||||||
| "github.com/percona/pmm/api/agentpb" | ||||||
| "github.com/percona/pmm/api/inventorypb" | ||||||
| "github.com/pkg/errors" | ||||||
|
|
||||||
| "github.com/percona/pmm-managed/models" | ||||||
| "github.com/percona/pmm-managed/utils/logger" | ||||||
| ) | ||||||
|
|
||||||
| // DefaultsFileParser requests from agent to parse defaultsFile. | ||||||
| type DefaultsFileParser struct { | ||||||
| r *Registry | ||||||
| } | ||||||
|
|
||||||
| // NewDefaultsFileParser creates new ParseDefaultsFile request. | ||||||
| func NewDefaultsFileParser(r *Registry) *DefaultsFileParser { | ||||||
| return &DefaultsFileParser{ | ||||||
| r: r, | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| // ParseDefaultsFile sends request (with file path) to pmm-agent to parse defaults file. | ||||||
| func (p *DefaultsFileParser) ParseDefaultsFile(ctx context.Context, pmmAgentID, filePath string, serviceType models.ServiceType) (*models.ParseDefaultsFileResult, error) { | ||||||
| l := logger.Get(ctx) | ||||||
|
|
||||||
| pmmAgent, err := p.r.get(pmmAgentID) | ||||||
| if err != nil { | ||||||
| return nil, err | ||||||
| } | ||||||
|
|
||||||
| start := time.Now() | ||||||
| defer func() { | ||||||
| if dur := time.Since(start); dur > 5*time.Second { | ||||||
| l.Warnf("ParseDefaultsFile took %s.", dur) | ||||||
| } | ||||||
| }() | ||||||
|
Comment on lines
+52
to
+57
There was a problem hiding this comment. Is it realistic? Reading a file with few lines should not be a problem. And, I think, it should be handed in agent There was a problem hiding this comment. That can be written like this: But yes, I also don't see benefit of this log |
||||||
|
|
||||||
| request, err := createRequest(filePath, serviceType) | ||||||
| if err != nil { | ||||||
| l.Debugf("can't create ParseDefaultsFileRequest %s", err) | ||||||
| return nil, err | ||||||
| } | ||||||
|
|
||||||
| resp, err := pmmAgent.channel.SendAndWaitResponse(request) | ||||||
| if err != nil { | ||||||
| return nil, err | ||||||
| } | ||||||
|
|
||||||
| l.Infof("ParseDefaultsFile response from agent: %+v.", resp) | ||||||
|
There was a problem hiding this comment. I think |
||||||
| parserResponse, ok := resp.(*agentpb.ParseDefaultsFileResponse) | ||||||
| if !ok { | ||||||
| return nil, errors.New("wrong response from agent (not ParseDefaultsFileResponse model)") | ||||||
|
There was a problem hiding this comment. Can we add info regarding actual type? |
||||||
| } | ||||||
| if parserResponse.Error != "" { | ||||||
| return nil, errors.New(parserResponse.Error) | ||||||
| } | ||||||
|
|
||||||
| return &models.ParseDefaultsFileResult{ | ||||||
| Username: parserResponse.Username, | ||||||
| Password: parserResponse.Password, | ||||||
| Host: parserResponse.Host, | ||||||
| Port: parserResponse.Port, | ||||||
| Socket: parserResponse.Socket, | ||||||
| }, nil | ||||||
| } | ||||||
|
|
||||||
| func createRequest(configPath string, serviceType models.ServiceType) (*agentpb.ParseDefaultsFileRequest, error) { | ||||||
| if serviceType == models.MySQLServiceType { | ||||||
| request := &agentpb.ParseDefaultsFileRequest{ | ||||||
| ServiceType: inventorypb.ServiceType_MYSQL_SERVICE, | ||||||
| ConfigPath: configPath, | ||||||
| } | ||||||
| return request, nil | ||||||
| } else { | ||||||
| return nil, errors.Errorf("unhandled service type %s", serviceType) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| } | ||||||
| } | ||||||
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // pmm-managed | ||
| // Copyright (C) 2017 Percona LLC | ||
| // | ||
| // This program is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU Affero General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU Affero General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU Affero General Public License | ||
| // along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
|
|
||
| package agents | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/percona/pmm-managed/models" | ||
| ) | ||
|
|
||
| func TestCreateRequest(t *testing.T) { | ||
| t.Parallel() | ||
| response, err := createRequest("/path/to/file", models.MySQLServiceType) | ||
|
|
||
| require.NoError(t, err) | ||
| require.NotNil(t, response, "ParseDefaultsFileRequest is nil") | ||
| } | ||
|
|
||
| func TestCreateRequestNotSupported(t *testing.T) { | ||
| t.Parallel() | ||
| response, err := createRequest("/path/to/file", models.PostgreSQLServiceType) | ||
|
|
||
| require.Error(t, err) | ||
| require.Nil(t, response, "ParseDefaultsFileRequest is not nil") | ||
| } |
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure what are we testing here