|
6 | 6 | import s3fs |
7 | 7 | import tenacity |
8 | 8 |
|
9 | | -from awswrangler.utils import calculate_bounders |
| 9 | +from awswrangler.utils import calculate_bounders, wait_process_release |
10 | 10 |
|
11 | 11 | logger = logging.getLogger(__name__) |
12 | 12 |
|
@@ -92,13 +92,8 @@ def delete_objects(self, path): |
92 | 92 | proc.daemon = False |
93 | 93 | proc.start() |
94 | 94 | procs.append(proc) |
95 | | - while len(procs) >= self._session.procs_io_bound: |
96 | | - logger.debug( |
97 | | - f"len(procs) ({len(procs)}) >= self._session.procs_io_bound ({self._session.procs_io_bound})" |
98 | | - ) |
99 | | - procs[0].join() |
100 | | - del procs[0] |
101 | | - logger.debug(f"Processes deleted from list.") |
| 95 | + if len(procs) == self._session.procs_io_bound: |
| 96 | + wait_process_release(procs) |
102 | 97 | else: |
103 | 98 | logger.debug(f"Starting last delete call...") |
104 | 99 | self.delete_objects_batch(self._session.primitives, bucket, |
@@ -166,13 +161,8 @@ def delete_not_listed_objects(self, objects_paths, procs_io_bound=None): |
166 | 161 | proc.daemon = False |
167 | 162 | proc.start() |
168 | 163 | procs.append(proc) |
169 | | - while len(procs) >= procs_io_bound: |
170 | | - logger.debug( |
171 | | - f"len(procs) ({len(procs)}) >= procs_io_bound ({procs_io_bound})" |
172 | | - ) |
173 | | - procs[0].join() |
174 | | - del procs[0] |
175 | | - logger.debug(f"Processes deleted from list.") |
| 164 | + if len(procs) == self._session.procs_io_bound: |
| 165 | + wait_process_release(procs) |
176 | 166 | logger.debug(f"Waiting final processes...") |
177 | 167 | for proc in procs: |
178 | 168 | proc.join() |
@@ -280,8 +270,8 @@ def get_objects_sizes(self, objects_paths, procs_io_bound=None): |
280 | 270 | logger.debug(f"len(procs): {len(bounders)}") |
281 | 271 | for i in range(len(procs)): |
282 | 272 | logger.debug(f"Waiting pipe number: {i}") |
283 | | - receved = receive_pipes[i].recv() |
284 | | - objects_sizes.update(receved) |
| 273 | + received = receive_pipes[i].recv() |
| 274 | + objects_sizes.update(received) |
285 | 275 | logger.debug(f"Waiting proc number: {i}") |
286 | 276 | procs[i].join() |
287 | 277 | logger.debug(f"Closing proc number: {i}") |
|
0 commit comments