commit 8fb49bc0a234453a33a2b0de49791a3136803257
author Akilesh Kailash <akailash@google.com> Mon Oct 30 09:39:38 2023 -0700
committer Akilesh Kailash <akailash@google.com> Mon Oct 30 12:14:15 2023 -0700
tree cc3e2ec25ec9ee2cf3047b78cc1196dae4040bf0
parent dfe80e48f9845f0d459f6f264e442556a5cc9981

libsnapshot: Wait for COW path

After mapping COW device, wait for the device to appear
before initializing it.

Bug: 305829996
Test: OTA on Pixel
Change-Id: If9e0e1ce684aa15bc9f3fd5a01e4f0421de87e81
Signed-off-by: Akilesh Kailash <akailash@google.com>

fs_mgr/libsnapshot/snapshot.cpp

diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp
index eb4beb7..c639e43 100644
--- a/fs_mgr/libsnapshot/snapshot.cpp
+++ b/fs_mgr/libsnapshot/snapshot.cpp
@@ -3513,6 +3513,11 @@
             return Return::Error();
         }
 
+        if (!android::fs_mgr::WaitForFile(cow_path, 6s)) {
+            LOG(ERROR) << "Timed out waiting for device to appear: " << cow_path;
+            return Return::Error();
+        }
+
         if (it->second.using_snapuserd()) {
             unique_fd fd(open(cow_path.c_str(), O_RDWR | O_CLOEXEC));
             if (fd < 0) {