Common clickhouse client #106
Merged
Conversation
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
aalexfvk
reviewed
Feb 28, 2024
Comment on lines
36
to
38
| @classmethod | ||
| def get(cls, string): | ||
| return cls._map[string] if string in cls._map else ClickhousePort.AUTO |
There was a problem hiding this comment.
Suggested change
| @classmethod | |
| def get(cls, string): | |
| return cls._map[string] if string in cls._map else ClickhousePort.AUTO | |
| @classmethod | |
| def get(cls, port: str, default: ClickhousePort = ClickhousePort.AUTO) -> ClickhousePort: | |
| return cls._map.get(port, default) |
Comment on lines
252
to
254
| if port in self.ports: | ||
| return self.ports[port] | ||
| return 0 |
There was a problem hiding this comment.
Suggested change
| if port in self.ports: | |
| return self.ports[port] | |
| return 0 | |
| return self.ports.get(port, 0) |
| def get_ports(): | ||
| ports: Dict[ClickhousePort, str] = {} | ||
| try: | ||
| root = xml.parse("/var/lib/clickhouse/preprocessed_configs/config.xml") |
There was a problem hiding this comment.
Let's use
| ports[ClickhousePortHelper.get(setting)] = str(node.text) | ||
| if not ports: | ||
| raise UserWarning(2, "Can't find any port in clickhouse-server config") | ||
| node = root.find("./openSSL/server/caConfig") |
There was a problem hiding this comment.
This string constants we can also move to path.py
ch_tools/monrun_checks/utils.py
Outdated
| ) | ||
|
|
||
|
|
||
| def execute_query_client( |
There was a problem hiding this comment.
How about moving this function to ClickhouseClient as member function query_json_data()
We can use it also in replication_lag.py
ch_tools/monrun_checks/utils.py
Outdated
| )["data"] | ||
|
|
||
|
|
||
| def execute_query( |
There was a problem hiding this comment.
What benefit of this proxy function ? Could we use clickhouse_client() instead ?
aalexfvk
approved these changes
Feb 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Clickhouse clients in tests and monitoring replaced with common client and wrappers around it.
Port resolution code with http and tcp execution methods is moved to common client.