NotificationsYou must be signed in to change notification settings
Fork36
Star152

Commit35953af

vshepard

committed

Add force node stopping using SIGKILL in case of unsuccessful pg_ctl stop

1 parent5c7cf18 commit35953afCopy full SHA for 35953af

File tree

2 files changed

+30

-5

lines changed

testgres
- node.py
- operations
  - local_ops.py

2 files changed

+30

-5

lines changed

`‎testgres/node.py‎`

Lines changed: 28 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -330,23 +330,43 @@ def version(self):`
`330`	`330`	`"""`
`331`	`331`	`returnself._pg_version`
`332`	`332`
`333`		`-def_try_shutdown(self,max_attempts):`
	`333`	`+def_try_shutdown(self,max_attempts,with_force=False):`
`334`	`334`	`attempts=0`
	`335`	`+node_pid=self.pid`
`335`	`336`
`336`	`337`	`# try stopping server N times`
`337`	`338`	`whileattempts<max_attempts:`
`338`	`339`	`try:`
`339`		`-self.stop()`
	`340`	`+self.stop(wait=False)`
`340`	`341`	`break# OK`
`341`	`342`	`exceptExecUtilException:`
`342`	`343`	`pass# one more time`
`343`	`344`	`exceptException:`
`344`		`-# TODO: probably should kill stray instance`
`345`	`345`	`eprint('cannot stop node {}'.format(self.name))`
`346`	`346`	`break`
`347`	`347`
`348`	`348`	`attempts+=1`
`349`	`349`
	`350`	`+# If force stopping is enabled and PID is valid`
	`351`	`+ifwith_forceandnode_pid!=0:`
	`352`	`+# If we couldn't stop the node`
	`353`	`+p_status_output=self.os_ops.exec_command(cmd=f'ps -p{node_pid}',shell=True).decode('utf-8')`
	`354`	`+ifself.status()!=NodeStatus.Stoppedandp_status_outputandstr(node_pid)inp_status_output:`
	`355`	`+try:`
	`356`	`+eprint(f'Force stopping node{self.name} with PID{node_pid}')`
	`357`	`+self.os_ops.kill(node_pid,signal.SIGKILL,expect_error=False)`
	`358`	`+exceptException:`
	`359`	`+# The node has already stopped`
	`360`	`+pass`
	`361`	`+`
	`362`	`+# Check that node stopped`
	`363`	`+p_status_output=self.os_ops.exec_command(f'ps -p{node_pid}',shell=True,expect_error=True).decode('utf-8')`
	`364`	`+ifp_status_outputandstr(node_pid)inp_status_output:`
	`365`	`+eprint(f'Failed to stop node{self.name}.')`
	`366`	`+else:`
	`367`	`+eprint(f'Node{self.name} has been stopped successfully.')`
	`368`	`+`
	`369`	`+`
`350`	`370`	`def_assign_master(self,master):`
`351`	`371`	`"""NOTE: this is a private method!"""`
`352`	`372`
`@@ -935,6 +955,11 @@ def cleanup(self, max_attempts=3, full=False):`
`935`	`955`	`rm_dir=self.data_dir# just data, save logs`
`936`	`956`
`937`	`957`	`self.os_ops.rmdirs(rm_dir,ignore_errors=False)`
	`958`	`+is_not_removed=self.os_ops.isdir(rm_dir)`
	`959`	`+whileis_not_removed:`
	`960`	`+time.sleep(1)`
	`961`	`+self.os_ops.rmdirs(rm_dir,ignore_errors=False)`
	`962`	`+is_not_removed=self.os_ops.isdir(rm_dir)`
`938`	`963`
`939`	`964`	`returnself`
`940`	`965`

`‎testgres/operations/local_ops.py‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -293,10 +293,10 @@ def remove_file(self, filename):`
`293`	`293`	`returnos.remove(filename)`
`294`	`294`
`295`	`295`	`# Processes control`
`296`		`-defkill(self,pid,signal):`
	`296`	`+defkill(self,pid,signal,expect_error=False):`
`297`	`297`	`# Kill the process`
`298`	`298`	`cmd="kill -{} {}".format(signal,pid)`
`299`		`-returnself.exec_command(cmd)`
	`299`	`+returnself.exec_command(cmd,expect_error=expect_error)`
`300`	`300`
`301`	`301`	`defget_pid(self):`
`302`	`302`	`# Get current process id`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit35953af

File tree

2 files changed

2 files changed

`‎testgres/node.py‎`

`‎testgres/operations/local_ops.py‎`

0 commit comments