From 5d5345184d756067a3f49b4280a45983b0a944f6 Mon Sep 17 00:00:00 2001 From: Pavel Silin Date: Thu, 22 Aug 2024 18:28:04 +0200 Subject: [PATCH] issue #3602 rollback for refactor ResourceMonitoringManager.performActionOnNetworkConsumingRun to reuse existing method (#3648) (cherry picked from commit 26ef381c2117db763fa14c2955b38d3f96b77500) --- .../ResourceMonitoringManager.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/com/epam/pipeline/manager/cluster/performancemonitoring/ResourceMonitoringManager.java b/api/src/main/java/com/epam/pipeline/manager/cluster/performancemonitoring/ResourceMonitoringManager.java index 24b66b1a94..af1621f502 100644 --- a/api/src/main/java/com/epam/pipeline/manager/cluster/performancemonitoring/ResourceMonitoringManager.java +++ b/api/src/main/java/com/epam/pipeline/manager/cluster/performancemonitoring/ResourceMonitoringManager.java @@ -382,7 +382,7 @@ private void performActionOnIdleRun(PipelineRun run, IdleRunAction action, switch (action) { case PAUSE: if (run.getInstance().getSpot()) { - addRunWithMetricToNotifyList(run, cpuUsageRate, pipelinesToNotify); + performNotify(run, cpuUsageRate, pipelinesToNotify); } else { performPause(run, cpuUsageRate); } @@ -400,16 +400,16 @@ private void performActionOnIdleRun(PipelineRun run, IdleRunAction action, performStop(run, cpuUsageRate); break; default: - addRunWithMetricToNotifyList(run, cpuUsageRate, pipelinesToNotify); + performNotify(run, cpuUsageRate, pipelinesToNotify); } runsToUpdate.add(run); } - private void addRunWithMetricToNotifyList(PipelineRun run, double metric, - List> pipelinesToNotify) { + private void performNotify(PipelineRun run, double cpuUsageRate, + List> pipelinesToNotify) { run.setLastIdleNotificationTime(DateUtils.nowUTC()); - pipelinesToNotify.add(new ImmutablePair<>(run, metric)); + pipelinesToNotify.add(new ImmutablePair<>(run, cpuUsageRate)); } private void processHighNetworkConsumingRuns(final List runs) { @@ -523,11 +523,17 @@ private void performActionOnNetworkConsumingRun(final PipelineRun run, // TODO break; default: - addRunWithMetricToNotifyList(run, bandwidth, pipelinesToNotify); + performHighNetworkConsumingNotify(run, bandwidth, pipelinesToNotify); } runsToUpdate.add(run); } + private void performHighNetworkConsumingNotify(PipelineRun run, double networkBandwidthLevel, + List> pipelinesToNotify) { + run.setLastNetworkConsumptionNotificationTime(DateUtils.nowUTC()); + pipelinesToNotify.add(new ImmutablePair<>(run, networkBandwidthLevel)); + } + private void performStop(PipelineRun run, double cpuUsageRate) { if (run.isNonPause() || run.isClusterRun()) { log.debug(messageHelper.getMessage(MessageConstants.DEBUG_RUN_IDLE_SKIP_CHECK, run.getPodId()));