Add OOM Increase field to Service Properties (#1160)

* Add OOM Increase field to Service Properties Allow setting minimum memory increase for services through Cuecommander * Make range for OOM increase field more accurate Previously, the min. value for the input was 512. This caused confusion when db value for min_memory_increase was 0. Also includes check to prevent users from setting the field to 0.
AcademySoftwareFoundation · Jul 21, 2022 · b2d4fc2 · b2d4fc2
1 parent 3aca86f
commit b2d4fc2
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/cuegui/cuegui/ServiceDialog.py b/cuegui/cuegui/ServiceDialog.py
@@ -72,6 +72,9 @@ def __init__(self, parent=None):
  self.timeout_llu = QtWidgets.QSpinBox(self)
  self.timeout_llu.setRange(0, 4320)
  self.timeout_llu.setValue(0)
+ self.min_memory_increase = QtWidgets.QSpinBox(self)
+ self.min_memory_increase.setRange(0, int(self._cfg().get('max_memory', 48)) * 1024)
+ self.min_memory_increase.setValue(0)
  layout = QtWidgets.QGridLayout(self)
  layout.addWidget(QtWidgets.QLabel("Name:", self), 0, 0)
  layout.addWidget(self.name, 0, 1)
@@ -89,15 +92,17 @@ def __init__(self, parent=None):
  layout.addWidget(self.timeout, 6, 1)
  layout.addWidget(QtWidgets.QLabel("Timeout LLU (in minutes):", self), 7, 0)
  layout.addWidget(self.timeout_llu, 7, 1)
+ layout.addWidget(QtWidgets.QLabel("OOM Increase MB:", self), 8, 0)
+ layout.addWidget(self.min_memory_increase, 8, 1)
  self._tags_w = cuegui.TagsWidget.TagsWidget(allowed_tags=cuegui.Constants.ALLOWED_TAGS)
- layout.addWidget(self._tags_w, 8, 0, 1, 2)
+ layout.addWidget(self._tags_w, 9, 0, 1, 2)
 
  self.__buttons = QtWidgets.QDialogButtonBox(QtWidgets.QDialogButtonBox.Save,
  QtCore.Qt.Horizontal,
  self)
  self.__buttons.setDisabled(True)
 
- layout.addWidget(self.__buttons, 9, 1)
+ layout.addWidget(self.__buttons, 10, 1)
 
  self.__buttons.accepted.connect(self.save) # pylint: disable=no-member
 
@@ -128,6 +133,8 @@ def setService(self, service):
  self._tags_w.set_tags(service.data.tags)
  self.timeout.setValue(service.data.timeout)
  self.timeout_llu.setValue(service.data.timeout_llu)
+ self.min_memory_increase.setValue(service.data.min_memory_increase // 1024)
+ self.__service = service.data
 
  def new(self):
  """
@@ -144,6 +151,7 @@ def new(self):
  self.min_gpu_memory.setValue(self.gpu_min_mb)
  self.timeout.setValue(0)
  self.timeout_llu.setValue(0)
+ self.min_memory_increase.setValue(2048)
  self._tags_w.set_tags(['general'])
 
  def save(self):
@@ -160,6 +168,11 @@ def save(self):
  QtWidgets.QMessageBox.critical(self, "Error", "The service name must alphanumeric.")
  return
 
+ if self.min_memory_increase.value() <= 0:
+ QtWidgets.QMessageBox.critical(self, "Error",
+ "The minimum memory increase must be more than 0 MB")
+ return
+
  service = opencue.wrappers.service.Service()
  if self.__service:
  service.data.id = self.__service.data.id
@@ -171,6 +184,7 @@ def save(self):
  service.setMinGpuMemory(self.min_gpu_memory.value() * 1024)
  service.setTimeout(self.timeout.value())
  service.setTimeoutLLU(self.timeout_llu.value())
+ service.setMinMemoryIncrease(self.min_memory_increase.value() * 1024)
  service.setTags(self._tags_w.get_tags())
 
  self.saved.emit(service)
@@ -330,4 +344,4 @@ def __init__(self, show, parent=None):
  self.setWindowTitle("Services")
  self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
  self.setSizeGripEnabled(True)
- self.resize(620, 420)
+ self.resize(700, 700)