commit 160e4c3cee7f9883a9aeafdbc9f08f4afce3b8b6
author Akilesh Kailash <akailash@google.com> Mon Dec 04 23:53:41 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 04 23:53:41 2023 +0000
tree 2d44fa16c0e96da9b7c285bee545409da8b8abb3
parent f7fffb62d4b09b3270657dca8b48a262334fea3d
parent 52f1c19a1754cf9b83395d42de1c37ebc2eadd14

Merge changes from topic "ota-tune-1" into main

* changes:
  Allow direct reads on source device
  libsnapshot: Tune readahead during OTA for source and COW block device

fs_mgr/libsnapshot/include/libsnapshot/cow_format.h

diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h
index 1a7ec61..717ad2d 100644
--- a/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h
+++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h
@@ -34,7 +34,7 @@
 static constexpr uint32_t kCowVersionManifest = 2;
 
 static constexpr uint32_t kMinCowVersion = 1;
-static constexpr uint32_t kMaxCowVersion = 2;
+static constexpr uint32_t kMaxCowVersion = 3;
 
 // Normally, this should be kMaxCowVersion. When a new version is under testing
 // it may be the previous value of kMaxCowVersion.

fs_mgr/libsnapshot/snapshot.cpp

diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp
index 81f396a..f6a35a8 100644
--- a/fs_mgr/libsnapshot/snapshot.cpp
+++ b/fs_mgr/libsnapshot/snapshot.cpp
@@ -3662,6 +3662,9 @@
     cow_options.max_blocks = {status.device_size() / cow_options.block_size};
     cow_options.batch_write = status.batched_writes();
     cow_options.num_compress_threads = status.enable_threading() ? 2 : 0;
+    // TODO(b/313962438) Improve op_count estimate. For now, use number of
+    // blocks as an upper bound.
+    cow_options.op_count_max = status.device_size() / cow_options.block_size;
     // Disable scratch space for vts tests
     if (device()->IsTestDevice()) {
         cow_options.scratch_space = false;