Skip to content

Integration #537

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
Mar 27, 2026
Merged

Integration #537

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
390c246
common: ocispec: make "enabled" as default balancing policy
al1img Mar 26, 2026
17809f0
cm: launcher: make version field optional in node platform selection
al1img Mar 26, 2026
053e530
common: tools: do not override original error message in error wrap
al1img Mar 26, 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
2 changes: 1 addition & 1 deletion src/core/cm/launcher/balancer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
auto& node = nodeRuntime.mFirst;
const auto& runtime = nodeRuntime.mSecond;

if (auto err = mInstanceManager->ScheduleInstance(instance, *node, runtime->mRuntimeID); !err.IsNone()) {

Check failure on line 162 in src/core/cm/launcher/balancer.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Forming reference to null pointer 


See more on https://sonarcloud.io/project/issues?id=aosedge_aos_core_lib_cpp&issues=AZ0pc-vS3af-gOVdmmol&open=AZ0pc-vS3af-gOVdmmol&pullRequest=537
return AOS_ERROR_WRAP(Error(err, "can't schedule instance"));
}

Expand Down Expand Up @@ -510,7 +510,7 @@
}

// Check balancing policy
if (instance->GetBalancingPolicy() != oci::BalancingPolicyEnum::eBalancingDisabled) {
if (instance->GetBalancingPolicy() != oci::BalancingPolicyEnum::eDisabled) {
continue;
}

Expand Down
14 changes: 10 additions & 4 deletions src/core/cm/launcher/instance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,18 @@
assert(mImageConfig);

// Required params: OS, architecture
if (platformInfo.mOSInfo.mOS != mImageConfig->mOS
|| platformInfo.mArchInfo.mArchitecture != mImageConfig->mArchitecture) {
if (platformInfo.mArchInfo.mArchitecture != mImageConfig->mArchitecture) {
return false;
}

// Optional params: architecture variant, OS version, OS features
// Optional params: architecture variant, OS, OS version, OS features

if (!mImageConfig->mOS.IsEmpty()) {
if (platformInfo.mOSInfo.mOS != mImageConfig->mOS) {

Check warning on line 137 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=AZ0pc-9v3af-gOVdmmom&open=AZ0pc-9v3af-gOVdmmom&pullRequest=537
return false;
}
}

if (!mImageConfig->mVariant.IsEmpty()) {
if (platformInfo.mArchInfo.mVariant != mImageConfig->mVariant) {
return false;
Expand Down Expand Up @@ -301,7 +307,7 @@

oci::BalancingPolicyEnum ComponentInstance::GetBalancingPolicy()
{
return oci::BalancingPolicyEnum::eBalancingDisabled;
return oci::BalancingPolicyEnum::eDisabled;
}

Error ComponentInstance::Schedule(NodeItf& node, const String& runtimeID)
Expand Down
18 changes: 9 additions & 9 deletions src/core/cm/launcher/tests/launcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ AlertRules CreateAlertRules(double cpuRule, double ramRule)
}

void CreateItemConfig(oci::ItemConfig& config, const std::vector<std::string>& runtimes = {"linux"},
const oci::BalancingPolicy& balancingPolicy = oci::BalancingPolicyEnum::eNone,
const oci::BalancingPolicy& balancingPolicy = oci::BalancingPolicyEnum::eEnabled,
const oci::ServiceQuotas& quotas = {}, const oci::RequestedResources& requestedResources = {},
const Optional<AlertRules>& alertRules = {}, const std::vector<std::string>& allowedConnections = {},
const std::vector<std::string>& resources = {})
Expand Down Expand Up @@ -1284,11 +1284,11 @@ TestDataPtr TestItemRebalancing()
CreateNodeConfig(testData->mNodeConfigs[cNodeIDRunxSM], cNodeIDRunxSM, 0, {}, {}, alertRules);

// Item configs
CreateItemConfig(testData->mItemConfigs[cService1], {cRunnerRunc}, oci::BalancingPolicyEnum::eNone,
CreateItemConfig(testData->mItemConfigs[cService1], {cRunnerRunc}, oci::BalancingPolicyEnum::eEnabled,
CreateServiceQuotas(0, 0, 1000, 0));
CreateItemConfig(testData->mItemConfigs[cService2], {cRunnerRunc}, oci::BalancingPolicyEnum::eNone,
CreateItemConfig(testData->mItemConfigs[cService2], {cRunnerRunc}, oci::BalancingPolicyEnum::eEnabled,
CreateServiceQuotas(0, 0, 1000, 0));
CreateItemConfig(testData->mItemConfigs[cService3], {cRunnerRunc}, oci::BalancingPolicyEnum::eNone,
CreateItemConfig(testData->mItemConfigs[cService3], {cRunnerRunc}, oci::BalancingPolicyEnum::eEnabled,
CreateServiceQuotas(0, 0, 1000, 0));

// Desired instances with priorities
Expand Down Expand Up @@ -1356,11 +1356,11 @@ TestDataPtr TestItemRebalancingPolicy()
CreateNodeConfig(testData->mNodeConfigs[cNodeIDRemoteSM2], cNodeIDRemoteSM2, 50, {}, {}, alertRules);

// Service configs
CreateItemConfig(testData->mItemConfigs[cService1], {cRunnerRunc}, oci::BalancingPolicyEnum::eNone,
CreateItemConfig(testData->mItemConfigs[cService1], {cRunnerRunc}, oci::BalancingPolicyEnum::eEnabled,
CreateServiceQuotas(0, 0, 1000, 0), {}, {});
CreateItemConfig(testData->mItemConfigs[cService2], {cRunnerRunc}, oci::BalancingPolicyEnum::eNone,
CreateItemConfig(testData->mItemConfigs[cService2], {cRunnerRunc}, oci::BalancingPolicyEnum::eEnabled,
CreateServiceQuotas(0, 0, 1000, 0));
CreateItemConfig(testData->mItemConfigs[cService3], {cRunnerRunc}, oci::BalancingPolicyEnum::eBalancingDisabled,
CreateItemConfig(testData->mItemConfigs[cService3], {cRunnerRunc}, oci::BalancingPolicyEnum::eDisabled,
CreateServiceQuotas(0, 0, 1000, 0));

// Desired instances with priorities
Expand Down Expand Up @@ -1910,8 +1910,8 @@ TEST_F(CMLauncherTest, TestSentInstanceInfo)
auto alertRules = CreateAlertRules(75.0, 85.0);
auto itemConfig = std::make_unique<oci::ItemConfig>();

CreateItemConfig(*itemConfig, {cRunnerRunc}, oci::BalancingPolicyEnum::eNone, CreateServiceQuotas(500, 300, 0, 0),
CreateRequestedResources(100, 50, 0, 0), alertRules);
CreateItemConfig(*itemConfig, {cRunnerRunc}, oci::BalancingPolicyEnum::eEnabled,
CreateServiceQuotas(500, 300, 0, 0), CreateRequestedResources(100, 50, 0, 0), alertRules);

AddItem(cService1, cImageID1, *itemConfig, CreateImageConfig(), version);

Expand Down
7 changes: 5 additions & 2 deletions src/core/common/ocispec/itf/itemconfig.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,15 @@ struct RequestedResources {
*/
class BalancingPolicyType {
public:
enum class Enum { eNone, eBalancingDisabled };
enum class Enum {
eEnabled,
eDisabled,
};

static const Array<const char* const> GetStrings()
{
static const char* const sBalancingPolicyStrings[] = {
"none",
"enabled",
"disabled",
};

Expand Down
2 changes: 1 addition & 1 deletion src/core/common/tools/error.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class Error {
mLineNumber = err.mLineNumber;
}

if (msg) {
if (err.mMessage[0] == '\0') {
CopyMessage(msg);
} else {
CopyMessage(err.mMessage);
Expand Down
Loading