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

Conversation

lbonn
Copy link
Contributor

@lbonn lbonn commented Apr 6, 2020

No description provided.

Otherwise, the device gets into an annoying state in the UI when the
secondary reconnects later.

Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
@@ -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.

@lbonn lbonn merged commit 6cea7df into master Apr 6, 2020
@lbonn lbonn deleted the fix/drop-more-targets branch April 6, 2020 15:55
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants