tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "libsnapshot: Detach the daemon explicitly before stopping the service" into main

Browse source
This commit is contained in:
Akilesh Kailash 2023-12-19 17:50:06 +00:00 committed by Gerrit Code Review
commit 3a7774d650
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
fs_mgr/libsnapshot/snapshot_test.cpp
View file

@ -2864,15 +2864,23 @@ void SnapshotTestEnvironment::TearDown() {
}
void KillSnapuserd() {
auto status = android::base::GetProperty("init.svc.snapuserd", "stopped");
if (status == "stopped") {
return;
// Detach the daemon if it's alive
auto snapuserd_client = SnapuserdClient::TryConnect(kSnapuserdSocket, 5s);
if (snapuserd_client) {
snapuserd_client->DetachSnapuserd();
}
auto snapuserd_client = SnapuserdClient::Connect(kSnapuserdSocket, 5s);
if (!snapuserd_client) {
return;
// Now stop the service - Init will send a SIGKILL to the daemon. However,
// process state will move from "running" to "stopping". Only after the
// process is reaped by init, the service state is moved to "stopped".
//
// Since the tests involve starting the daemon immediately, wait for the
// process to completely stop (aka. wait until init reaps the terminated
// process).
android::base::SetProperty("ctl.stop", "snapuserd");
if (!android::base::WaitForProperty("init.svc.snapuserd", "stopped", 10s)) {
LOG(ERROR) << "Timed out waiting for snapuserd to stop.";
}
snapuserd_client->DetachSnapuserd();
}
} // namespace snapshot