| commit | c2bb3ee6d67ebe4853845004cc0fa8b2dec38bba | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Fri Jul 16 20:02:11 2021 -0700 |
| committer | David Anderson <dvander@google.com> | Fri Jul 16 20:05:39 2021 -0700 |
| tree | f5c00fddb80d686d56150f33c8fe8dd22d7b9a98 | |
| parent | 8b6dac42c93c8de2ae151a5a48cead7a4ed089b8 [diff] |
libsnapshot: Propagate merge phase across merge failures. If a merge fails we write a new snapshot status indicating that the merge failed. If this happens to occur during the second merge phase, we fail to propagate the phase counter to the new status. This means the merge is unlikely to make progress and succeed later. Bug: 193549218 Test: manual test Change-Id: I31fdae6bde48e3a71b6f3fcc663541257f7ebd8f