Skip to content

fix obdiag deploy #221

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

Merged
Teingi merged 3 commits into from
Aug 18, 2025
Merged

fix obdiag deploy #221

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
310c1d3
fix obdiag deploy
xiaodong-ji Aug 11, 2025
03bd92a
fix obdiag workflow
xiaodong-ji Aug 11, 2025
7b0627d
fix for deploy command
xiaodong-ji Aug 15, 2025
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
3 changes: 3 additions & 0 deletions _cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2017,6 +2017,9 @@ def __init__(self):

def _do_command(self, obd):
args = copy.copy(self.args)
if args[0]=="deploy":
ROOT_IO.print("Use 'obd tool install %s' instead" % COMP_OCEANBASE_DIAGNOSTIC_TOOL)
return obd.install_tool(COMP_OCEANBASE_DIAGNOSTIC_TOOL)
for i in range(len(self.args)):
if isinstance(self.args[i], str) and (self.args[i].startswith('--') or self.args[i].startswith('-')):
if self.args[i] == "--help" or self.args[i] == "-h":
Expand Down
9 changes: 3 additions & 6 deletions core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4788,16 +4788,13 @@ def obdiag_func(self, args, deploy_name):
return False
cluster_config = deploy_config.components[component_name]
deploy_config.components[tool_name] = cluster_config

workflow_name='diag'
pkg = self.mirror_manager.get_best_pkg(name=tool_name)
if not pkg:
self._call_stdio('critical', '%s package not found' % tool_name)
return False
repository = self.repository_manager.create_instance_repository(pkg.name, pkg.version, pkg.md5)
deployed = self.obdiag_deploy(workflow_name)
tool = self.tool_manager.get_tool_config_by_name(tool_name)
if deployed and tool:
obdiag_tools = [tool for tool in self.tool_manager.get_tool_list() if tool.name == tool_name]
max_version_tool = max(t.config.version for t in obdiag_tools)
repository = self.repository_manager.get_repository(tool_name, max_version_tool)
self.repositories = [repository]
workflows = self.get_workflows(workflow_name, [repository])
return self.run_workflow(workflows, deploy_config.components, [repository], **{const.COMP_OCEANBASE_DIAGNOSTIC_TOOL: {"full_cmd": args, "deploy_config": deploy_config}})
Expand Down