1、mtr探测设备增加并发限制。

2、开发防火墙策略区分ipv4和ipv6。 3、脚本执行策略下发时间优化。
2025-12-03 19:18:12 +08:00
parent a40a6f344e
commit a5b5f5b08d
18 changed files with 249 additions and 32 deletions
@@ -76,7 +76,8 @@ public class RmMtrPolicyConfigController extends BaseController
    @PostMapping
    public AjaxResult add(@RequestBody RmMtrPolicyConfig rmMtrPolicyConfig)
    {
-        return toAjax(rmMtrPolicyConfigService.insertRmMtrPolicyConfig(rmMtrPolicyConfig));
+        int rows = rmMtrPolicyConfigService.insertRmMtrPolicyConfig(rmMtrPolicyConfig);
+        return toAjax(rows);
    }

    /**
@@ -33,5 +33,7 @@ public class InitialHeartbeatListen extends BaseEntity
    private String version;
    /** 服务启动时间 */
    private Long startupTime;
+    /** cpu核数 */
+    private Integer cpucores;

 }
@@ -91,4 +91,6 @@ public class RmMtrClientRegistration extends BaseEntity
    private String mtrClientIds;
    /** 多条件 */
    private String queryName;
+    /** cpu核数 */
+    private Integer cpucores;
 }
@@ -371,6 +371,11 @@ public class MessageHandler {
                            }
                            needUpdate = true;
                        }
+                        if(rmMtrClientRegistration.getCpucores() == null ||
+                                rmMtrClientRegistration.getCpucores() != heartbeat.getCpucores()){
+                            updateData.setCpucores(heartbeat.getCpucores());
+                            needUpdate = true;
+                        }
                        if(needUpdate){
                            rmMtrClientRegistrationService.updateRmMtrClientRegistration(updateData);
                        }
@@ -65,6 +65,8 @@ public class RmMtrClientRegistrationServiceImpl implements IRmMtrClientRegistrat
    @Override
    public List<RmMtrClientRegistration> selectRmMtrClientRegistrationList(RmMtrClientRegistration rmMtrClientRegistration)
    {
+        rmMtrClientRegistration.setOnlineStatus("1");
+        rmMtrClientRegistration.setRegisterStatus("1");
        List<RmMtrClientRegistration> list = rmMtrClientRegistrationMapper.selectRmMtrClientRegistrationList(rmMtrClientRegistration);
        for (RmMtrClientRegistration mtrClientRegistration : list) {
            // 处理网卡信息
@@ -5,7 +5,9 @@ import com.tongran.common.core.domain.R;
 import com.tongran.common.core.utils.DateUtils;
 import com.tongran.common.core.utils.StringUtils;
 import com.tongran.common.security.utils.SecurityUtils;
+import com.tongran.mtragent.domain.RmMtrClientRegistration;
 import com.tongran.mtragent.domain.RmMtrPolicyConfig;
+import com.tongran.mtragent.mapper.RmMtrClientRegistrationMapper;
 import com.tongran.mtragent.mapper.RmMtrPolicyConfigMapper;
 import com.tongran.mtragent.service.IRmMtrPolicyConfigService;
 import com.tongran.system.api.RemoteRocketMqService;
@@ -28,6 +30,8 @@ public class RmMtrPolicyConfigServiceImpl implements IRmMtrPolicyConfigService
    @Autowired
    private RmMtrPolicyConfigMapper rmMtrPolicyConfigMapper;
    @Autowired
+    private RmMtrClientRegistrationMapper rmMtrClientRegistrationMapper;
+    @Autowired
    private RemoteRocketMqService remoteRocketMqService;

    /**
@@ -122,13 +126,15 @@ public class RmMtrPolicyConfigServiceImpl implements IRmMtrPolicyConfigService
    }
    /**
     * 新增mtr探测策略配置
-     * 
+     *
     * @param rmMtrPolicyConfig mtr探测策略配置
     * @return 结果
     */
    @Override
    public int insertRmMtrPolicyConfig(RmMtrPolicyConfig rmMtrPolicyConfig)
    {
+        // 检查是否超出限制
+        checkServerNum(rmMtrPolicyConfig);
        rmMtrPolicyConfig.setCreateTime(DateUtils.getNowDate());
        rmMtrPolicyConfig.setUpdateTime(DateUtils.getNowDate());
        rmMtrPolicyConfig.setCreateBy(SecurityUtils.getUsername());
@@ -142,19 +148,89 @@ public class RmMtrPolicyConfigServiceImpl implements IRmMtrPolicyConfigService

    /**
     * 修改mtr探测策略配置
-     * 
+     *
     * @param rmMtrPolicyConfig mtr探测策略配置
     * @return 结果
     */
    @Override
    public int updateRmMtrPolicyConfig(RmMtrPolicyConfig rmMtrPolicyConfig)
    {
+        // 检查是否超出限制
+        checkServerNum(rmMtrPolicyConfig);
        rmMtrPolicyConfig.setUpdateTime(DateUtils.getNowDate());
        // 给ip赋值
        setServerip(rmMtrPolicyConfig);
        return rmMtrPolicyConfigMapper.updateRmMtrPolicyConfig(rmMtrPolicyConfig);
    }

+    public void checkServerNum(RmMtrPolicyConfig rmMtrPolicyConfig){
+        if (rmMtrPolicyConfig.getMtrClientId() == null) {
+            throw new RuntimeException("MTR客户端ID不能为空");
+        }
+        // 获取CPU核心数
+        int cpuCores = getCpuCores(rmMtrPolicyConfig.getMtrClientId());
+        if(cpuCores == 0){
+            // cpu核数未采集
+            throw new RuntimeException("该MTRAgent的cpu核数未上报，请检查详情，待cpu核数上报后重试");
+        }
+        Set<String> serverSet = isPolicyCountExceeded(rmMtrPolicyConfig);
+        if(serverSet == null) {
+            return; // 没有服务器或客户端ID为空，直接返回
+        }
+        if(serverSet.size() > cpuCores){
+            // 设置错误信息，包含已下发的服务器列表
+            String errorMessage = String.format("探测服务器数量超过节点并发数量限制(%d)，已开启探测的服务器clientId为: %s",
+                    cpuCores, String.join(", ", serverSet));
+            throw new RuntimeException(errorMessage);
+        }
+    }
+    /**
+     * 检查策略数量是否超过CPU核心数限制
+     *
+     * @param newPolicy 新增或修改的策略
+     * @return true-超过限制，false-未超过限制
+     */
+    private Set<String> isPolicyCountExceeded(RmMtrPolicyConfig newPolicy) {
+
+        // 获取当前客户端应该执行的策略列表
+        List<RmMtrPolicyConfig> currentPolicies = getPoliciesForMtrClient(newPolicy.getMtrClientId());
+
+        // 获取新策略中的服务器ID列表（去重）
+        List<String> newServerIds = getServerIdsFromPolicy(newPolicy);
+        if (newServerIds.isEmpty()) {
+            return null;
+        }
+
+        // 获取当前已分配的服务器ID列表（去重）
+        Set<String> currentServerIds = new HashSet<>();
+        for (RmMtrPolicyConfig policy : currentPolicies) {
+            // 如果是修改操作，需要排除当前策略本身
+            if (newPolicy.getId() != null &&
+                    newPolicy.getId().equals(policy.getId())) {
+                continue; // 跳过当前正在修改的策略
+            }
+            List<String> serverIds = getServerIdsFromPolicy(policy);
+            currentServerIds.addAll(serverIds);
+        }
+
+        // 计算新增的不重复服务器数量
+        Set<String> allServerIds = new HashSet<>(currentServerIds);
+        allServerIds.addAll(newServerIds);
+        return allServerIds;
+    }
+    /**
+     * 获取CPU核心数
+     */
+    private int getCpuCores(String mtrClientId) {
+        RmMtrClientRegistration query = new RmMtrClientRegistration();
+        query.setMtrClientId(mtrClientId);
+        RmMtrClientRegistration rmMtrRegistMsg = rmMtrClientRegistrationMapper.getMsgByMtrClientId(query);
+        if(rmMtrRegistMsg != null && rmMtrRegistMsg.getCpucores() != null){
+            return rmMtrRegistMsg.getCpucores() * 2;
+        }
+        return 0;
+    }
+
    /**
     * 批量删除mtr探测策略配置
     *