Skip to content

cm: launcher: fix crash in launcher #633

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

Merged
al1img merged 3 commits into from
Jul 29, 2026
Merged

cm: launcher: fix crash in launcher #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e119885
cm: launcher: double the amount of gid-s uid-s for instance removal
mykola-kobets-epam Jul 27, 2026
9f34205
cm: launcher: fix crash in cm::launcher
mykola-kobets-epam Jul 27, 2026
a47820e
cm: launcher: release id pool even storage RemoveInstance failed
mykola-kobets-epam Jul 27, 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
11 changes: 6 additions & 5 deletions src/core/cm/launcher/idpool.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ static constexpr auto cGIDRangeEnd = 10000;

/**
* Max number of locked GIDs simultaneously.
* Double the number of update items to avoid exhausting the range when removing instances.
*/
static constexpr auto cMaxNumLockedGIDs = cMaxNumUpdateItems;
static constexpr auto cMaxNumLockedGIDs = 2 * cMaxNumUpdateItems;

/**
* UID range start.
Expand All @@ -43,8 +44,9 @@ static constexpr auto cUIDRangeEnd = 10000;

/**
* Max number of locked UIDs simultaneously.
* Double the number of update items to avoid exhausting the range when removing instances.
*/
static constexpr auto cMaxNumLockedUIDs = cMaxNumInstances;
static constexpr auto cMaxNumLockedUIDs = 2 * cMaxNumInstances;

/**
* Pool that manages identifiers with reference counting per key.
Expand Down Expand Up @@ -166,10 +168,9 @@ class IDPool {
StaticMap<K, ItemEntry, cMaxNumItems> mItems;
};

using GIDPool
= IDPool<StaticString<cIDLen>, gid_t, cGIDRangeBegin, cGIDRangeEnd, cMaxNumLockedGIDs, cMaxNumUpdateItems>;
using GIDPool = IDPool<StaticString<cIDLen>, gid_t, cGIDRangeBegin, cGIDRangeEnd, cMaxNumLockedGIDs, cMaxNumLockedGIDs>;

using UIDPool = IDPool<InstanceIdent, uid_t, cUIDRangeBegin, cUIDRangeEnd, cMaxNumLockedUIDs, cMaxNumInstances>;
using UIDPool = IDPool<InstanceIdent, uid_t, cUIDRangeBegin, cUIDRangeEnd, cMaxNumLockedUIDs, cMaxNumLockedUIDs>;

} // namespace aos::cm::launcher

Expand Down
18 changes: 13 additions & 5 deletions src/core/cm/launcher/instance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,24 +408,32 @@
{
LOG_DBG() << "Remove instance" << Log::Field("instanceID", mInfo.mInstanceIdent);

Error firstErr = ErrorEnum::eNone;

if (auto err = mStorageState.Remove(mInfo.mInstanceIdent); !err.IsNone() && !err.Is(ErrorEnum::eNotFound)) {
return AOS_ERROR_WRAP(err);
firstErr = AOS_ERROR_WRAP(err);
}

if (auto err = mStorage.RemoveInstance(mInfo.mInstanceIdent, mInfo.mVersion);
!err.IsNone() && !err.Is(ErrorEnum::eNotFound)) {
return AOS_ERROR_WRAP(err);
if (firstErr.IsNone()) {

Check warning on line 419 in src/core/cm/launcher/instance.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Merge this "if" statement with the enclosing one. 


See more on https://sonarcloud.io/project/issues?id=aosedge_aos_core_lib_cpp&issues=AZ-kLoEbGDwGrdqdfKlu&open=AZ-kLoEbGDwGrdqdfKlu&pullRequest=633
firstErr = AOS_ERROR_WRAP(err);
}
}

if (auto err = mUIDPool.Release(mInfo.mInstanceIdent); !err.IsNone() && !err.Is(ErrorEnum::eNotFound)) {
return AOS_ERROR_WRAP(err);
if (firstErr.IsNone()) {

Check warning on line 425 in src/core/cm/launcher/instance.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Merge this "if" statement with the enclosing one. 


See more on https://sonarcloud.io/project/issues?id=aosedge_aos_core_lib_cpp&issues=AZ-kLoEbGDwGrdqdfKlv&open=AZ-kLoEbGDwGrdqdfKlv&pullRequest=633
firstErr = AOS_ERROR_WRAP(err);
}
}

if (auto err = mGIDPool.Release(mInfo.mInstanceIdent.mItemID); !err.IsNone() && !err.Is(ErrorEnum::eNotFound)) {
return AOS_ERROR_WRAP(err);
if (firstErr.IsNone()) {

Check warning on line 431 in src/core/cm/launcher/instance.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Merge this "if" statement with the enclosing one. 


See more on https://sonarcloud.io/project/issues?id=aosedge_aos_core_lib_cpp&issues=AZ-kLoEbGDwGrdqdfKlw&open=AZ-kLoEbGDwGrdqdfKlw&pullRequest=633
firstErr = AOS_ERROR_WRAP(err);
}
}

return ErrorEnum::eNone;
return firstErr;
}

Error ServiceInstance::Cache(bool disable)
Expand Down
6 changes: 3 additions & 3 deletions src/core/cm/launcher/instancemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,11 +563,11 @@ RetWithError<SharedPtr<Instance>> InstanceManager::CreateInstance(const Instance

if (auto err = newInstance->Init(); !err.IsNone()) {
// Do not leave invalid instance in storage.
if (err = newInstance->Remove(); !err.IsNone()) {
LOG_ERR() << "Can't remove instance" << Log::Field(err);
if (auto rmErr = newInstance->Remove(); !rmErr.IsNone()) {
LOG_ERR() << "Can't remove instance" << Log::Field(AOS_ERROR_WRAP(rmErr));
}

return {{}, AOS_ERROR_WRAP(err)};
return {nullptr, err};
}

if (auto [_, err] = newInstance->OverrideEnvVars(mEnvVarsOverrides); !err.IsNone()) {
Expand Down
Loading