Commit98b0286

authored

Ignore error teardown (#142)

1 parent1d1d3f0 commit98b0286Copy full SHA for 98b0286

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -359,8 +359,8 @@ def _try_shutdown(self, max_attempts, with_force=False):`
`359`	`359`	`# The node has already stopped`
`360`	`360`	`pass`
`361`	`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')`
	`362`	`+# Check that node stopped - print only column pid without headers`
	`363`	`+p_status_output=self.os_ops.exec_command(f'ps -o pid= -p{node_pid}',shell=True,ignore_errors=True).decode('utf-8')`
`364`	`364`	`ifp_status_outputandstr(node_pid)inp_status_output:`
`365`	`365`	`eprint(f'Failed to stop node{self.name}.')`
`366`	`366`	`else:`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,14 +107,15 @@ def _run_command(self, cmd, shell, input, stdin, stdout, stderr, get_process, ti`
`107`	`107`	`raiseExecUtilException("Command timed out after {} seconds.".format(timeout))`
`108`	`108`
`109`	`109`	`defexec_command(self,cmd,wait_exit=False,verbose=False,expect_error=False,encoding=None,shell=False,`
`110`		`-text=False,input=None,stdin=None,stdout=None,stderr=None,get_process=False,timeout=None):`
	`110`	`+text=False,input=None,stdin=None,stdout=None,stderr=None,get_process=False,timeout=None,`
	`111`	`+ignore_errors=False):`
`111`	`112`	`"""`
`112`	`113`	`Execute a command in a subprocess and handle the output based on the provided parameters.`
`113`	`114`	`"""`
`114`	`115`	`process,output,error=self._run_command(cmd,shell,input,stdin,stdout,stderr,get_process,timeout,encoding)`
`115`	`116`	`ifget_process:`
`116`	`117`	`returnprocess`
`117`		`-if(process.returncode!=0orhas_errors(output=output,error=error))andnotexpect_error:`
	`118`	`+ifnotignore_errorsand ((process.returncode!=0orhas_errors(output=output,error=error))andnotexpect_error):`
`118`	`119`	self._raise_exec_exception('Utility exited with non-zero code. Error `{}`',cmd,process.returncode,errororoutput)
`119`	`120`
`120`	`121`	`ifverbose:`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ def __enter__(self):`
`60`	`60`
`61`	`61`	`defexec_command(self,cmd,wait_exit=False,verbose=False,expect_error=False,`
`62`	`62`	`encoding=None,shell=True,text=False,input=None,stdin=None,stdout=None,`
`63`		`-stderr=None,get_process=None,timeout=None):`
	`63`	`+stderr=None,get_process=None,timeout=None,ignore_errors=False):`
`64`	`64`	`"""`
`65`	`65`	`Execute a command in the SSH session.`
`66`	`66`	`Args:`
`@@ -98,7 +98,7 @@ def exec_command(self, cmd, wait_exit=False, verbose=False, expect_error=False,`
`98`	`98`	`markerinerrorformarkerin ['error','Permission denied','fatal','No such file or directory']`
`99`	`99`	`)`
`100`	`100`
`101`		`-iferror_found:`
	`101`	`+ifnotignore_errorsanderror_found:`
`102`	`102`	`ifisinstance(error,bytes):`
`103`	`103`	`message=b"Utility exited with non-zero code. Error: "+error`
`104`	`104`	`else:`

Comments

(0)