Commit 5fb71365 by 毛树良

<fix>:注意特殊:繁星3.0:如果已经用了大于等于15个资源时,认为资源占用完了

1 parent a56bc9bd
......@@ -338,12 +338,23 @@ public class VAServerService {
status.put("platType", vaServer.getPlatType());
status.put("softVersion", vaServer.getSoftVersion());
status.put("algoVersion", vaServer.getAlgoVersion());
status.put("availableResource", vaServer.getAvailableResources());
// status.put("availableResource", vaServer.getAvailableResources());
// 问题:显示一个容器有20个分析资源,添加任务时分析资源超过15后会出现任务分析异常;項目上要求15个就当资源消耗完了,页面显示资源使用完了;
// 因此这里修改显示逻辑,如果已经用了大于等于15个资源时,认为资源占用完了
Float usedResourceShow = vaServer.getVideoResource() - vaServer.getAvailableResources();
Float availableResourcesShow = vaServer.getAvailableResources();
if (vaServer.getVideoResource() == 20 && usedResourceShow >= 15) {
usedResourceShow = vaServer.getVideoResource();
availableResourcesShow = 0f;
// 用一个新字段存储真实可用的资源数,方便排查问题
status.put("avre", vaServer.getAvailableResources());
}
status.put("availableResource", availableResourcesShow);
status.put("videoResource", vaServer.getVideoResource());
VaServerOverViewModel model = map.computeIfAbsent(ip, x -> new VaServerOverViewModel());
model.setIp(ip).addInfo(status);
model.addTotal(vaServer.getVideoResource()).addUsed(vaServer.getVideoResource() - vaServer.getAvailableResources());
model.addTotal(vaServer.getVideoResource()).addUsed(usedResourceShow);
}
return map.values();
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!