Merge lp://qastaging/~xavi-garcia-mena/keeper/helper-finished-state-removed-and-restore-choices-commented into lp://qastaging/keeper/devel
| Status: | Merged |
|---|---|
| Approved by: | Xavi Garcia |
| Approved revision: | 104 |
| Merge reported by: | Xavi Garcia |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~xavi-garcia-mena/keeper/helper-finished-state-removed-and-restore-choices-commented |
| Merge into: | lp://qastaging/keeper/devel |
| Diff against target: |
303 lines (+80/-31) 8 files modified
include/helper/backup-helper.h (+2/-0) include/helper/helper.h (+4/-1) src/helper/backup-helper.cpp (+20/-10) src/helper/helper.cpp (+42/-4) src/service/keeper-task.cpp (+0/-4) src/service/restore-choices.cpp (+6/-1) src/service/task-manager.cpp (+1/-1) tests/integration/helpers/helpers-test.cc (+5/-10) |
| To merge this branch: | bzr merge lp://qastaging/~xavi-garcia-mena/keeper/helper-finished-state-removed-and-restore-choices-commented |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Xavi Garcia (community) | Approve | ||
| Charles Kerr (community) | Needs Information | ||
| unity-api-1-bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
This branch removes the HELPER_FINISHED state and comments out some restore-choices code as it blocks keeper-service.
Description of the change
This branch removes the HELPER_FINISHED state and comments out some restore-choices code as it blocks keeper-service.
I've removed the HELPER_FINISHED state as it was really not a helper state. It was just an event that moved the helper to several states, but in fact the helper was never in the HELPER_FINISHED state.
That was a problem because we were moving to a new state inside the set_state code, which for the final states as FAILED or COMPLETE is an issue as we move to another task and remove the current one.
What I did is to add new virtual methods in the Helper class so when the helper starts or finishes we can do whatever we need to do in the backup helper.
| Xavi Garcia (xavi-garcia-mena) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| Xavi Garcia (xavi-garcia-mena) wrote | # |
I've added a couple of inline comments.