Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

add node name from nodeskeeper to subtask #5150

Merged
merged 2 commits into from
Apr 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions golem/task/tasksession.py
Original file line number Diff line number Diff line change
Expand Up @@ -490,12 +490,15 @@ def _get_next_ctd(
self.requested_task_manager.has_pending_subtasks(task_id))
if not has_pending_subtasks:
return None

node_name = ''
node_info = nodeskeeper.get(self.key_id)
if node_info and node_info.node_name:
node_name = node_info.node_name
subtask_definition = yield deferred.deferred_from_future(
self.requested_task_manager.get_next_subtask(
task_id=task_id,
computing_node=ComputingNodeDefinition(
name='', # FIXME: Provide proper node name
name=node_name,
node_id=self.key_id
)
))
Expand Down
1 change: 1 addition & 0 deletions tests/golem/task/test_tasksession_task_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ def _share(resource, _):
shared_resources.append(return_value)
return defer.succeed(return_value)
self.resource_manager.share.side_effect = _share
tasksession.nodeskeeper.get = mock.Mock(return_value=None)

yield self.ts._offer_chosen(True, self.wtct)

Expand Down