diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-03 03:09:28 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-03 03:09:28 +0000 |
| commit | 2935d0bc528045a721d854ff29c945d5fc52950d (patch) | |
| tree | c20de75b179e5474001dadfd283e8bd6c5fbe318 | |
| parent | 80cb6c354a0894b1ddd6215e74255ab1d51adee7 (diff) | |
| parent | cfd7c0f39aeaf6ea98135b999b64196a7ba2eb47 (diff) | |
Snap for 7519874 from cfd7c0f39aeaf6ea98135b999b64196a7ba2eb47 to sc-d1-release
Change-Id: I39d4c78de3b7d74f5b06c86014db8bfaab069195
| -rw-r--r-- | aosp/cleanup_previous_update_action.cc | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/aosp/cleanup_previous_update_action.cc b/aosp/cleanup_previous_update_action.cc index dde6b89a..53cb9933 100644 --- a/aosp/cleanup_previous_update_action.cc +++ b/aosp/cleanup_previous_update_action.cc @@ -409,6 +409,14 @@ void CleanupPreviousUpdateAction::InitiateMergeAndWait() { merge_stats_->set_boot_complete_to_merge_start_time_ms( merge_start_time.count() - merge_stats_->boot_complete_time_ms()); + auto source_build_fingerprint = snapshot_->ReadSourceBuildFingerprint(); + merge_stats_->set_source_build_fingerprint(source_build_fingerprint); + + if (!merge_stats_->WriteState()) { + LOG(ERROR) << "Failed to write merge stats; record may be unreliable if " + "merge is interrupted."; + } + if (snapshot_->InitiateMerge()) { WaitForMergeOrSchedule(); return; @@ -477,6 +485,9 @@ void CleanupPreviousUpdateAction::ReportMergeStats() { // However, we have saved the flag in the snapshot report. bool vab_compression_used = report.compression_enabled(); + auto target_build_fingerprint = + android::base::GetProperty("ro.build.fingerprint", ""); + LOG(INFO) << "Reporting merge stats: " << android::snapshot::UpdateState_Name(report.state()) << " in " << passed_ms.count() << "ms (resumed " << report.resume_count() @@ -494,7 +505,9 @@ void CleanupPreviousUpdateAction::ReportMergeStats() { report.estimated_cow_size_bytes(), report.boot_complete_time_ms(), report.boot_complete_to_merge_start_time_ms(), - static_cast<int32_t>(report.merge_failure_code())); + static_cast<int32_t>(report.merge_failure_code()), + report.source_build_fingerprint().c_str(), + target_build_fingerprint.c_str()); #endif } |