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.

Sign up for GitHub

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 analyze memory with threading #572

Merged
merged 4 commits into from
Nov 25, 2024
Merged

fix analyze memory with threading #572

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21645ee
Fix exception bugs in the analyze memory function.
Teingi Nov 25, 2024
3d50fd7
Fix exception bugs in the analyze memory function.
Teingi Nov 25, 2024
14e724f
Merge remote-tracking branch 'origin/master' into obdiag_2.6.0_1125
Teingi Nov 25, 2024
308e1f0
fix analyze memory with threading
Teingi Nov 25, 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
7 changes: 4 additions & 3 deletions handler/analyzer/analyze_memory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import datetime
import tabulate
import threading
import uuid
import common.ssh_client.local_client as ssh_client_local_client
from common.command import get_observer_version_by_sql
from common.tool import DirectoryUtil, TimeUtils, Util, NetUtils, FileUtil
Expand Down Expand Up @@ -201,14 +202,15 @@ def __handle_from_node(self, node, local_store_parent_dir):
from_datetime_timestamp = TimeUtils.timestamp_to_filename_time(TimeUtils.datetime_to_timestamp(self.from_time_str))
to_datetime_timestamp = TimeUtils.timestamp_to_filename_time(TimeUtils.datetime_to_timestamp(self.to_time_str))
gather_dir_name = "ob_log_{0}_{1}_{2}".format(ssh_client.get_name(), from_datetime_timestamp, to_datetime_timestamp)
gather_dir_full_path = "{0}/{1}".format(self.gather_ob_log_temporary_dir, gather_dir_name)
gather_dir_full_path = "{0}/{1}_{2}".format(self.gather_ob_log_temporary_dir, gather_dir_name, str(uuid.uuid4())[:6])
mkdir(ssh_client, gather_dir_full_path)
log_list, resp = self.__handle_log_list(ssh_client, node, resp)
result_pack_path = "./{0}".format(os.path.relpath(local_store_dir, self.gather_pack_dir))
resp["result_pack_path"] = result_pack_path
if resp["skip"]:
return resp
self.stdio.print(FileUtil.show_file_list_tabulate(remote_ip, log_list, self.stdio))
self.stdio.start_loading("analyze memory start")
for log_name in log_list:
if self.directly_analyze_files:
self.__pharse_offline_log_file(ssh_client, log_name=log_name, local_store_dir=local_store_dir)
Expand All @@ -225,7 +227,6 @@ def __handle_from_node(self, node, local_store_parent_dir):
analyze_log_full_path = "{0}/{1}".format(local_store_dir, str(log_name).strip(".").replace("/", "_"))
else:
analyze_log_full_path = "{0}/{1}".format(local_store_dir, log_name)
self.stdio.verbose('analyze memory info from {0} start'.format(log_name))
self.__parse_log_lines(analyze_log_full_path, memory_info)
for sample_time in memory_info:
for tenant in memory_info[sample_time]:
Expand All @@ -234,9 +235,9 @@ def __handle_from_node(self, node, local_store_parent_dir):
else:
tenant_memory_info_dict[tenant] = dict()
tenant_memory_info_dict[tenant][sample_time] = memory_info[sample_time][tenant]
self.stdio.verbose('analyze memory info from {0} sucess'.format(log_name))
self.stdio.verbose("rm local file storage path: {0}".format(analyze_log_full_path))
FileUtil.rm(analyze_log_full_path, self.stdio)
self.stdio.stop_loading("analyze memory succeed")
try:
fig = go.Figure()
colors = ['blue', 'orange', 'green', 'red', 'purple', 'cyan', 'magenta', 'yellow', 'black', 'brown', 'pink', 'gray', 'lime', 'teal', 'navy']
Expand Down
Loading