Auto-delete the down state hosts (#945)

* Add testDeleteDownHosts * Add testDeleteDownHosts
AcademySoftwareFoundation · Apr 6, 2021 · 401a33b · 401a33b
1 parent a77c1ff
commit 401a33b
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 0 deletions.
diff --git a/cuebot/src/main/java/com/imageworks/spcue/dao/HostDao.java b/cuebot/src/main/java/com/imageworks/spcue/dao/HostDao.java
@@ -65,6 +65,11 @@ public interface HostDao {
  */
  void deleteHost(HostInterface host);
 
+ /**
+ * deletes the down state hosts
+ */
+ void deleteDownHosts();
+
  /**
  * updates a host with the passed hardware state
  *

diff --git a/cuebot/src/main/java/com/imageworks/spcue/dao/oracle/HostDaoJdbc.java b/cuebot/src/main/java/com/imageworks/spcue/dao/oracle/HostDaoJdbc.java
@@ -488,6 +488,11 @@ public void deleteHost(HostInterface host) {
  "DELETE FROM host WHERE pk_host=?",host.getHostId());
  }
 
+ @Override
+ public void deleteDownHosts() {
+ // Not implemented.
+ }
+
  @Override
  public void updateHostState(HostInterface host, HardwareState state) {
  getJdbcTemplate().update(

diff --git a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/HostDaoJdbc.java b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/HostDaoJdbc.java
@@ -489,6 +489,34 @@ public void deleteHost(HostInterface host) {
  "DELETE FROM host WHERE pk_host=?",host.getHostId());
  }
 
+ private static final String DELETE_DOWN_HOST_COMMENTS =
+ "DELETE " +
+ "FROM " +
+ "comments " +
+ "USING " +
+ "host_stat " +
+ "WHERE " +
+ "comments.pk_host = host_stat.pk_host " +
+ "AND " +
+ "host_stat.str_state = ?";
+
+ private static final String DELETE_DOWN_HOSTS =
+ "DELETE " +
+ "FROM " +
+ "host " +
+ "USING " +
+ "host_stat " +
+ "WHERE " +
+ "host.pk_host = host_stat.pk_host " +
+ "AND " +
+ "host_stat.str_state=?";
+
+ @Override
+ public void deleteDownHosts() {
+ getJdbcTemplate().update(DELETE_DOWN_HOST_COMMENTS, HardwareState.DOWN.toString());
+ getJdbcTemplate().update(DELETE_DOWN_HOSTS, HardwareState.DOWN.toString());
+ }
+
  @Override
  public void updateHostState(HostInterface host, HardwareState state) {
  getJdbcTemplate().update(

diff --git a/cuebot/src/main/java/com/imageworks/spcue/service/MaintenanceManagerSupport.java b/cuebot/src/main/java/com/imageworks/spcue/service/MaintenanceManagerSupport.java
@@ -22,13 +22,16 @@
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.jdbc.CannotGetJdbcConnectionException;
 
 import com.imageworks.spcue.FrameInterface;
 import com.imageworks.spcue.MaintenanceTask;
 import com.imageworks.spcue.PointDetail;
 import com.imageworks.spcue.VirtualProc;
 import com.imageworks.spcue.dao.FrameDao;
+import com.imageworks.spcue.dao.HostDao;
 import com.imageworks.spcue.dao.MaintenanceDao;
 import com.imageworks.spcue.dao.ProcDao;
 import com.imageworks.spcue.dispatcher.DispatchSupport;
@@ -41,12 +44,17 @@ public class MaintenanceManagerSupport {
 
  private static final Logger logger = Logger.getLogger(MaintenanceManagerSupport.class);
 
+ @Autowired
+ private Environment env;
+
  private MaintenanceDao maintenanceDao;
 
  private ProcDao procDao;
 
  private FrameDao frameDao;
 
+ private HostDao hostDao;
+
  private JobManager jobManager;
 
  private DispatchSupport dispatchSupport;
@@ -90,6 +98,12 @@ public void checkHardwareState() {
  int hosts = maintenanceDao.setUpHostsToDown();
  if (hosts > 0) {
  clearDownProcs();
+
+ boolean autoDeleteDownHosts = env.getProperty(
+ "maintenance.auto_delete_down_hosts", Boolean.class, false);
+ if (autoDeleteDownHosts) {
+ hostDao.deleteDownHosts();
+ }
  }
  clearOrphanedProcs();
  } finally {
@@ -193,6 +207,10 @@ public void setFrameDao(FrameDao frameDao) {
  this.frameDao = frameDao;
  }
 
+ public void setHostDao(HostDao hostDao) {
+ this.hostDao = hostDao;
+ }
+
  public DispatchSupport getDispatchSupport() {
  return dispatchSupport;
  }

diff --git a/cuebot/src/main/resources/conf/spring/applicationContext-service.xml b/cuebot/src/main/resources/conf/spring/applicationContext-service.xml
@@ -342,6 +342,7 @@
  <property name="dispatchSupport" ref="dispatchSupport" />
  <property name="procDao" ref="procDao" />
  <property name="frameDao" ref="frameDao" />
+ <property name="hostDao" ref="hostDao" />
  <property name="maintenanceDao" ref="maintenanceDao" />
  <property name="historicalSupport" ref="historicalSupport" />
  <property name="departmentManager" ref="departmentManager" />

diff --git a/cuebot/src/main/resources/opencue.properties b/cuebot/src/main/resources/opencue.properties
@@ -56,3 +56,6 @@ dispatcher.host_frame_dispatch_max=12
 
 # Jobs will be archived to the history tables after being completed for this long.
 history.archive_jobs_cutoff_hours=72
+
+# Delete down hosts automatically.
+maintenance.auto_delete_down_hosts=false
diff --git a/cuebot/src/test/java/com/imageworks/spcue/test/dao/postgres/HostDaoTests.java b/cuebot/src/test/java/com/imageworks/spcue/test/dao/postgres/HostDaoTests.java
@@ -389,6 +389,30 @@ public void testDeleteHost() {
  assertEquals(hostDao.hostExists(TEST_HOST),false);
  }
 
+ @Test
+ @Transactional
+ @Rollback(true)
+ public void testDeleteDownHosts() {
+ for (int i = 0; i < 3; i++) {
+ String name = TEST_HOST + i;
+ hostDao.insertRenderHost(buildRenderHost(name),
+ hostManager.getDefaultAllocationDetail(),
+ false);
+ if (i != 1) {
+ HostEntity host = hostDao.findHostDetail(name);
+ assertEquals(name, host.name);
+ hostDao.updateHostState(host, HardwareState.DOWN);
+ }
+ }
+
+ hostDao.deleteDownHosts();
+
+ for (int i = 0; i < 3; i++) {
+ String name = TEST_HOST + i;
+ assertEquals(hostDao.hostExists(name), i == 1);
+ }
+ }
+
  @Test
  @Transactional
  @Rollback(true)