Fix merge conflicts

AcademySoftwareFoundation · Oct 4, 2023 · fbab6e9 · fbab6e9
1 parent 75506df
commit fbab6e9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/cuebot/src/main/java/com/imageworks/spcue/dispatcher/FrameCompleteHandler.java b/cuebot/src/main/java/com/imageworks/spcue/dispatcher/FrameCompleteHandler.java
@@ -33,6 +33,7 @@
 import com.imageworks.spcue.DispatchFrame;
 import com.imageworks.spcue.DispatchHost;
 import com.imageworks.spcue.DispatchJob;
+import com.imageworks.spcue.FrameDetail;
 import com.imageworks.spcue.JobDetail;
 import com.imageworks.spcue.LayerDetail;
 import com.imageworks.spcue.LayerInterface;

diff --git a/cuebot/src/main/java/com/imageworks/spcue/dispatcher/HostReportHandler.java b/cuebot/src/main/java/com/imageworks/spcue/dispatcher/HostReportHandler.java
@@ -30,6 +30,7 @@
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import com.imageworks.spcue.JobInterface;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +45,6 @@
 import com.imageworks.spcue.JobEntity;
 import com.imageworks.spcue.LayerEntity;
 import com.imageworks.spcue.LayerDetail;
-import com.imageworks.spcue.FrameDetail;
 import com.imageworks.spcue.LocalHostAssignment;
 import com.imageworks.spcue.Source;
 import com.imageworks.spcue.VirtualProc;
@@ -54,6 +54,7 @@
 import com.imageworks.spcue.dispatcher.commands.DispatchBookHostLocal;
 import com.imageworks.spcue.dispatcher.commands.DispatchHandleHostReport;
 import com.imageworks.spcue.dispatcher.commands.DispatchRqdKillFrame;
+import com.imageworks.spcue.dispatcher.commands.DispatchRqdKillFrameMemory;
 import com.imageworks.spcue.grpc.host.HardwareState;
 import com.imageworks.spcue.grpc.host.LockState;
 import com.imageworks.spcue.grpc.report.BootReport;
@@ -567,11 +568,6 @@ private boolean getKillClearance(String hostname, String frameId) {
             if (!dispatcher.isTestMode()) {
                 FrameInterface frame = jobManager.getFrame(frameId);
                 JobInterface job = jobManager.getJob(frame.getJobId());
-                prometheusMetrics.incrementFrameKillFailureCounter(
-                        hostname,
-                        job.getName(),
-                        frame.getName(),
-                        frameId);
             }
             return false;
         }
@@ -592,7 +588,6 @@ private boolean killProcForMemory(VirtualProc proc, String hostname, KillCause k
             try {
                 killQueue.execute(new DispatchRqdKillFrameMemory(hostname, frame, killCause.toString(), rqdClient,
                         dispatchSupport, dispatcher.isTestMode()));
-                prometheusMetrics.incrementFrameKilledCounter(hostname, killCause);
             } catch (TaskRejectedException e) {
                 logger.warn("Unable to add a DispatchRqdKillFrame request, task rejected, " + e);
                 return false;
@@ -616,7 +611,6 @@ private boolean killFrame(String frameId, String hostname, KillCause killCause)
                         frameId,
                         killCause.toString(),
                         rqdClient));
-                prometheusMetrics.incrementFrameKilledCounter(hostname, killCause);
             } catch (TaskRejectedException e) {
                 logger.warn("Unable to add a DispatchRqdKillFrame request, task rejected, " + e);
             }

diff --git a/...ot/src/main/java/com/imageworks/spcue/dispatcher/commands/DispatchRqdKillFrameMemory.java b/...ot/src/main/java/com/imageworks/spcue/dispatcher/commands/DispatchRqdKillFrameMemory.java
@@ -24,11 +24,13 @@
 import com.imageworks.spcue.dispatcher.DispatchSupport;
 import com.imageworks.spcue.rqd.RqdClient;
 import com.imageworks.spcue.rqd.RqdClientException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+
 
 public class DispatchRqdKillFrameMemory extends KeyRunnable {
 
-    private static final Logger logger = Logger.getLogger(DispatchRqdKillFrameMemory.class);
+    private static final Logger logger = LogManager.getLogger(DispatchRqdKillFrameMemory.class);
 
     private String message;
     private String hostname;