Merge "mkdir .incomplete in backing storage to fix CTS/GTS failures" into android11-tests-dev

This commit is contained in:
Treehugger Robot
2020-12-29 19:07:55 +00:00
committed by Gerrit Code Review

View File

@@ -476,6 +476,9 @@ StorageId IncrementalService::createStorage(std::string_view mountPoint,
if (!mkdirOrLog(path::join(backing, ".index"), 0777)) { if (!mkdirOrLog(path::join(backing, ".index"), 0777)) {
return kInvalidStorageId; return kInvalidStorageId;
} }
if (!mkdirOrLog(path::join(backing, ".incomplete"), 0777)) {
return kInvalidStorageId;
}
auto status = mVold->mountIncFs(backing, mountTarget, 0, &controlParcel); auto status = mVold->mountIncFs(backing, mountTarget, 0, &controlParcel);
if (!status.isOk()) { if (!status.isOk()) {
LOG(ERROR) << "Vold::mountIncFs() failed: " << status.toString8(); LOG(ERROR) << "Vold::mountIncFs() failed: " << status.toString8();