diff --git a/api/cpp/include/yr/api/invoke_options.h b/api/cpp/include/yr/api/invoke_options.h index 601ab83d421e109b5f2f9c564ba41b32f09079bc..b2399b56429501b836536bf47934a36f40905736 100644 --- a/api/cpp/include/yr/api/invoke_options.h +++ b/api/cpp/include/yr/api/invoke_options.h @@ -178,7 +178,7 @@ struct InvokeOptions { * @var bool preferredAntiOtherLabels * @brief 是否开启反亲和不可选资源,开启后,当传入多个弱亲和条件都不满足时,调度失败。仅在弱反亲和生效 */ - bool preferredAntiOtherLabels = true; + bool preferredAntiOtherLabels = false; /*! * @var size_t retyrTime diff --git a/api/java/function-common/src/main/java/com/yuanrong/InvokeOptions.java b/api/java/function-common/src/main/java/com/yuanrong/InvokeOptions.java index df6d8a8a27229ce77aecd4bfc6c2958d1b71f5fe..27fd9d71dbff11ad8049b9c0818037470657292f 100644 --- a/api/java/function-common/src/main/java/com/yuanrong/InvokeOptions.java +++ b/api/java/function-common/src/main/java/com/yuanrong/InvokeOptions.java @@ -59,7 +59,7 @@ public class InvokeOptions { private List scheduleAffinities; private boolean preferredPriority = true; private boolean requiredPriority = false; - private boolean preferredAntiOtherLabels = true; + private boolean preferredAntiOtherLabels = false; private boolean needOrder = false; private boolean preemptedAllowed = false; private String groupName; diff --git a/api/python/yr/config.py b/api/python/yr/config.py index 00a1d135b7f08e7cf720ab4d725ce07ea66fa3a1..6c2dfddced3b73b0cac3e2867fcfdfebacff28e7 100644 --- a/api/python/yr/config.py +++ b/api/python/yr/config.py @@ -422,7 +422,7 @@ class InvokeOptions: #: weak affinity conditions are met. When preferred_anti_other_labels is set to True, if no PODs that meet the #: conditions are found for weak affinity/anti-affinity, scheduling fails and no other resources' PODs are #: selected for scheduling. - preferred_anti_other_labels = True + preferred_anti_other_labels = False resource_group_options: ResourceGroupOptions = field(default_factory=ResourceGroupOptions) """ diff --git a/src/dto/affinity.h b/src/dto/affinity.h index 0908ae9de389c53aef425982f3202a28bdf03082..6920912df7d033dc2710e93791ec30339fd499d5 100644 --- a/src/dto/affinity.h +++ b/src/dto/affinity.h @@ -256,7 +256,7 @@ protected: std::string affinityType; bool preferredPriority = true; bool requiredPriority = false; - bool preferredAntiOtherLabels = true; + bool preferredAntiOtherLabels = false; std::list> labelOperators; };