Commita61f794

vshepard

committed

Fix node cleanup - rmdirs

1 parenta07f106 commita61f794Copy full SHA for a61f794

File tree

+21

-3

lines changed

+21

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -932,7 +932,7 @@ def cleanup(self, max_attempts=3):`
`932`	`932`	`else:`
`933`	`933`	`rm_dir=self.data_dir# just data, save logs`
`934`	`934`
`935`		`-self.os_ops.rmdirs(rm_dir,ignore_errors=True)`
	`935`	`+self.os_ops.rmdirs(rm_dir,ignore_errors=False)`
`936`	`936`
`937`	`937`	`returnself`
`938`	`938`

Lines changed: 20 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`importstat`
`5`	`5`	`importsubprocess`
`6`	`6`	`importtempfile`
	`7`	`+importtime`
`7`	`8`
`8`	`9`	`importpsutil`
`9`	`10`
`@@ -147,8 +148,25 @@ def makedirs(self, path, remove_existing=False):`
`147`	`148`	`exceptFileExistsError:`
`148`	`149`	`pass`
`149`	`150`
`150`		`-defrmdirs(self,path,ignore_errors=True):`
`151`		`-returnrmtree(path,ignore_errors=ignore_errors)`
	`151`	`+defrmdirs(self,path,ignore_errors=True,retries=3,delay=1):`
	`152`	`+"""`
	`153`	`+ Removes a directory and its contents, retrying on failure.`
	`154`	`+`
	`155`	`+ :param path: Path to the directory.`
	`156`	`+ :param ignore_errors: If True, ignore errors.`
	`157`	`+ :param retries: Number of attempts to remove the directory.`
	`158`	`+ :param delay: Delay between attempts in seconds.`
	`159`	`+ """`
	`160`	`+forattemptinrange(retries):`
	`161`	`+try:`
	`162`	`+rmtree(path,ignore_errors=ignore_errors)`
	`163`	`+ifnotos.path.exists(path):`
	`164`	`+returnTrue`
	`165`	`+exceptExceptionase:`
	`166`	`+print(f"Error: Failed to remove directory{path} on attempt{attempt+1}:{e}")`
	`167`	`+time.sleep(delay)`
	`168`	`+print(f"Error: Failed to remove directory{path} after{retries} attempts.")`
	`169`	`+returnFalse`
`152`	`170`
`153`	`171`	`deflistdir(self,path):`
`154`	`172`	`returnos.listdir(path)`

Comments

(0)