🌐 AI搜索 & 代理 主页
Skip to content

Fix node.py: try_shutdown and cleanup #144

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
demonolock merged 1 commit into from
Sep 17, 2024
Merged

Fix node.py: try_shutdown and cleanup #144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Fix node.py: try_shutdown and cleanup
  • Loading branch information
vshepard committed Sep 17, 2024
commit 66fa1ec73ca6f2af52a2c71a47c97f11b482ff91
59 changes: 30 additions & 29 deletions testgres/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,37 +334,38 @@ def _try_shutdown(self, max_attempts, with_force=False):
attempts = 0
node_pid = self.pid

# try stopping server N times
while attempts < max_attempts:
try:
self.stop()
break # OK
except ExecUtilException:
pass # one more time
except Exception:
eprint('cannot stop node {}'.format(self.name))
break

attempts += 1

# If force stopping is enabled and PID is valid
if with_force and node_pid != 0:
# If we couldn't stop the node
p_status_output = self.os_ops.exec_command(cmd=f'ps -p {node_pid}', shell=True).decode('utf-8')
if self.status() != NodeStatus.Stopped and p_status_output and str(node_pid) in p_status_output:
if node_pid > 0:
# try stopping server N times
while attempts < max_attempts:
try:
eprint(f'Force stopping node {self.name} with PID {node_pid}')
self.os_ops.kill(node_pid, signal.SIGKILL, expect_error=False)
self.stop()
break # OK
except ExecUtilException:
pass # one more time
except Exception:
# The node has already stopped
pass

# Check that node stopped - print only column pid without headers
p_status_output = self.os_ops.exec_command(f'ps -o pid= -p {node_pid}', shell=True, ignore_errors=True).decode('utf-8')
if p_status_output and str(node_pid) in p_status_output:
eprint(f'Failed to stop node {self.name}.')
else:
eprint(f'Node {self.name} has been stopped successfully.')
eprint('cannot stop node {}'.format(self.name))
break

attempts += 1

# If force stopping is enabled and PID is valid
if with_force and node_pid != 0:
# If we couldn't stop the node
p_status_output = self.os_ops.exec_command(cmd=f'ps -p {node_pid}', shell=True).decode('utf-8')
if self.status() != NodeStatus.Stopped and p_status_output and str(node_pid) in p_status_output:
try:
eprint(f'Force stopping node {self.name} with PID {node_pid}')
self.os_ops.kill(node_pid, signal.SIGKILL, expect_error=False)
except Exception:
# The node has already stopped
pass

# Check that node stopped - print only column pid without headers
p_status_output = self.os_ops.exec_command(f'ps -o pid= -p {node_pid}', shell=True, ignore_errors=True).decode('utf-8')
if p_status_output and str(node_pid) in p_status_output:
eprint(f'Failed to stop node {self.name}.')
else:
eprint(f'Node {self.name} has been stopped successfully.')

def _assign_master(self, master):
"""NOTE: this is a private method!"""
Expand Down