Skip to content

#32- Fix thread pool drain if non-terminal error occurs #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 3, 2025
Merged

#32- Fix thread pool drain if non-terminal error occurs #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog], [markdownlint],
and this project adheres to [Semantic Versioning].

## [1.1.2] - 2025-06-03

### Fixed in 1.1.2

- Fix potential for futures thread pool to drain on non-terminal errors

## [1.1.1] - 2024-05-24

### Changed in 1.1.1
Expand Down
24 changes: 8 additions & 16 deletions Python/Tasks/Deleting/DeleteFutures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import os
import sys
import time

from senzing import (
G2BadInputException,
G2Engine,
Expand Down Expand Up @@ -63,9 +64,7 @@ def futures_del(engine, input_file):
}

while futures:
done, _ = concurrent.futures.wait(
futures, return_when=concurrent.futures.FIRST_COMPLETED
)
done, _ = concurrent.futures.wait(futures, return_when=concurrent.futures.FIRST_COMPLETED)
for f in done:
try:
f.result()
Expand All @@ -79,27 +78,20 @@ def futures_del(engine, input_file):
mock_logger("CRITICAL", err, futures[f])
raise
else:
record = in_file.readline()
if record:
futures[executor.submit(del_record, engine, record)] = (
record
)

success_recs += 1
if success_recs % 1000 == 0:
prev_time = record_stats(
success_recs, error_recs, prev_time
)
prev_time = record_stats(success_recs, error_recs, prev_time)

if success_recs % 10000 == 0:
engine_stats(engine)
finally:
record = in_file.readline()
if record:
futures[executor.submit(del_record, engine, record)] = record

del futures[f]

print(
f"Successfully deleted {success_recs:,} records, with"
f" {error_recs:,} errors"
)
print(f"Successfully deleted {success_recs:,} records, with" f" {error_recs:,} errors")


try:
Expand Down
24 changes: 8 additions & 16 deletions Python/Tasks/Deleting/DeleteWithInfoFutures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import os
import sys
import time

from senzing import (
G2BadInputException,
G2Engine,
Expand Down Expand Up @@ -66,9 +67,7 @@ def futures_del(engine, input_file, output_file):
}

while futures:
done, _ = concurrent.futures.wait(
futures, return_when=concurrent.futures.FIRST_COMPLETED
)
done, _ = concurrent.futures.wait(futures, return_when=concurrent.futures.FIRST_COMPLETED)
for f in done:
try:
result = f.result()
Expand All @@ -82,29 +81,22 @@ def futures_del(engine, input_file, output_file):
mock_logger("CRITICAL", err, futures[f])
raise
else:
record = in_file.readline()
if record:
futures[executor.submit(del_record, engine, record)] = (
record
)

out_file.write(f"{result}\n")

success_recs += 1
if success_recs % 1000 == 0:
prev_time = record_stats(
success_recs, error_recs, prev_time
)
prev_time = record_stats(success_recs, error_recs, prev_time)

if success_recs % 10000 == 0:
engine_stats(engine)
finally:
record = in_file.readline()
if record:
futures[executor.submit(del_record, engine, record)] = record

del futures[f]

print(
f"Successfully deleted {success_recs:,} records, with"
f" {error_recs:,} errors"
)
print(f"Successfully deleted {success_recs:,} records, with" f" {error_recs:,} errors")
print(f"With info responses written to {output_file}")


Expand Down
23 changes: 7 additions & 16 deletions Python/Tasks/Loading/Add100KFutures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ def futures_add(engine, input_file):
}

while futures:
done, _ = concurrent.futures.wait(
futures, return_when=concurrent.futures.FIRST_COMPLETED
)
done, _ = concurrent.futures.wait(futures, return_when=concurrent.futures.FIRST_COMPLETED)
for f in done:
try:
f.result()
Expand All @@ -80,27 +78,20 @@ def futures_add(engine, input_file):
mock_logger("CRITICAL", err, futures[f])
raise
else:
record = file.readline()
if record:
futures[executor.submit(add_record, engine, record)] = (
record
)

success_recs += 1
if success_recs % 1000 == 0:
prev_time = record_stats(
success_recs, error_recs, prev_time
)
prev_time = record_stats(success_recs, error_recs, prev_time)

if success_recs % 10000 == 0:
engine_stats(engine)
finally:
record = file.readline()
if record:
futures[executor.submit(add_record, engine, record)] = record

del futures[f]

print(
f"Successfully loaded {success_recs:,} records, with"
f" {error_recs:,} errors"
)
print(f"Successfully loaded {success_recs:,} records, with" f" {error_recs:,} errors")


try:
Expand Down
23 changes: 7 additions & 16 deletions Python/Tasks/Loading/Add10KFutures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ def futures_add(engine, input_file):
}

while futures:
done, _ = concurrent.futures.wait(
futures, return_when=concurrent.futures.FIRST_COMPLETED
)
done, _ = concurrent.futures.wait(futures, return_when=concurrent.futures.FIRST_COMPLETED)
for f in done:
try:
f.result()
Expand All @@ -80,27 +78,20 @@ def futures_add(engine, input_file):
mock_logger("CRITICAL", err, futures[f])
raise
else:
record = file.readline()
if record:
futures[executor.submit(add_record, engine, record)] = (
record
)

success_recs += 1
if success_recs % 1000 == 0:
prev_time = record_stats(
success_recs, error_recs, prev_time
)
prev_time = record_stats(success_recs, error_recs, prev_time)

if success_recs % 10000 == 0:
engine_stats(engine)
finally:
record = file.readline()
if record:
futures[executor.submit(add_record, engine, record)] = record

del futures[f]

print(
f"Successfully loaded {success_recs:,} records, with"
f" {error_recs:,} errors"
)
print(f"Successfully loaded {success_recs:,} records, with" f" {error_recs:,} errors")


try:
Expand Down
24 changes: 8 additions & 16 deletions Python/Tasks/Loading/Add50KFutures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import os
import sys
import time

from senzing import (
G2BadInputException,
G2Engine,
Expand Down Expand Up @@ -63,9 +64,7 @@ def futures_add(engine, input_file):
}

while futures:
done, _ = concurrent.futures.wait(
futures, return_when=concurrent.futures.FIRST_COMPLETED
)
done, _ = concurrent.futures.wait(futures, return_when=concurrent.futures.FIRST_COMPLETED)
for f in done:
try:
f.result()
Expand All @@ -79,27 +78,20 @@ def futures_add(engine, input_file):
mock_logger("CRITICAL", err, futures[f])
raise
else:
record = file.readline()
if record:
futures[executor.submit(add_record, engine, record)] = (
record
)

success_recs += 1
if success_recs % 1000 == 0:
prev_time = record_stats(
success_recs, error_recs, prev_time
)
prev_time = record_stats(success_recs, error_recs, prev_time)

if success_recs % 10000 == 0:
engine_stats(engine)
finally:
record = file.readline()
if record:
futures[executor.submit(add_record, engine, record)] = record

del futures[f]

print(
f"Successfully loaded {success_recs:,} records, with"
f" {error_recs:,} errors"
)
print(f"Successfully loaded {success_recs:,} records, with" f" {error_recs:,} errors")


try:
Expand Down
24 changes: 8 additions & 16 deletions Python/Tasks/Loading/Add50KWithInfoFutures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import os
import sys
import time

from senzing import (
G2BadInputException,
G2Engine,
Expand Down Expand Up @@ -66,9 +67,7 @@ def futures_add(engine, input_file, output_file):
}

while futures:
done, _ = concurrent.futures.wait(
futures, return_when=concurrent.futures.FIRST_COMPLETED
)
done, _ = concurrent.futures.wait(futures, return_when=concurrent.futures.FIRST_COMPLETED)
for f in done:
try:
result = f.result()
Expand All @@ -82,29 +81,22 @@ def futures_add(engine, input_file, output_file):
mock_logger("CRITICAL", err, futures[f])
raise
else:
record = in_file.readline()
if record:
futures[executor.submit(add_record, engine, record)] = (
record
)

out_file.write(f"{result}\n")

success_recs += 1
if success_recs % 1000 == 0:
prev_time = record_stats(
success_recs, error_recs, prev_time
)
prev_time = record_stats(success_recs, error_recs, prev_time)

if success_recs % 10000 == 0:
engine_stats(engine)
finally:
record = in_file.readline()
if record:
futures[executor.submit(add_record, engine, record)] = record

del futures[f]

print(
f"Successfully loaded {success_recs:,} records, with"
f" {error_recs:,} errors"
)
print(f"Successfully loaded {success_recs:,} records, with" f" {error_recs:,} errors")
print(f"With info responses written to {output_file}")


Expand Down
33 changes: 11 additions & 22 deletions Python/Tasks/Redo/RedoContinuousFutures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import os
import sys
import time

from senzing import (
G2BadInputException,
G2Engine,
Expand Down Expand Up @@ -71,10 +72,7 @@ def redo_count(engine):


def redo_pause(success):
print(
"No redo records to process, pausing for 30 seconds. Total processed:"
f" {success:,} (CTRL-C to exit)..."
)
print("No redo records to process, pausing for 30 seconds. Total processed:" f" {success:,} (CTRL-C to exit)...")
time.sleep(30)


Expand All @@ -94,9 +92,7 @@ def futures_redo(engine):
break

while True:
done, _ = concurrent.futures.wait(
futures, return_when=concurrent.futures.FIRST_COMPLETED
)
done, _ = concurrent.futures.wait(futures, return_when=concurrent.futures.FIRST_COMPLETED)
for f in done:
try:
_ = f.result()
Expand All @@ -110,24 +106,19 @@ def futures_redo(engine):
mock_logger("CRITICAL", err, futures[f])
raise
else:
record = get_redo_record(engine)
if record:
futures[
executor.submit(process_redo_record, engine, record)
] = record
else:
redo_paused = True

success_recs += 1
if success_recs % 100 == 0:
print(
f"Processed {success_recs:,} redo records, with"
f" {error_recs:,} errors"
)
print(f"Processed {success_recs:,} redo records, with" f" {error_recs:,} errors")

if success_recs % 1000 == 0:
engine_stats(engine)
finally:
record = get_redo_record(engine)
if record:
futures[executor.submit(process_redo_record, engine, record)] = record
else:
redo_paused = True

del futures[f]

if redo_paused:
Expand All @@ -137,9 +128,7 @@ def futures_redo(engine):
while len(futures) < executor._max_workers:
record = get_redo_record(engine)
if record:
futures[
executor.submit(process_redo_record, engine, record)
] = record
futures[executor.submit(process_redo_record, engine, record)] = record


try:
Expand Down
Loading