[rqd] Rewrite rqnimby logic (#1680)

The previous pynput based implementation was more complex than needed
due to the effort to keep backwards compatibility with the previously
implementation based on Select. This change removes support to the
Select based implementation in favor of a simplified logic using pynput.

Given that the Select method was outdated and incompatible with modern
versions of linux, supporting it is no longer necessary.

Author: DiegoTavares

rqd/rqd/rqconstants.py

@@ -107,6 +107,8 @@
 CHECK_INTERVAL_LOCKED = 60
 # Seconds of idle time required before nimby unlocks.
 MINIMUM_IDLE = 900
+# Default display configuration in case the environment variable DISPLAY is not set
+DEFAULT_DISPLAY = ":0"
 # If available memory drops below this amount, lock nimby (need to take into account cache).
 MINIMUM_MEM = 524288
 MINIMUM_SWAP = 1048576

rqd/rqd/rqcore.py

@@ -45,7 +45,7 @@
 import rqd.rqexceptions
 import rqd.rqmachine
 import rqd.rqnetwork
-import rqd.rqnimby
+from rqd.rqnimby import Nimby
 import rqd.rqutil
 import rqd.rqlogging
 
@@ -74,7 +74,7 @@ def __init__(self, optNimbyoff=False):
             reserved_cores=[],
         )
 
-        self.nimby = rqd.rqnimby.NimbyFactory.getNimby(self)
+        self.nimby = Nimby(self)
 
         self.machine = rqd.rqmachine.Machine(self, self.cores)
         self.network = rqd.rqnetwork.Network(self)
@@ -395,11 +395,6 @@ def launchFrame(self, runFrame):
             log.info(err)
             raise rqd.rqexceptions.CoreReservationFailureException(err)
 
-        if rqd.rqconstants.OVERRIDE_NIMBY and self.nimby.isNimbyActive():
-            err = "Not launching, rqd is lockNimby and User is Active"
-            log.info(err)
-            raise rqd.rqexceptions.CoreReservationFailureException(err)
-
         if runFrame.frame_id in self.__cache:
             err = "Not launching, frame is already running on this proc %s" % runFrame.frame_id
             log.critical(err)
@@ -506,22 +501,19 @@ def rebootIdle(self):
     def nimbyOn(self):
         """Activates nimby, does not kill any running frames until next nimby
            event. Also does not unlock until sufficient idle time is reached."""
-        if self.nimby and not self.nimby.active:
+        if self.nimby and self.nimby.is_ready:
             try:
-                self.nimby.run()
+                self.nimby.start()
                 log.warning("Nimby has been activated")
             # pylint: disable=broad-except
             except Exception:
-                self.nimby.locked = False
-                err = "Nimby is in the process of shutting down"
+                err = "Nimby failed to start. Unexpected state"
                 log.exception(err)
-                raise rqd.rqexceptions.RqdException(err)
 
     def nimbyOff(self):
         """Deactivates nimby and unlocks any nimby lock"""
-        if self.nimby.active:
-            self.nimby.stop()
-            log.info("Nimby has been deactivated")
+        self.nimby.stop()
+        log.info("Nimby has been deactivated")
 
     def onNimbyLock(self):
         """This is called by nimby when it locks the machine.

rqd/rqd/rqmachine.py

@@ -126,14 +126,6 @@ def isNimbySafeToRunJobs(self):
             # pylint: enable=no-member
         return True
 
-    def isNimbySafeToUnlock(self):
-        """Returns False if nimby should not unlock due to resource limits"""
-        if not self.isNimbySafeToRunJobs():
-            return False
-        if self.getLoadAvg() / self.__coreInfo.total_cores > rqd.rqconstants.MAXIMUM_LOAD:
-            return False
-        return True
-
     @rqd.rqutil.Memoize
     def isDesktop(self):
         """Returns True if machine starts in run level 5 (X11)
@@ -859,7 +851,7 @@ def updateMachineStats(self):
 
         # Updates dynamic information
         self.__renderHost.load = self.getLoadAvg()
-        self.__renderHost.nimby_enabled = self.__rqCore.nimby.active
+        self.__renderHost.nimby_enabled = self.__rqCore.nimby.is_ready
         self.__renderHost.nimby_locked = self.__rqCore.nimby.locked
         self.__renderHost.state = self.state