Merge "libsnapshot: Record COW size(s) in snapshot status file"
diff --git a/fs_mgr/libsnapshot/include/libsnapshot/snapshot.h b/fs_mgr/libsnapshot/include/libsnapshot/snapshot.h
index e3fc4f6..1f3828e 100644
--- a/fs_mgr/libsnapshot/include/libsnapshot/snapshot.h
+++ b/fs_mgr/libsnapshot/include/libsnapshot/snapshot.h
@@ -278,6 +278,9 @@
SnapshotState state;
uint64_t device_size;
uint64_t snapshot_size;
+ uint64_t cow_partition_size;
+ uint64_t cow_file_size;
+
// These are non-zero when merging.
uint64_t sectors_allocated = 0;
uint64_t metadata_sectors = 0;
diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp
index 588941a..7f37dc5 100644
--- a/fs_mgr/libsnapshot/snapshot.cpp
+++ b/fs_mgr/libsnapshot/snapshot.cpp
@@ -203,6 +203,7 @@
.state = SnapshotState::Created,
.device_size = device_size,
.snapshot_size = snapshot_size,
+ .cow_file_size = cow_size,
};
if (!WriteSnapshotStatus(lock, name, status)) {
PLOG(ERROR) << "Could not write snapshot status: " << name;
@@ -1314,7 +1315,7 @@
return false;
}
auto pieces = android::base::Split(contents, " ");
- if (pieces.size() != 5) {
+ if (pieces.size() != 7) {
LOG(ERROR) << "Invalid status line for snapshot: " << path;
return false;
}
@@ -1337,11 +1338,19 @@
LOG(ERROR) << "Invalid snapshot size in status line for: " << path;
return false;
}
- if (!android::base::ParseUint(pieces[3], &status->sectors_allocated)) {
+ if (!android::base::ParseUint(pieces[3], &status->cow_partition_size)) {
+ LOG(ERROR) << "Invalid cow linear size in status line for: " << path;
+ return false;
+ }
+ if (!android::base::ParseUint(pieces[4], &status->cow_file_size)) {
+ LOG(ERROR) << "Invalid cow file size in status line for: " << path;
+ return false;
+ }
+ if (!android::base::ParseUint(pieces[5], &status->sectors_allocated)) {
LOG(ERROR) << "Invalid snapshot size in status line for: " << path;
return false;
}
- if (!android::base::ParseUint(pieces[4], &status->metadata_sectors)) {
+ if (!android::base::ParseUint(pieces[6], &status->metadata_sectors)) {
LOG(ERROR) << "Invalid snapshot size in status line for: " << path;
return false;
}
@@ -1379,6 +1388,8 @@
to_string(status.state),
std::to_string(status.device_size),
std::to_string(status.snapshot_size),
+ std::to_string(status.cow_partition_size),
+ std::to_string(status.cow_file_size),
std::to_string(status.sectors_allocated),
std::to_string(status.metadata_sectors),
};