Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the issue of unfriendly log prompts when gather plan monitor parameters are incomplete. #539

Merged
merged 27 commits into from
Nov 12, 2024
Merged
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
345af50
release 2.5.0
Teingi Oct 17, 2024
5a2b30c
release 2.5.0
Teingi Oct 17, 2024
9580d7a
Merge remote-tracking branch 'origin/master' into 2.5.0_dev3
Teingi Oct 21, 2024
3d4d107
update readme cn
Teingi Oct 21, 2024
854f8ca
Merge remote-tracking branch 'origin/master' into 2.5.0_dev3
Teingi Oct 22, 2024
be0f119
Merge remote-tracking branch 'origin/master' into 2.5.0_dev3
Teingi Oct 28, 2024
6a5d139
Update Explanatory Diagram
Teingi Oct 28, 2024
a312930
Merge remote-tracking branch 'origin/master' into 2.6.0
Teingi Oct 29, 2024
c3374ad
Merge remote-tracking branch 'origin/master' into 2.6.0
Teingi Nov 4, 2024
20f2b2f
Merge remote-tracking branch 'origin/master' into 2.6.0
Teingi Nov 5, 2024
0293e8f
To remove the dependency on the zip command and implement encryption …
Teingi Nov 5, 2024
54da4d8
To remove the dependency on the zip command and implement encryption …
Teingi Nov 6, 2024
fa26e4a
To remove the dependency on the zip command and implement encryption …
Teingi Nov 6, 2024
5e08d2f
fix
Teingi Nov 6, 2024
0d66b31
fix
Teingi Nov 7, 2024
1282a6b
fix
Teingi Nov 7, 2024
752df59
add obdiag build docker
Teingi Nov 7, 2024
9974123
Merge pull request #2 from Teingi/2.6.0_build
Teingi Nov 7, 2024
def19d7
add obdiag build docker
Teingi Nov 7, 2024
80b5852
add obdiag build docker
Teingi Nov 7, 2024
06301f2
fix
Teingi Nov 7, 2024
c1c010a
add build docker
Teingi Nov 7, 2024
d23f43c
add build docker
Teingi Nov 7, 2024
9094ca7
Merge remote-tracking branch 'origin/master' into 2.6.0
Teingi Nov 10, 2024
7fed965
Merge remote-tracking branch 'origin/master' into 2.6.0
Teingi Nov 12, 2024
b3546ec
bug fix #409
Teingi Nov 12, 2024
2f92aec
fix
Teingi Nov 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions handler/gather/gather_plan_monitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ def init_option(self):
os.makedirs(os.path.abspath(store_dir_option))
self.local_stored_path = os.path.abspath(store_dir_option)
if env_option is not None:
self.__init_db_conn(env_option)
if not self.__init_db_conn(env_option):
return False
else:
self.db_connector = self.sys_connector
return self.tenant_mode_detected()
Expand Down Expand Up @@ -231,12 +232,13 @@ def __init_db_conn(self, env):
self.db_conn = StringUtils.parse_mysql_conn(cli_connection_string)
if StringUtils.validate_db_info(self.db_conn):
self.__init_db_connector()
return True
else:
self.stdio.error("db connection information requird [db_connect = '-hxx -Pxx -uxx -pxx -Dxx'] but provided {0}, please check the --env {0}".format(env_dict))
self.db_connector = self.sys_connector
self.stdio.error("db connection information requird [db_connect = '-hxx -Pxx -uxx -pxx -Dxx'], but provided {0}, please check the --env option".format(env_dict))
return False
except Exception as e:
self.db_connector = self.sys_connector
self.stdio.exception("init db connector, error: {0}, please check --env option ")
self.stdio.exception("init db connector, error: {0}, please check --env option ".format(e))

@staticmethod
def __get_overall_summary(node_summary_tuple):
Expand Down Expand Up @@ -271,6 +273,7 @@ def report_schema(self, sql, tenant_name):
if self.enable_dump_db:
words = [w.strip(',') for w in ("%s" % sql).split() if not ("[" in w or "=" in w or "|" in w or "(" in w or "--" in w or "]" in w or ")" in w or "*" in w or "/" in w or "%" in w or "'" in w or "-" in w or w.isdigit())]
for t in words:
t = t.replace('`', '')
if t in valid_words:
continue
valid_words.append(t)
Expand Down
Loading