Commit5c903cb

authored

Merge pull request#74 from postgrespro/PBCKP-136-catch-FileNotFoundError-exception

Catch FileNotFoundError exception

2 parentsceb1ee9 +0e8b1c8 commit5c903cbCopy full SHA for 5c903cb

File tree

+23

-4

lines changed

+23

-4

lines changed

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`fromenumimportEnum,IntEnum`
`2`	`2`	`fromsiximportiteritems`
	`3`	`+frompsutilimportNoSuchProcess`
`3`	`4`
`4`	`5`
`5`	`6`	`classXLogMethod(Enum):`
`@@ -68,11 +69,15 @@ def from_process(process):`
`68`	`69`	`],`
`69`	`70`	`}# yapf: disable`
`70`	`71`
	`72`	`+try:`
	`73`	`+cmdline=''.join(process.cmdline())`
	`74`	`+except (FileNotFoundError,ProcessLookupError,NoSuchProcess):`
	`75`	`+returnProcessType.Unknown`
	`76`	`+`
`71`	`77`	`# we deliberately cut special words and spaces`
`72`		`-cmdline=''.join(process.cmdline()) \`
`73`		`- .replace('postgres:','',1) \`
`74`		`- .replace('bgworker:','',1) \`
`75`		`- .replace(' ','')`
	`78`	`+cmdline=cmdline.replace('postgres:','',1) \`
	`79`	`+ .replace('bgworker:','',1) \`
	`80`	`+ .replace(' ','')`
`76`	`81`
`77`	`82`	`forptypeinProcessType:`
`78`	`83`	`ifcmdline.startswith(ptype.value.replace(' ','')):`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`importtime`
`10`	`10`	`importsix`
`11`	`11`	`importunittest`
	`12`	`+importpsutil`
`12`	`13`
`13`	`14`	`importlogging.config`
`14`	`15`
`@@ -48,6 +49,7 @@`
`48`	`49`	`# NOTE: those are ugly imports`
`49`	`50`	`fromtestgresimportbound_ports`
`50`	`51`	`fromtestgres.utilsimportPgVer`
	`52`	`+fromtestgres.nodeimportProcessProxy`
`51`	`53`
`52`	`54`
`53`	`55`	`defpg_version_ge(version):`
`@@ -965,6 +967,18 @@ def test_child_pids(self):`
`965`	`967`	`withself.assertRaises(TestgresException):`
`966`	`968`	`replica.source_walsender`
`967`	`969`
	`970`	`+deftest_child_process_dies(self):`
	`971`	`+# test for FileNotFound exception during child_processes() function`
	`972`	`+withsubprocess.Popen(["sleep","60"])asprocess:`
	`973`	`+self.assertEqual(process.poll(),None)`
	`974`	`+# collect list of processes currently running`
	`975`	`+children=psutil.Process(os.getpid()).children()`
	`976`	`+# kill a process, so received children dictionary becomes invalid`
	`977`	`+process.kill()`
	`978`	`+process.wait()`
	`979`	`+# try to handle children list -- missing processes will have ptype "ProcessType.Unknown"`
	`980`	`+ [ProcessProxy(p)forpinchildren]`
	`981`	`+`
`968`	`982`
`969`	`983`	`if__name__=='__main__':`
`970`	`984`	`ifos.environ.get('ALT_CONFIG'):`

Comments

(0)