commit e7f5532e0a4dcc5141bddc8177188a3e6c2e9275
author Yi-yo Chiang <yochiang@google.com> Tue Oct 18 06:56:24 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 18 06:56:24 2022 +0000
tree 717c27b532d26f1ea639f34bd9b4b3bf4edf6e50
parent 2d7765c80cc07e20f5516e691543b8509d1f1f4e
parent 15f94436b34a55db16e76f303b26f56693a71e12

Merge "fs_mgr_overlayfs: Add scratch size override system property"

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index c7f3343..63b8757 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;
 }
@@ -1084,7 +1086,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;
         }