diff --git a/omniadvisor/config/common_config.ini b/omniadvisor/config/common_config.ini index 053d720600cb20c1b86f3a17a49a2594dd8cddc0..e97916d431627b51ae66e2133b037dcf2450113a 100755 --- a/omniadvisor/config/common_config.ini +++ b/omniadvisor/config/common_config.ini @@ -34,4 +34,8 @@ spark.output.merge.switch=False [webpage] # admin 页面显示的时区 -admin.timezone=Asia/Shanghai \ No newline at end of file +admin.timezone=Asia/Shanghai + +[kmc] +# 这个参数的范围在 0x1111 -> 0x9999 +kmc.semkey=0x1111 \ No newline at end of file diff --git a/omniadvisor/src/common/constant.py b/omniadvisor/src/common/constant.py index 4a1461077958dd2c808cd23de83dd6560d34a41e..e7a0b699ee7e5129d2efd53c12b187687d4b5b25 100644 --- a/omniadvisor/src/common/constant.py +++ b/omniadvisor/src/common/constant.py @@ -62,6 +62,9 @@ def check_oa_conf() -> None: if not OA_CONF.admin_timezone: raise ValueError('The admin timezone can not be empty, please check common configuration.') + if OA_CONF.kmc_semkey < 0x1111 or OA_CONF.kmc_semkey > 0x9999: + raise ValueError('The kmc semkey should be between 0x1111 and 0x9999.') + class OmniAdvisorConf: """ @@ -183,5 +186,7 @@ class OmniAdvisorConf: 'update', 'merge', 'delete', 'rewrite', 'upsert', 'replace' ] + kmc_semkey = _common_config.getint('kmc', 'kmc.semkey') + OA_CONF = OmniAdvisorConf() diff --git a/omniadvisor/src/common/kmc_toolkit/KmcUtil.py b/omniadvisor/src/common/kmc_toolkit/KmcUtil.py index 4256b7b8d88ef1ed1d780474c729012fefe6b0bf..53c22c6a3fdb3a0a471649e379b5402d6a14298c 100644 --- a/omniadvisor/src/common/kmc_toolkit/KmcUtil.py +++ b/omniadvisor/src/common/kmc_toolkit/KmcUtil.py @@ -7,6 +7,7 @@ KMC类 import ctypes import random import common.kmc_toolkit.constants as CONSTANTS +from common.constant import OA_CONF from common.kmc_toolkit.KmcWrapperAPI import KmcWrapper from common.kmc_toolkit.msg_type import KmcConfig from common.kmc_toolkit.log import kmc_logger @@ -61,7 +62,7 @@ class Kmc: standby_ksf = CONSTANTS.KMC_KSF_STANDBY # initial sem key - sem_key = CONSTANTS.DEFAULT_SEM_KEY + CONSTANTS.MIN_HEX_SEM_KEY + sem_key = CONSTANTS.DEFAULT_SEM_KEY + OA_CONF.kmc_semkey kmc_config = KmcConfig( primary_ksf.encode("utf-8"),