This is an automated email from the ASF dual-hosted git repository. peacewong pushed a commit to branch dev-1.4.0 in repository https://gitbox.apache.org/repos/asf/linkis.git
commit 5b7fd7bd8b7a43e1dc30f276c45347dca253d001 Merge: a3aec9e09 a99d3d715 Author: peacewong <[email protected]> AuthorDate: Thu May 11 18:05:50 2023 +0800 Reduce mixed language module linkismange #4463 Reduce mixed language module linkismange #4463 .../linkis/common/exception/ErrorException.java | 2 +- .../linkis/common/exception/FatalException.java | 2 +- .../common/exception/LinkisRetryException.java | 4 +- .../governance/common/utils/ECPathUtils.java | 53 ++ .../exception/GovernanceErrorException.scala | 5 +- .../governance/common/utils/ECPathUtils.scala | 58 -- .../ecm/server/operator/EngineConnLogOperator.java | 219 +++++ .../server/operator/EngineConnYarnLogOperator.java | 147 ++++ .../ecm/server/exception/ECMErrorException.scala | 11 +- .../server/operator/EngineConnLogOperator.scala | 191 ----- .../operator/EngineConnYarnLogOperator.scala | 124 --- .../impl/AbstractEngineConnLaunchService.scala | 5 +- .../service/impl/DefaultECMRegisterService.scala | 8 +- .../service/impl/DefaultOperateService.scala | 24 +- .../impl/ProcessEngineConnLaunchService.scala | 2 +- .../operator/OperableOnceEngineConnOperator.java | 92 +++ .../operator/OperableOnceEngineConnOperator.scala | 72 -- .../service/TaskExecutionServiceImpl.scala | 13 +- .../impl/EngineConnApplicationInfoOperator.java | 56 ++ .../execution/AccessibleEngineConnExecution.scala | 2 +- .../impl/EngineConnApplicationInfoOperator.scala | 50 -- .../executor/service/DefaultManagerService.scala | 3 +- .../executor/service/DefaultOperateService.scala | 24 +- .../service/EngineConnTimedLockService.scala | 12 +- .../acessible/executor/service/LockService.scala | 7 +- .../callback/hook/CallbackEngineConnHook.scala | 4 +- .../callback/service/EngineConnCallback.scala | 2 +- .../exception/EngineConnPluginErrorException.scala | 7 +- .../entrance/restful/EntranceRestfulApi.java | 2 +- .../loader/EngineConnPluginLoaderConf.java | 44 + .../loaders/CacheablesEngineConnPluginLoader.java | 3 +- .../loaders/DefaultEngineConnPluginLoader.java | 27 +- .../BmlEngineConnPluginResourceLoader.java | 4 +- .../server/conf/EngineConnPluginConfiguration.java | 42 + .../interceptor/EngineConnLaunchInterceptor.java} | 14 +- .../loader/EngineConnPluginsLoaderFactory.java} | 19 +- .../AbstractEngineConnBmlResourceGenerator.java | 134 ++++ .../DefaultEngineConnBmlResourceGenerator.java | 109 +++ .../localize/EngineConnBmlResourceGenerator.java} | 12 +- .../localize/EngineConnLocalizeResource.java} | 12 +- .../localize/EngineConnLocalizeResourceImpl.java | 69 ++ .../service/DefaultEngineConnLaunchService.java | 106 +++ .../DefaultEngineConnResourceFactoryService.java | 80 ++ .../service/DefaultEngineConnResourceService.java | 351 ++++++++ .../server/service/EngineConnLaunchService.java} | 15 +- .../service/EngineConnResourceFactoryService.java} | 19 +- .../server/service/EngineConnResourceRequest.java} | 37 +- .../server/service/EngineConnResourceService.java | 43 + .../service/GetEngineConnResourceRequest.java} | 15 +- .../RefreshAllEngineConnResourceRequest.java} | 16 +- .../service/RefreshEngineConnResourceRequest.java} | 15 +- .../service/impl/EnginePluginAdminServiceImpl.java | 7 +- .../linkis/manager/am/conf/AMConfiguration.java | 125 +++ .../ApplicationManagerSpringConfiguration.java} | 19 +- .../manager/am/conf/ConfigurationMapCache.java | 69 ++ .../DefaultEngineConnConfigurationService.java | 72 ++ .../am/conf/EngineConnConfigurationService.java} | 9 +- .../linkis/manager/am/conf/ManagerMonitorConf.java | 45 ++ .../am/converter/DefaultMetricsConverter.java | 140 ++++ .../manager/am/exception/AMErrorException.java | 10 +- .../linkis/manager/am/label/AMLabelChecker.java | 56 ++ .../linkis/manager/am/label/AMLabelFilter.java | 59 ++ .../am/label/DefaultManagerLabelService.java | 63 ++ .../manager/am/label/EngineReuseLabelChooser.java} | 11 +- .../am/label/MultiUserEngineReuseLabelChooser.java | 104 +++ .../manager/am/locker/DefaultEngineNodeLocker.java | 73 ++ .../manager/am/locker/EngineNodeLocker.java} | 13 +- .../manager/am/manager/DefaultEMNodeManager.java | 218 +++++ .../am/manager/DefaultEngineNodeManager.java | 346 ++++++++ .../linkis/manager/am/manager/EMNodeManager.java | 73 ++ .../manager/am/manager/EngineNodeManager.java | 67 ++ .../manager/am/pointer/AbstractNodePointer.java | 98 +++ .../manager/am/pointer/DefaultEMNodPointer.java | 110 +++ .../am/pointer/DefaultEngineNodPointer.java | 82 ++ .../am/pointer/DefaultNodePointerBuilder.java | 24 +- .../am/recycle/AssignNodeRuleExecutor.java} | 27 +- .../manager/am/recycle/RecyclingRuleExecutor.java} | 13 +- .../linkis/manager/am/restful/EMRestfulApi.java | 25 +- .../manager/am/restful/EngineRestfulApi.java | 4 +- .../am/selector/DefaultECAvailableRule.java} | 22 +- .../manager/am/selector/DefaultNodeSelector.java | 75 ++ .../manager/am/selector/ECAvailableRule.java} | 12 +- .../linkis/manager/am/selector/NodeSelector.java} | 15 +- .../am/selector/rule/AvailableNodeSelectRule.java | 68 ++ .../selector/rule/ConcurrencyNodeSelectRule.java} | 22 +- .../am/selector/rule/HotspotExclusionRule.java} | 56 +- .../am/selector/rule/NewECMStandbyRule.java | 82 ++ .../manager/am/selector/rule/NodeSelectRule.java} | 9 +- .../am/selector/rule/ResourceNodeSelectRule.java | 120 +++ .../am/selector/rule/ScoreNodeSelectRule.java | 70 ++ .../am/selector/rule/TaskInfoNodeSelectRule.java | 73 ++ .../manager/am/service/EMEngineService.java} | 27 +- .../linkis/manager/am/service/EngineService.java} | 11 +- .../manager/am/service/HeartbeatService.java} | 9 +- .../cache/ConfCacheRemoveBroadcastListener.java | 75 ++ .../am/service/em/DefaultECMOperateService.java} | 31 +- .../am/service/em/DefaultEMEngineService.java | 228 ++++++ .../am/service/em/DefaultEMInfoService.java | 140 ++++ .../am/service/em/DefaultEMRegisterService.java | 124 +++ .../am/service/em/DefaultEMUnregisterService.java | 98 +++ .../em/ECMOperateService.java} | 17 +- .../manager/am/service/em/EMInfoService.java} | 22 +- .../manager/am/service/em/EMRegisterService.java} | 14 +- .../em/EMUnregisterService.java} | 18 +- .../am/service/engine/AbstractEngineService.java | 26 +- .../engine/DefaultEngineAskEngineService.java | 192 +++++ .../engine/DefaultEngineConnCanKillService.java | 196 +++++ .../service/engine/DefaultEngineCreateService.java | 433 ++++++++++ .../service/engine/DefaultEngineInfoService.java | 142 ++++ .../engine/DefaultEngineOperateService.java} | 29 +- .../engine/DefaultEngineRecycleService.java | 92 +++ .../service/engine/DefaultEngineReuseService.java | 257 ++++++ .../service/engine/DefaultEngineStopService.java | 316 ++++++++ .../engine/DefaultEngineSwitchService.java} | 18 +- .../am/service/engine/EngineAskEngineService.java} | 11 +- .../service/engine/EngineConnCanKillService.java} | 12 +- .../engine/EngineConnStatusCallbackService.java} | 11 +- .../am/service/engine/EngineCreateService.java} | 18 +- .../am/service/engine/EngineInfoService.java | 52 ++ .../am/service/engine/EngineOperateService.java} | 17 +- .../am/service/engine/EngineRecycleService.java} | 15 +- .../am/service/engine/EngineReuseService.java} | 17 +- .../am/service/engine/EngineStopService.java | 61 ++ .../am/service/engine/EngineSwitchService.java} | 14 +- .../am/service/heartbeat/AMHeartbeatService.java | 85 ++ .../DefaultEngineConnStatusCallbackService.java | 39 +- .../am/service/monitor/NodeHeartbeatMonitor.java | 372 +++++++++ .../apache/linkis/manager/am/util/LinkisUtils.java | 248 ++++++ .../apache/linkis/manager/am/utils/AMUtils.java | 338 ++++++++ .../manager/am/utils/DefaultRetryHandler.java | 122 +++ .../linkis/manager/am/utils/RetryHandler.java} | 27 +- .../linkis/manager/am/vo/AMEngineNodeVo.java | 6 +- .../org/apache/linkis/manager/am/vo/EMNodeVo.java | 6 +- .../linkis/manager/label/LabelManagerUtils.java} | 26 +- .../manager/label/conf/LabelManagerConf.java} | 12 +- .../label/score/DefaultNodeLabelScorer.java | 201 +++++ .../label/score/LabelScoreServiceInstance.java} | 38 +- .../manager/label/score/NodeLabelScorer.java} | 35 +- .../label/service/NodeLabelAddService.java} | 12 +- .../label/service/NodeLabelRemoveService.java} | 11 +- .../manager/label/service/NodeLabelService.java | 83 ++ .../label/service/ResourceLabelService.java} | 32 +- .../manager/label/service/UserLabelService.java} | 20 +- .../service/impl/DefaultNodeLabelAddService.java | 69 ++ .../impl/DefaultNodeLabelRemoveService.java | 82 ++ .../service/impl/DefaultNodeLabelService.java | 467 +++++++++++ .../service/impl/DefaultResourceLabelService.java | 161 ++++ .../service/impl/DefaultUserLabelService.java | 167 ++++ .../linkis/manager/rm/conf/ResourceStatus.java | 4 +- .../linkis/manager/rm/domain/RMLabelContainer.java | 11 +- .../manager/rm/entity/LabelResourceMapping.java | 68 ++ .../manager/rm/entity/ResourceOperationType.java} | 9 +- .../service/impl/ExternalResourceServiceImpl.java | 11 +- .../manager/rm/external/yarn/YarnAppInfo.java | 78 ++ .../rm/external/yarn/YarnResourceRequester.java | 450 +++++++++++ .../manager/rm/message/RMMessageService.java | 75 ++ .../linkis/manager/rm/restful/RMMonitorRest.java | 872 ++++++++++++++++++++ .../manager/rm/service/LabelResourceService.java} | 33 +- .../manager/rm/service/RequestResourceService.java | 422 ++++++++++ .../manager/rm/service/ResourceLockService.java | 95 +++ .../manager/rm/service/ResourceManager.java} | 41 +- .../manager/rm/service/impl/ChangeType.java} | 28 +- .../service/impl/DefaultReqResourceService.java} | 21 +- .../rm/service/impl/DefaultResourceManager.java | 875 ++++++++++++++++++++ .../impl/DriverAndYarnReqResourceService.java | 151 ++++ .../rm/service/impl/LabelResourceServiceImpl.java | 102 +++ .../rm/service/impl/ResourceLogService.java | 222 ++++++ .../rm/service/impl/UserResourceService.java | 128 +++ .../apache/linkis/manager/rm/utils/RMUtils.java | 283 +++++++ .../linkis/manager/rm/utils/UserConfiguration.java | 210 +++++ .../service/common/label/LabelChecker.java} | 14 +- .../manager/service/common/label/LabelFilter.java} | 8 +- .../service/common/label/ManagerLabelService.java} | 11 +- .../service/common/metrics/MetricsConverter.java | 55 ++ .../service/common/pointer/EMNodPointer.java} | 20 +- .../service/common/pointer/EngineNodePointer.java} | 24 +- .../service/common/pointer/NodePointer.java} | 32 +- .../common/pointer/NodePointerBuilder.java} | 15 +- .../loader/EngineConnPluginLoaderConf.scala | 50 -- .../conf/EngineConnPluginConfiguration.scala | 42 - .../AbstractEngineConnBmlResourceGenerator.scala | 125 --- .../DefaultEngineConnBmlResourceGenerator.scala | 109 --- .../service/DefaultEngineConnLaunchService.scala | 90 --- .../DefaultEngineConnResourceFactoryService.scala | 64 -- .../service/DefaultEngineConnResourceService.scala | 294 ------- .../server/service/EngineConnResourceService.scala | 78 -- .../linkis/manager/am/conf/AMConfiguration.scala | 118 --- .../manager/am/conf/ConfigurationMapCache.scala | 64 -- .../am/conf/EngineConnConfigurationService.scala | 70 -- .../manager/am/conf/ManagerMonitorConf.scala | 43 - .../am/converter/DefaultMetricsConverter.scala | 102 --- .../linkis/manager/am/label/AMLabelChecker.scala | 50 -- .../linkis/manager/am/label/AMLabelFilter.scala | 56 -- .../am/label/DefaultManagerLabelService.scala | 72 -- .../label/MultiUserEngineReuseLabelChooser.scala | 83 -- .../am/locker/DefaultEngineNodeLocker.scala | 61 -- .../manager/am/manager/DefaultEMNodeManager.scala | 193 ----- .../am/manager/DefaultEngineNodeManager.scala | 317 -------- .../linkis/manager/am/manager/EMNodeManager.scala | 71 -- .../manager/am/manager/EngineNodeManager.scala | 82 -- .../manager/am/pointer/AbstractNodePointer.scala | 83 -- .../manager/am/pointer/DefaultEMNodPointer.scala | 83 -- .../am/pointer/DefaultEngineNodPointer.scala | 68 -- .../manager/am/selector/DefaultNodeSelector.scala | 75 -- .../manager/am/selector/ECAvailableRule.scala | 55 -- .../am/selector/rule/AvailableNodeSelectRule.scala | 60 -- .../am/selector/rule/NewECMStandbyRule.scala | 83 -- .../am/selector/rule/OverLoadNodeSelectRule.scala | 66 -- .../am/selector/rule/ResourceNodeSelectRule.scala | 101 --- .../am/selector/rule/ScoreNodeSelectRule.scala | 55 -- .../am/selector/rule/TaskInfoNodeSelectRule.scala | 63 -- .../cache/ConfCacheRemoveBroadcastListener.scala | 70 -- .../am/service/em/DefaultECMOperateService.scala | 36 - .../am/service/em/DefaultEMEngineService.scala | 209 ----- .../am/service/em/DefaultEMInfoService.scala | 124 --- .../am/service/em/DefaultEMRegisterService.scala | 121 --- .../am/service/em/DefaultEMUnregisterService.scala | 89 --- .../manager/am/service/em/ECMOperateService.scala | 27 - .../manager/am/service/em/EMRegisterService.scala | 33 - .../engine/DefaultEngineAskEngineService.scala | 170 ---- .../engine/DefaultEngineConnCanKillService.scala | 173 ---- .../engine/DefaultEngineCreateService.scala | 404 ---------- .../service/engine/DefaultEngineInfoService.scala | 145 ---- .../engine/DefaultEngineRecycleService.scala | 82 -- .../service/engine/DefaultEngineReuseService.scala | 219 ----- .../service/engine/DefaultEngineStopService.scala | 292 ------- .../service/engine/EngineConnCanKillService.scala | 26 - .../am/service/engine/EngineInfoService.scala | 50 -- .../am/service/engine/EngineKillService.scala | 31 - .../am/service/engine/EngineOperateService.scala | 33 - .../am/service/engine/EngineStopService.scala | 69 -- .../am/service/heartbeat/AMHeartbeatService.scala | 83 -- .../am/service/monitor/NodeHeartbeatMonitor.scala | 493 ------------ .../apache/linkis/manager/am/utils/AMUtils.scala | 305 ------- .../manager/label/conf/LabelManagerConf.scala | 27 - .../label/score/DefaultNodeLabelScorer.scala | 182 ----- .../label/service/NodeLabelRemoveService.scala | 26 - .../manager/label/service/NodeLabelService.scala | 93 --- .../service/impl/DefaultNodeLabelAddService.scala | 56 -- .../impl/DefaultNodeLabelRemoveService.scala | 75 -- .../service/impl/DefaultNodeLabelService.scala | 411 ---------- .../service/impl/DefaultResourceLabelService.scala | 162 ---- .../service/impl/DefaultUserLabelService.scala | 122 --- .../manager/rm/entity/LabelResourceMap.scala | 52 -- .../manager/rm/external/yarn/YarnAppInfo.scala | 29 - .../rm/external/yarn/YarnResourceRequester.scala | 440 ---------- .../manager/rm/message/RMMessageService.scala | 68 -- .../linkis/manager/rm/restful/RMMonitorRest.scala | 842 -------------------- .../rm/service/RequestResourceService.scala | 399 ---------- .../manager/rm/service/ResourceLockService.scala | 80 -- .../rm/service/impl/DefaultResourceManager.scala | 881 --------------------- .../impl/DriverAndYarnReqResourceService.scala | 121 --- .../rm/service/impl/LabelResourceServiceImpl.scala | 100 --- .../rm/service/impl/ResourceLogService.scala | 234 ------ .../rm/service/impl/UserResourceService.scala | 114 --- .../apache/linkis/manager/rm/utils/RMUtils.scala | 256 ------ .../manager/rm/utils/UserConfiguration.scala | 174 ---- .../service/common/metrics/MetricsConverter.scala | 57 -- .../service/common/pointer/EngineNodePointer.scala | 34 - .../common/pointer/NodePointerBuilder.scala | 28 - ...est.java => ECResourceInfoLinkisUtilsTest.java} | 2 +- .../label/exception/LabelErrorException.java | 10 +- .../manager/common/conf/ManagerCommonConf.java} | 21 +- .../manager/common/conf/RMConfiguration.java | 114 +++ .../manager/common/entity/node/AMEMNode.java | 6 +- .../manager/common/entity/node/AMEngineNode.java | 8 +- .../manager/common/entity/node/LabelNode.java | 4 +- .../common/entity/recycle/AssignEMNodeRule.java | 26 +- .../common/entity/recycle/AssignNodeRule.java | 26 +- .../common/entity/recycle/AssignUserRule.java} | 16 +- .../common/entity/recycle/RecyclingRule.java} | 10 +- .../common/entity/resource/CPUResource.java | 132 +++ .../entity/resource/DriverAndYarnResource.java | 222 ++++++ .../common/entity/resource/InstanceResource.java | 37 +- .../entity/resource/LoadInstanceResource.java | 161 ++++ .../common/entity/resource/LoadResource.java | 129 +++ .../common/entity/resource/MemoryResource.java | 120 +++ .../manager/common/entity/resource/Resource.java | 134 ++++ .../common/entity/resource/SpecialResource.java | 355 +++++++++ .../entity/resource/UserAvailableResource.java | 21 +- .../common/entity/resource/YarnResource.java | 176 ++++ .../manager/common/exception/RMErrorException.java | 10 +- .../manager/common/monitor/ManagerMonitor.java} | 4 +- .../linkis/manager/common/operator/Operator.java | 56 ++ .../manager/common/operator/OperatorFactory.java} | 16 +- .../common/operator/OperatorFactoryImpl.java | 72 ++ .../manager/common/protocol/EngineLock.java} | 6 +- .../manager/common/protocol/OperateRequest.java} | 31 +- .../manager/common/protocol/OperateResponse.java} | 10 +- .../common/protocol/RequestEngineLock.java} | 39 +- .../common/protocol/RequestEngineUnlock.java} | 20 +- .../common/protocol/RequestManagerUnlock.java | 59 ++ .../ResponseEngineLock.java} | 40 +- .../common/protocol/ResponseEngineUnlock.java} | 20 +- .../common/protocol/em/ECMOperateRequest.java | 51 ++ .../common/protocol/em/ECMOperateResponse.java} | 42 +- .../protocol/em/EMResourceRegisterRequest.java | 79 ++ .../common/protocol/em/RegisterEMRequest.java | 79 ++ .../em/RegisterEMResponse.java} | 34 +- .../engine/EngineAskAsyncResponse.java} | 32 +- .../protocol/engine/EngineAsyncResponse.java} | 11 +- .../protocol/engine/EngineConnStatusCallback.java | 61 ++ .../engine/EngineConnStatusCallbackToAM.java | 71 ++ .../engine/EngineCreateError.java} | 45 +- .../engine/EngineCreateSuccess.java} | 32 +- .../protocol/engine/EngineOperateRequest.java} | 29 +- .../protocol/engine/EngineOperateResponse.java} | 43 +- .../label/LabelReportRequest.java} | 22 +- .../label/LabelUpdateRequest.java} | 15 +- .../protocol/resource/ResourceProtocol.java} | 6 +- .../protocol/resource/ResourceUsedProtocol.java | 51 ++ .../protocol/resource/ResourceWithStatus.java | 103 +++ .../protocol/resource/ResponseTaskRunningInfo.java | 66 ++ .../resource/ResponseTaskYarnResource.java} | 25 +- .../linkis/manager/common/utils/ManagerUtils.java | 4 +- .../linkis/manager/common/utils/ResourceUtils.java | 312 ++++++++ .../linkis/manager/rm/AvailableResource.java} | 18 +- .../linkis/manager/rm/NotEnoughResource.java} | 20 +- .../RequestResourceAndWait.java} | 26 +- .../node/LabelNode.java => rm/ResourceInfo.java} | 15 +- .../apache/linkis/manager/rm/ResultResource.java} | 4 +- .../manager/common/conf/ManagerCommonConf.scala | 34 - .../manager/common/conf/RMConfiguration.scala | 91 --- .../common/entity/recycle/RecyclingRule.scala | 32 - .../manager/common/entity/resource/Resource.scala | 773 ------------------ .../linkis/manager/common/operator/Operator.scala | 44 - .../manager/common/operator/OperatorFactory.scala | 64 -- .../manager/common/protocol/OperateRequest.scala | 45 -- .../common/protocol/em/ECMOperateRequest.scala | 37 - .../protocol/em/EMResourceRegisterRequest.scala | 67 -- .../common/protocol/em/RegisterEMRequest.scala | 67 -- .../common/protocol/em/RegisterEMResponse.scala | 24 - .../protocol/engine/EngineAsyncResponse.scala | 35 - .../protocol/engine/EngineConnStatusCallback.scala | 55 -- .../protocol/engine/EngineOperateRequest.scala | 31 - .../common/protocol/label/LabelUpdateRequest.scala | 27 - .../protocol/resource/ResourceProtocol.scala | 48 -- .../protocol/resource/ResourceWithStatus.scala | 33 - .../manager/common/utils/ResourceUtils.scala | 278 ------- .../linkis/manager/rm/ResourceManagerParam.scala | 51 -- .../apache/linkis/manager/rm/ResultResource.scala | 24 - .../exception/PersistenceErrorException.java | 10 +- .../persistence/NodeManagerPersistence.java | 20 +- .../persistence/NodeMetricManagerPersistence.java | 10 +- .../persistence/ResourceManagerPersistence.java | 6 +- .../impl/DefaultNodeManagerPersistence.java | 29 +- .../impl/DefaultNodeMetricManagerPersistence.java | 12 +- .../impl/DefaultResourceLabelPersistence.java | 2 +- .../impl/DefaultResourceManagerPersistence.java | 5 +- .../flink/operator/TriggerSavepointOperator.java | 92 +++ .../flink/operator/TriggerSavepointOperator.scala | 49 -- .../spark/executor/SparkEngineConnExecutor.scala | 8 +- ...SparkSubmitProcessEngineConnLaunchBuilder.scala | 2 +- .../service/ComputationTaskExecutionReceiver.scala | 10 +- .../ecm/ComputationEngineConnManager.scala | 30 +- .../ecm/cache/EngineAsyncResponseCache.scala | 16 +- .../impl/ComputationEngineConnExecutor.scala | 2 +- .../impl/DefaultEngineAsyncResponseService.scala | 12 +- 358 files changed, 16822 insertions(+), 14878 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
