commit 15f94436b34a55db16e76f303b26f56693a71e12
author Yi-Yo Chiang <yochiang@google.com> Tue Oct 11 18:49:48 2022 +0800
committer Yi-Yo Chiang <yochiang@google.com> Wed Oct 12 20:23:19 2022 +0800
tree e37b7f3be3e0888d6a26be95f49f9031c88e7ae4
parent 9b123de8863328d94d293c4b00c51300ab9a1691

fs_mgr_overlayfs: Add scratch size override system property

Bug: 253207748
Test: Treehugger
Change-Id: I7140044d127e7db99d86decbe818be3680d26995

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index 6fbccf4..0ae56f0 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -68,6 +68,8 @@
 
 namespace {
 
+constexpr char kDataScratchSizeMbProp[] = "fs_mgr.overlayfs.data_scratch_size_mb";
+
 bool fs_mgr_access(const std::string& path) {
     return access(path.c_str(), F_OK) == 0;
 }
@@ -1070,7 +1072,10 @@
         return false;
     }
     if (!images->BackingImageExists(partition_name)) {
-        uint64_t size = GetIdealDataScratchSize();
+        auto size = android::base::GetUintProperty<uint64_t>(kDataScratchSizeMbProp, 0) * 1_MiB;
+        if (!size) {
+            size = GetIdealDataScratchSize();
+        }
         if (!size) {
             size = 2_GiB;
         }