Per package read timeouts.
Bug: 162345970
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest
Change-Id: I2599db1ed8827fff16387c11254a5d607f27ea46
diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp
index eb6b325..45c9ad9 100644
--- a/services/incremental/IncrementalService.cpp
+++ b/services/incremental/IncrementalService.cpp
@@ -63,6 +63,10 @@
static constexpr auto libSuffix = ".so"sv;
static constexpr auto blockSize = 4096;
static constexpr auto systemPackage = "android"sv;
+
+ static constexpr auto progressUpdateInterval = 1000ms;
+ static constexpr auto perUidTimeoutOffset = progressUpdateInterval * 2;
+ static constexpr auto minPerUidTimeout = progressUpdateInterval * 3;
};
static const Constants& constants() {
@@ -350,7 +354,8 @@
dprintf(fd, " storages (%d): {\n", int(mnt.storages.size()));
for (auto&& [storageId, storage] : mnt.storages) {
dprintf(fd, " [%d] -> [%s] (%d %% loaded) \n", storageId, storage.name.c_str(),
- (int)(getLoadingProgressFromPath(mnt, storage.name.c_str()) * 100));
+ (int)(getLoadingProgressFromPath(mnt, storage.name.c_str()).getProgress() *
+ 100));
}
dprintf(fd, " }\n");
@@ -419,12 +424,11 @@
}
}
-StorageId IncrementalService::createStorage(std::string_view mountPoint,
- content::pm::DataLoaderParamsParcel&& dataLoaderParams,
- CreateOptions options,
- const DataLoaderStatusListener& statusListener,
- StorageHealthCheckParams&& healthCheckParams,
- const StorageHealthListener& healthListener) {
+StorageId IncrementalService::createStorage(
+ std::string_view mountPoint, content::pm::DataLoaderParamsParcel&& dataLoaderParams,
+ CreateOptions options, const DataLoaderStatusListener& statusListener,
+ StorageHealthCheckParams&& healthCheckParams, const StorageHealthListener& healthListener,
+ const std::vector<PerUidReadTimeouts>& perUidReadTimeouts) {
LOG(INFO) << "createStorage: " << mountPoint << " | " << int(options);
if (!path::isAbsolute(mountPoint)) {
LOG(ERROR) << "path is not absolute: " << mountPoint;
@@ -553,13 +557,14 @@
if (auto err = addBindMount(*ifs, storageIt->first, storageIt->second.name,
std::string(storageIt->second.name), std::move(mountNorm), bk, l);
err < 0) {
- LOG(ERROR) << "adding bind mount failed: " << -err;
+ LOG(ERROR) << "Adding bind mount failed: " << -err;
return kInvalidStorageId;
}
// Done here as well, all data structures are in good state.
secondCleanupOnFailure.release();
+ // DataLoader.
auto dataLoaderStub = prepareDataLoader(*ifs, std::move(dataLoaderParams), &statusListener,
std::move(healthCheckParams), &healthListener);
CHECK(dataLoaderStub);
@@ -567,6 +572,11 @@
mountIt->second = std::move(ifs);
l.unlock();
+ // Per Uid timeouts.
+ if (!perUidReadTimeouts.empty()) {
+ setUidReadTimeouts(mountId, perUidReadTimeouts);
+ }
+
if (mSystemReady.load(std::memory_order_relaxed) && !dataLoaderStub->requestCreate()) {
// failed to create data loader
LOG(ERROR) << "initializeDataLoader() failed";
@@ -634,17 +644,17 @@
return it->second->second.storage;
}
-void IncrementalService::disableReadLogs(StorageId storageId) {
+void IncrementalService::disallowReadLogs(StorageId storageId) {
std::unique_lock l(mLock);
const auto ifs = getIfsLocked(storageId);
if (!ifs) {
- LOG(ERROR) << "disableReadLogs failed, invalid storageId: " << storageId;
+ LOG(ERROR) << "disallowReadLogs failed, invalid storageId: " << storageId;
return;
}
- if (!ifs->readLogsEnabled()) {
+ if (!ifs->readLogsAllowed()) {
return;
}
- ifs->disableReadLogs();
+ ifs->disallowReadLogs();
l.unlock();
const auto metadata = constants().readLogsDisabledMarkerName;
@@ -669,7 +679,7 @@
const auto& params = ifs->dataLoaderStub->params();
if (enableReadLogs) {
- if (!ifs->readLogsEnabled()) {
+ if (!ifs->readLogsAllowed()) {
LOG(ERROR) << "setStorageParams failed, readlogs disabled for storageId: " << storageId;
return -EPERM;
}
@@ -704,7 +714,12 @@
}
std::lock_guard l(mMountOperationLock);
- return mVold->setIncFsMountOptions(control, enableReadLogs);
+ const auto status = mVold->setIncFsMountOptions(control, enableReadLogs);
+ if (status.isOk()) {
+ // Store enabled state.
+ ifs.setReadLogsEnabled(enableReadLogs);
+ }
+ return status;
}
void IncrementalService::deleteStorage(StorageId storageId) {
@@ -1052,6 +1067,74 @@
return true;
}
+void IncrementalService::setUidReadTimeouts(
+ StorageId storage, const std::vector<PerUidReadTimeouts>& perUidReadTimeouts) {
+ using microseconds = std::chrono::microseconds;
+ using milliseconds = std::chrono::milliseconds;
+
+ auto maxPendingTimeUs = microseconds(0);
+ for (const auto& timeouts : perUidReadTimeouts) {
+ maxPendingTimeUs = std::max(maxPendingTimeUs, microseconds(timeouts.maxPendingTimeUs));
+ }
+ if (maxPendingTimeUs < Constants::minPerUidTimeout) {
+ return;
+ }
+
+ const auto ifs = getIfs(storage);
+ if (!ifs) {
+ return;
+ }
+
+ if (auto err = mIncFs->setUidReadTimeouts(ifs->control, perUidReadTimeouts); err < 0) {
+ LOG(ERROR) << "Setting read timeouts failed: " << -err;
+ return;
+ }
+
+ const auto timeout = std::chrono::duration_cast<milliseconds>(maxPendingTimeUs) -
+ Constants::perUidTimeoutOffset;
+ updateUidReadTimeouts(storage, Clock::now() + timeout);
+}
+
+void IncrementalService::clearUidReadTimeouts(StorageId storage) {
+ const auto ifs = getIfs(storage);
+ if (!ifs) {
+ return;
+ }
+
+ mIncFs->setUidReadTimeouts(ifs->control, {});
+}
+
+void IncrementalService::updateUidReadTimeouts(StorageId storage, Clock::time_point timeLimit) {
+ // Reached maximum timeout.
+ if (Clock::now() >= timeLimit) {
+ return clearUidReadTimeouts(storage);
+ }
+
+ // Still loading?
+ const auto progress = getLoadingProgress(storage);
+ if (progress.isError()) {
+ // Something is wrong, abort.
+ return clearUidReadTimeouts(storage);
+ }
+
+ if (progress.started() && progress.fullyLoaded()) {
+ // Fully loaded, check readLogs collection.
+ const auto ifs = getIfs(storage);
+ if (!ifs->readLogsEnabled()) {
+ return clearUidReadTimeouts(storage);
+ }
+ }
+
+ const auto timeLeft = timeLimit - Clock::now();
+ if (timeLeft < Constants::progressUpdateInterval) {
+ // Don't bother.
+ return clearUidReadTimeouts(storage);
+ }
+
+ addTimedJob(*mTimedQueue, storage, Constants::progressUpdateInterval,
+ [this, storage, timeLimit]() { updateUidReadTimeouts(storage, timeLimit); });
+}
+
std::unordered_set<std::string_view> IncrementalService::adoptMountedInstances() {
std::unordered_set<std::string_view> mountedRootNames;
mIncFs->listExistingMounts([this, &mountedRootNames](auto root, auto backingDir, auto binds) {
@@ -1125,7 +1208,7 @@
// Check if marker file present.
if (checkReadLogsDisabledMarker(root)) {
- ifs->disableReadLogs();
+ ifs->disallowReadLogs();
}
std::vector<std::pair<std::string, metadata::BindPoint>> permanentBindPoints;
@@ -1301,7 +1384,7 @@
// Check if marker file present.
if (checkReadLogsDisabledMarker(mountTarget)) {
- ifs->disableReadLogs();
+ ifs->disallowReadLogs();
}
// DataLoader params
@@ -1705,7 +1788,7 @@
return 0;
}
-int IncrementalService::isFileFullyLoaded(StorageId storage, const std::string& path) const {
+int IncrementalService::isFileFullyLoaded(StorageId storage, std::string_view filePath) const {
std::unique_lock l(mLock);
const auto ifs = getIfsLocked(storage);
if (!ifs) {
@@ -1718,7 +1801,7 @@
return -EINVAL;
}
l.unlock();
- return isFileFullyLoadedFromPath(*ifs, path);
+ return isFileFullyLoadedFromPath(*ifs, filePath);
}
int IncrementalService::isFileFullyLoadedFromPath(const IncFsMount& ifs,
@@ -1736,25 +1819,26 @@
return totalBlocks - filledBlocks;
}
-float IncrementalService::getLoadingProgress(StorageId storage) const {
+IncrementalService::LoadingProgress IncrementalService::getLoadingProgress(
+ StorageId storage) const {
std::unique_lock l(mLock);
const auto ifs = getIfsLocked(storage);
if (!ifs) {
LOG(ERROR) << "getLoadingProgress failed, invalid storageId: " << storage;
- return -EINVAL;
+ return {-EINVAL, -EINVAL};
}
const auto storageInfo = ifs->storages.find(storage);
if (storageInfo == ifs->storages.end()) {
LOG(ERROR) << "getLoadingProgress failed, no storage: " << storage;
- return -EINVAL;
+ return {-EINVAL, -EINVAL};
}
l.unlock();
return getLoadingProgressFromPath(*ifs, storageInfo->second.name);
}
-float IncrementalService::getLoadingProgressFromPath(const IncFsMount& ifs,
- std::string_view storagePath) const {
- size_t totalBlocks = 0, filledBlocks = 0;
+IncrementalService::LoadingProgress IncrementalService::getLoadingProgressFromPath(
+ const IncFsMount& ifs, std::string_view storagePath) const {
+ ssize_t totalBlocks = 0, filledBlocks = 0;
const auto filePaths = mFs->listFilesRecursive(storagePath);
for (const auto& filePath : filePaths) {
const auto [filledBlocksCount, totalBlocksCount] =
@@ -1762,33 +1846,29 @@
if (filledBlocksCount < 0) {
LOG(ERROR) << "getLoadingProgress failed to get filled blocks count for: " << filePath
<< " errno: " << filledBlocksCount;
- return filledBlocksCount;
+ return {filledBlocksCount, filledBlocksCount};
}
totalBlocks += totalBlocksCount;
filledBlocks += filledBlocksCount;
}
- if (totalBlocks == 0) {
- // No file in the storage or files are empty; regarded as fully loaded
- return 1;
- }
- return (float)filledBlocks / (float)totalBlocks;
+ return {filledBlocks, totalBlocks};
}
bool IncrementalService::updateLoadingProgress(
StorageId storage, const StorageLoadingProgressListener& progressListener) {
const auto progress = getLoadingProgress(storage);
- if (progress < 0) {
+ if (progress.isError()) {
// Failed to get progress from incfs, abort.
return false;
}
- progressListener->onStorageLoadingProgressChanged(storage, progress);
- if (progress > 1 - 0.001f) {
+ progressListener->onStorageLoadingProgressChanged(storage, progress.getProgress());
+ if (progress.fullyLoaded()) {
// Stop updating progress once it is fully loaded
return true;
}
- static constexpr auto kProgressUpdateInterval = 1000ms;
- addTimedJob(*mProgressUpdateJobQueue, storage, kProgressUpdateInterval /* repeat after 1s */,
+ addTimedJob(*mProgressUpdateJobQueue, storage,
+ Constants::progressUpdateInterval /* repeat after 1s */,
[storage, progressListener, this]() {
updateLoadingProgress(storage, progressListener);
});
