Pull Request已成功合入, 合并人@CANN-robot
(感谢 devHaven 的贡献)变更摘要
本 PR(#4988,标题 [fix])是一次纯日志整改,范围覆盖集群链路诊断(experimental/cluster_link_diag)、src/base_comm 及 src/legacy 下 910/950 平台的 HCCL 通信与资源管理模块。全部改动仅涉及日志文案与格式字符串,未改变任何业务逻辑、变量名或控制流。整改内容主要包括:修正日志级别错配(将大量 HCCL_INFO/log_info 的失败与告警场景提升为 HCCL_WARNING/log_warning)、修正拼写与语法错误(如 peerank→peerRank、romate→remote、do not available→is not available、must greater than→must be greater than 等)、将禁止的中文日志改为英文、补全错误描述缺失的参数(消除魔鬼数字)以及修正日志中引用错误的变量名。
主要改动
- 日志级别错配修正:在
experimental/cluster_link_diag/dispatcher/dispatcher_common.py新增log_warning并在ssh_push_controller.py中将三处[warning]日志由log_info改为log_warning;hccl_nslbdp.cc、adapter_hccp.cc、ccu_ins_preprocessor.cpp、mc2_compont.cpp等将strncpy_s/memcpy_s失败、socket 收发失败、资源分配失败等场景由HCCL_INFO/HCCL_RUN_INFO提升为HCCL_WARNING/HCCL_RUN_WARNING。 - 拼写错误修正:批量修正错误单词,包括
peerank→peerRank(all_reduce_recursive_hd.cc)、romate→remote(dev_rdma_connection_v2.cc、host_rdma_connection.cc)、conndId→connId(bkf_ch_cli_letcp.c)、reducescater→ReduceScatter、recommanded→recommended、creakLink→createLink、TransportQuerry→TransportQuery、unavaialble→unavailable、lcoalSize→localSize、SignalInex→SignalIndex、kernalLaunch→kernelLaunch、intputPtr→inputPtr、errorno→errno、devideId→deviceId等。 - 英文语法规范化:统一修正日志英文表达,如
do not available→is not available、do not empty→is not empty、must greater than→must be greater than、must less than→must be less than、is not support→is not supported、already exit→already exists、no exist→does not exist、cannot found→cannot find、form→from、waitime→waittime、occured→occurred等。 - 中文日志转英文与错误描述补全:
parallel_command_executor.py中"错误捕获输出"改为"error captured output",probe_controller.cpp中"无法打开输出文件!"改为"failed to open output file!";同时补全缺失的参数与描述,如SetDeterministicConfig日志补充deterministic[%u]、interface_hccl.cc的wqePerDoorbell非法日志补充实际值与MAX_WQE_PER_DOORBELL上限、aicpu_kfc_rpc_serverv2.cc补充HCCL_MSG_CNT、all_reduce_chunk_mesh.cc补全缺失的round格式参数。 - 修正日志引用的错误标识符:修正引用错误或拼错的常量/变量名,包括
CCU_SQ_UBFFER_SIZE→CCU_SQ_BUFFER_SIZE(ccu_jetty_ctx_mgr.cc与ccu_jetty_ctx_mgr.cpp)、ctxHanlde→ctxHandle、legcy→legacy、normal_docket_lo→normal_docker_lo、ctxSignautre→ctxSignature;并修正日志中实际打印的错误变量,如hccl_socket_manager.cc的 client socket map 大小打印、sqe_mgr.cc将memcpy_s改为实际调用的memset_s、hccl_impl.cc与preempt_port_manager.cc的时态表述等。


Thanks for your pull-request.
The full list of commands accepted by me can be found at here.
You can get sig-info at here.
You can self-configure the PR merge rules for this repository. For more details, please refer to Here.
For more, you also can visit HICANN.
PR Approval Progress
✅ Congratulations! All modules have met the lgtm and approve requirements.
Module Approval Details
| module | lgtm status | approve status |
|---|---|---|
| experimental | ✅ 颜业峰, 杨小渊, 兰泽泽, 劳大钊 (4/2) | ✅ 颜业峰 (1/1) |
| src/base_comm | ✅ 劳大钊, 孙哲芃, 颜业峰, 杨小渊, 兰泽泽 (5/2) | ✅ 孙哲芃, 颜业峰 (2/1) |
| src/base_comm/resources/hccp | ✅ 陈轲, 颜业峰, 杨小渊, 兰泽泽, 劳大钊 (5/2) | ✅ 陈轲, 颜业峰 (2/1) |
| src/coll_communicator_mgr | ✅ 颜业峰, 丁炜秦, 杨小渊, 兰泽泽, 劳大钊 (5/2) | ✅ 颜业峰, 丁炜秦 (2/1) |
| src/legacy/ascend910/algorithm | ✅ 李标智, 颜业峰, 杨小渊, 兰泽泽, 劳大钊 (5/2) | ✅ 李标智, 颜业峰 (2/1) |
| src/legacy/ascend910/common | ✅ 孙哲芃, 颜业峰, 杨小渊, 兰泽泽, 劳大钊 (5/2) | ✅ 孙哲芃, 颜业峰 (2/1) |
| src/legacy/ascend910/framework | ✅ 颜业峰, 丁炜秦, 杨小渊, 兰泽泽, 劳大钊 (5/2) | ✅ 颜业峰, 丁炜秦 (2/1) |
| src/legacy/ascend910/framework/device/aicpu_kfc | ✅ 兰泽泽, 劳大钊, 杨小渊, 颜业峰 (4/2) | ✅ 颜业峰 (1/1) |
| src/legacy/ascend910/hccd | ✅ 兰泽泽, 劳大钊, 丁炜秦, 颜业峰, 杨小渊 (5/2) | ✅ 颜业峰, 丁炜秦 (2/1) |
| src/legacy/ascend910/platform | ✅ 孙哲芃, 颜业峰, 杨小渊, 兰泽泽, 劳大钊 (5/2) | ✅ 孙哲芃, 颜业峰 (2/1) |
| src/legacy/ascend950/framework | ✅ 颜业峰, 丁炜秦, 兰泽泽, 劳大钊, 杨小渊 (5/2) | ✅ 颜业峰, 丁炜秦 (2/1) |
| src/legacy/ascend950/service/collective/alg | ✅ 杨小渊, 李标智, 颜业峰, 兰泽泽, 劳大钊 (5/2) | ✅ 李标智, 颜业峰 (2/1) |
| src/legacy/ascend950/unified_platform | ✅ 杨小渊, 兰泽泽, 劳大钊, 颜业峰, 孙哲芃 (5/2) | ✅ 颜业峰, 孙哲芃 (2/1) |
💡 Tip:
- Committer can comment
/approveor/lgtm- Commenting
/approveimplies both code review (lgtm) and intent to merge (approve)
CLA Signature Pass
devHaven, thanks for your pull request. All authors of the commits have signed the CLA. 👍


/approve


描述
本次主要是日志的整改,主要涉及语法错误、拼写错误、级别错配、错误描述不完整、未知缩写、冗余日志、禁止中文、魔鬼数字等。所有修改仅涉及日志文案和格式字符串,未改变任何业务逻辑、变量名或控制流。
变更类型
请选择本次引入的变更类型:
关联的Issue
https://gitcode.com/cann/hcomm/issues/812
测试
不涉及新增UT用例,不修改逻辑,因此不需要checker和真机验证
文档更新
不涉及
合入检查