Skip to content

sm: imagemanager: add handling outdated items #496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
al1img wants to merge 13 commits into
base: feature_unification
Choose a base branch
from
Open

sm: imagemanager: add handling outdated items #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cf16852
sm: imagemanager: serialize blob and layer install
al1img Jan 23, 2026
5d7b0f7
sm: launcher: remove redundant logs on stop instance
al1img Jan 27, 2026
fbe88b1
common: spaceallocator: add version param to outdated item
al1img Jan 27, 2026
2b96787
cm: imagemanager: use item version in outdated items
al1img Jan 27, 2026
fd14e22
cm: imagemanager: rename GetItemInfos to GetAllItemsInfos in storage
al1img Jan 27, 2026
a173d80
sm: imagemanager: add storage interface to store update items data
al1img Jan 27, 2026
ee50aee
sm: imagemanager: implement removing outdated items
al1img Jan 27, 2026
e554ac3
sm: imagemanager: add removing item on version and max item limits
al1img Jan 28, 2026
7493aee
sm: imagemanager: implement item integrity check
al1img Jan 28, 2026
391df19
sm: imagemanager: check no mem error on allocation OCI configs
al1img Jan 28, 2026
7d29051
sm: imagemanager: implement removing orphaned blobs and layers
al1img Jan 29, 2026
d38099d
cm: database: rename Database interface to DatabaseItf
al1img Jan 29, 2026
dbe66d1
sm: database: add abstract database module
al1img Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/core/cm/database/itf/database.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ namespace aos::cm::database {
*/

/**
* Database class.
* Database interface.
*/
class Database : public imagemanager::StorageItf, public launcher::StorageItf, public storagestate::StorageItf { };
class DatabaseItf : public imagemanager::StorageItf, public launcher::StorageItf, public storagestate::StorageItf { };

/** @}*/

Expand Down
44 changes: 24 additions & 20 deletions src/core/cm/imagemanager/imagemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Error ImageManager::Init(const Config& config, StorageItf& storage, BlobInfoProv
return AOS_ERROR_WRAP(ErrorEnum::eNoMemory);
}

if (auto err = mStorage->GetItemsInfo(*items); !err.IsNone()) {
if (auto err = mStorage->GetAllItemsInfos(*items); !err.IsNone()) {
return AOS_ERROR_WRAP(err);
}

Expand Down Expand Up @@ -128,7 +128,7 @@ Error ImageManager::DownloadUpdateItems(const Array<UpdateItemInfo>& itemsInfo,
return AOS_ERROR_WRAP(ErrorEnum::eNoMemory);
}

if (auto err = mStorage->GetItemsInfo(*storedItems); !err.IsNone()) {
if (auto err = mStorage->GetAllItemsInfos(*storedItems); !err.IsNone()) {
return AOS_ERROR_WRAP(err);
}

Expand Down Expand Up @@ -206,7 +206,7 @@ Error ImageManager::InstallUpdateItems(const Array<UpdateItemInfo>& itemsInfo, A
return AOS_ERROR_WRAP(ErrorEnum::eNoMemory);
}

if (auto err = mStorage->GetItemsInfo(*storedItems); !err.IsNone()) {
if (auto err = mStorage->GetAllItemsInfos(*storedItems); !err.IsNone()) {
return AOS_ERROR_WRAP(err);
}

Expand All @@ -216,7 +216,7 @@ Error ImageManager::InstallUpdateItems(const Array<UpdateItemInfo>& itemsInfo, A

storedItems->Clear();

if (auto err = mStorage->GetItemsInfo(*storedItems); !err.IsNone()) {
if (auto err = mStorage->GetAllItemsInfos(*storedItems); !err.IsNone()) {
return AOS_ERROR_WRAP(err);
}

Expand All @@ -226,7 +226,7 @@ Error ImageManager::InstallUpdateItems(const Array<UpdateItemInfo>& itemsInfo, A

storedItems->Clear();

if (auto err = mStorage->GetItemsInfo(*storedItems); !err.IsNone()) {
if (auto err = mStorage->GetAllItemsInfos(*storedItems); !err.IsNone()) {
return AOS_ERROR_WRAP(err);
}

Expand All @@ -236,7 +236,7 @@ Error ImageManager::InstallUpdateItems(const Array<UpdateItemInfo>& itemsInfo, A

storedItems->Clear();

if (auto err = mStorage->GetItemsInfo(*storedItems); !err.IsNone()) {
if (auto err = mStorage->GetAllItemsInfos(*storedItems); !err.IsNone()) {
return AOS_ERROR_WRAP(err);
}

Expand Down Expand Up @@ -286,7 +286,7 @@ Error ImageManager::GetUpdateItemsStatuses(Array<UpdateItemStatus>& statuses)
return ErrorEnum::eNoMemory;
}

if (auto err = mStorage->GetItemsInfo(*items); !err.IsNone()) {
if (auto err = mStorage->GetAllItemsInfos(*items); !err.IsNone()) {
return AOS_ERROR_WRAP(err);
}

Expand Down Expand Up @@ -343,7 +343,7 @@ Error ImageManager::GetIndexDigest(const String& itemID, const String& version,
return ErrorEnum::eNoMemory;
}

if (auto err = mStorage->GetItemsInfos(itemID, *items); !err.IsNone()) {
if (auto err = mStorage->GetItemInfos(itemID, *items); !err.IsNone()) {
return AOS_ERROR_WRAP(err);
}

Expand Down Expand Up @@ -414,7 +414,7 @@ Error ImageManager::GetItemCurrentVersion(const String& itemID, String& version)
return ErrorEnum::eNoMemory;
}

if (auto err = mStorage->GetItemsInfos(itemID, *items); !err.IsNone()) {
if (auto err = mStorage->GetItemInfos(itemID, *items); !err.IsNone()) {
return AOS_ERROR_WRAP(err);
}

Expand All @@ -432,23 +432,24 @@ Error ImageManager::GetItemCurrentVersion(const String& itemID, String& version)
return ErrorEnum::eNone;
}

RetWithError<size_t> ImageManager::RemoveItem(const String& id)
RetWithError<size_t> ImageManager::RemoveItem(const String& id, const String& version)
{
LockGuard lock {mMutex};

LOG_DBG() << "Remove item" << Log::Field("id", id);
LOG_DBG() << "Remove item" << Log::Field("id", id) << Log::Field("version", version);

auto storedItems = MakeUnique<StaticArray<ItemInfo, cMaxNumUpdateItems>>(&mAllocator);
if (!storedItems) {
return {0, AOS_ERROR_WRAP(ErrorEnum::eNoMemory)};
}

if (auto err = mStorage->GetItemsInfo(*storedItems); !err.IsNone()) {
if (auto err = mStorage->GetAllItemsInfos(*storedItems); !err.IsNone()) {
return {0, AOS_ERROR_WRAP(err)};
}

auto itemIt = storedItems->FindIf(
[&id](const auto& item) { return item.mItemID == id && item.mState == ItemStateEnum::eRemoved; });
auto itemIt = storedItems->FindIf([&id, &version](const auto& item) {
return item.mItemID == id && item.mVersion == version && item.mState == ItemStateEnum::eRemoved;
});

if (itemIt == storedItems->end()) {
return {0, ErrorEnum::eNotFound};
Expand Down Expand Up @@ -489,7 +490,7 @@ Error ImageManager::RemoveOutdatedItems()
return AOS_ERROR_WRAP(ErrorEnum::eNoMemory);
}

if (auto err = mStorage->GetItemsInfo(*items); !err.IsNone()) {
if (auto err = mStorage->GetAllItemsInfos(*items); !err.IsNone()) {
return AOS_ERROR_WRAP(err);
}

Expand Down Expand Up @@ -1388,8 +1389,10 @@ void ImageManager::RegisterOutdatedItems(const Array<ItemInfo>& items)
{
for (const auto& item : items) {
if (item.mState == ItemStateEnum::eRemoved) {
if (auto err = mInstallSpaceAllocator->AddOutdatedItem(item.mItemID, item.mTimestamp); !err.IsNone()) {
LOG_ERR() << "Failed to add outdated item" << Log::Field("itemID", item.mItemID) << Log::Field(err);
if (auto err = mInstallSpaceAllocator->AddOutdatedItem(item.mItemID, item.mVersion, item.mTimestamp);
!err.IsNone()) {
LOG_ERR() << "Failed to add outdated item" << Log::Field("itemID", item.mItemID)
<< Log::Field("version", item.mVersion) << Log::Field(err);
}
}
}
Expand Down Expand Up @@ -1577,7 +1580,7 @@ RetWithError<size_t> ImageManager::CleanupOrphanedBlobs()
return {0, AOS_ERROR_WRAP(ErrorEnum::eNoMemory)};
}

if (auto err = mStorage->GetItemsInfo(*storedItems); !err.IsNone()) {
if (auto err = mStorage->GetAllItemsInfos(*storedItems); !err.IsNone()) {
return {0, AOS_ERROR_WRAP(err)};
}

Expand Down Expand Up @@ -1739,9 +1742,10 @@ Error ImageManager::SetItemsToRemoved(const Array<UpdateItemInfo>& itemsInfo, co
<< Log::Field("version", storedItem.mVersion) << Log::Field(err);
}

if (auto err = mInstallSpaceAllocator->AddOutdatedItem(storedItem.mItemID, now); !err.IsNone()) {
if (auto err = mInstallSpaceAllocator->AddOutdatedItem(storedItem.mItemID, storedItem.mVersion, now);
!err.IsNone()) {
LOG_ERR() << "Failed to add outdated item" << Log::Field("itemID", storedItem.mItemID)
<< Log::Field(err);
<< Log::Field("version", storedItem.mVersion) << Log::Field(err);
}

NotifyItemStatusChanged(storedItem.mItemID, storedItem.mVersion, ItemStateEnum::eRemoved, ErrorEnum::eNone);
Expand Down
3 changes: 2 additions & 1 deletion src/core/cm/imagemanager/imagemanager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,10 @@ class ImageManager : public ImageManagerItf, public ItemInfoProviderItf, public
* Removes item.
*
* @param id item id.
* @param version item version.
* @return RetWithError<size_t>.
*/
RetWithError<size_t> RemoveItem(const String& id) override;
RetWithError<size_t> RemoveItem(const String& id, const String& version) override;

private:
static constexpr auto cBlobsDirName = "blobs";
Expand Down
8 changes: 4 additions & 4 deletions src/core/cm/imagemanager/itf/storage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,21 +82,21 @@ class StorageItf {
virtual Error UpdateItemState(const String& id, const String& version, ItemState state, Time timestamp = {}) = 0;

/**
* Gets items info.
* Gets all items info.
*
* @param items Items info.
* @return Error.
*/
virtual Error GetItemsInfo(Array<ItemInfo>& items) = 0;
virtual Error GetAllItemsInfos(Array<ItemInfo>& items) = 0;

/**
* Gets items info by ID.
*
* @param itemID Item ID.
* @param id Item ID.
* @param items Items info.
* @return Error.
*/
virtual Error GetItemsInfos(const String& itemID, Array<ItemInfo>& items) = 0;
virtual Error GetItemInfos(const String& id, Array<ItemInfo>& items) = 0;
};

} // namespace aos::cm::imagemanager
Expand Down
Loading
Loading