Skip to content
This repository was archived by the owner on Nov 13, 2025. It is now read-only.

Restart workers patch with fixes #243

Merged
Adityya-K merged 10 commits into from
Jan 22, 2025
Merged

Restart workers patch with fixes #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
00c6bc2
restart worker patch with fixed commit history
Adityya-K Jan 16, 2025
d9f44a8
fixed black error for CI/CD
Adityya-K Jan 18, 2025
a30cfd1
fixed pylint error for CI/CD
Adityya-K Jan 18, 2025
fc92af0
fixed pylint error for CI/CD
Adityya-K Jan 18, 2025
13bea17
added submodules
Adityya-K Jan 19, 2025
7aa0554
added data checking to communication worker
Adityya-K Jan 21, 2025
900661d
fixed code that was commented on during review
Adityya-K Jan 22, 2025
fb4a67f
fixed logging messages and deleted deprecated code
Adityya-K Jan 22, 2025
543219d
Merge branch 'main' into restart_workers_patch_new
Adityya-K Jan 22, 2025
d29b002
formatted code with black
Adityya-K Jan 22, 2025
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
4 changes: 3 additions & 1 deletion modules/cluster_estimation/cluster_estimation_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ def cluster_estimation_worker(

for single_input in input_data:
if not isinstance(single_input, detection_in_world.DetectionInWorld):
local_logger.warning(f"Skipping unexpected input: {input}")
local_logger.warning(
f"Skipping unexpected input: {input_data}, because of unexpected value: {single_input}"
)
is_invalid = True
break

Expand Down
4 changes: 3 additions & 1 deletion modules/communications/communications_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ def communications_worker(

for single_input in input_data:
if not isinstance(single_input, object_in_world.ObjectInWorld):
local_logger.warning(f"Skipping unexpected input: {input}")
local_logger.warning(
f"Skipping unexpected input: {input_data}, because of unexpected value: {single_input}"
)
is_invalid = True
break

Expand Down
2 changes: 1 addition & 1 deletion modules/detect_target/detect_target_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def detect_target_worker(
break

if not isinstance(input_data, image_and_time.ImageAndTime):
local_logger.warning(f"Skipping unexpected input: {input}")
local_logger.warning(f"Skipping unexpected input: {input_data}")
continue

result, value = detector.run(input_data)
Expand Down
2 changes: 1 addition & 1 deletion modules/geolocation/geolocation_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def geolocation_worker(
break

if not isinstance(input_data, merged_odometry_detections.MergedOdometryDetections):
local_logger.warning(f"Skipping unexpected input: {input}")
local_logger.warning(f"Skipping unexpected input: {input_data}")
continue

result, value = locator.run(input_data)
Expand Down
7 changes: 0 additions & 7 deletions utilities/workers/worker_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,4 @@ def check_and_restart_dead_workers(self) -> bool:

self.__workers = new_workers

# Draining the preceding queue ensures that the preceding queue data wasn't what
# caused the worker to fail. Draining the succeeding queues is not needed
# because a worker that died would not have put bad data into the queue.
# input_queues = self.__worker_properties.get_input_queues()
# for queue in input_queues:
# queue.drain_queue()

return True
Loading