Skip to content
This repository has been archived by the owner on May 21, 2024. It is now read-only.

Drop targets when timing out because of secondaries #1632

Merged
merged 1 commit into from
Apr 6, 2020
Merged

Drop targets when timing out because of secondaries #1632

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
2 changes: 1 addition & 1 deletion src/libaktualizr/primary/sotauptaneclient.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,7 @@ result::Install SotaUptaneClient::uptaneInstall(const std::vector<Uptane::Target
// stuck in an unrecoverable state here
if (!waitSecondariesReachable(updates)) {
result.dev_report = {false, data::ResultCode::Numeric::kInternalError, "Unreachable secondary"};
return std::make_tuple(result, "Secondaries were not available", false);
return std::make_tuple(result, "Secondaries were not available", true);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm in favor of this, but also in favor of changing all the failures to true for drop_targets.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've first tried a similar approach but it broke some assumption in test_uptane:InstallFakeBad, so I opted for a minimal change for now.

}

// Uptane step 5 (send time to all ECUs) is not implemented yet.
Expand Down