[cloudstack] branch master updated: Externalize OOBM background task's interval (#4881)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new 06744c1  Externalize OOBM background task's interval (#4881)
06744c1 is described below

commit 06744c16ba308a01ef839d4d3154260423e514e8
Author: Daniel Augusto Veronezi Salvador 
<38945620+gutoveron...@users.noreply.github.com>
AuthorDate: Tue May 25 06:42:53 2021 -0300

    Externalize OOBM background task's interval (#4881)
    
    * Externalize OOBM background task's interval
    
    * Rename variable
    
    Co-authored-by: Daniel Augusto Veronezi Salvador <dan...@scclouds.com.br>
---
 .../cloudstack/outofbandmanagement/OutOfBandManagementService.java    | 3 +++
 .../outofbandmanagement/OutOfBandManagementServiceImpl.java           | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementService.java
 
b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementService.java
index a8b73b7..d670e4d 100644
--- 
a/api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementService.java
+++ 
b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementService.java
@@ -33,6 +33,9 @@ public interface OutOfBandManagementService {
     ConfigKey<Integer> SyncThreadPoolSize = new ConfigKey<Integer>("Advanced", 
Integer.class, "outofbandmanagement.sync.poolsize", "50",
             "The out of band management background sync thread pool size", 
true, ConfigKey.Scope.Global);
 
+    ConfigKey<Integer> OutOfBandManagementBackgroundTaskExecutionInterval = 
new ConfigKey<>("Advanced", Integer.class, 
"outofbandmanagement.background.task.execution.interval", "4",
+            "The interval in seconds for the out of band management (OOBM) 
background task.", true);
+
     long getId();
     boolean isOutOfBandManagementEnabled(Host host);
     void submitBackgroundPowerSyncTask(Host host);
diff --git 
a/server/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceImpl.java
 
b/server/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceImpl.java
index 7b09d29..89f6ae7 100644
--- 
a/server/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceImpl.java
+++ 
b/server/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceImpl.java
@@ -534,7 +534,7 @@ public class OutOfBandManagementServiceImpl extends 
ManagerBase implements OutOf
 
     @Override
     public ConfigKey<?>[] getConfigKeys() {
-        return new ConfigKey<?>[] {ActionTimeout, SyncThreadPoolSize};
+        return new ConfigKey<?>[] {ActionTimeout, SyncThreadPoolSize, 
OutOfBandManagementBackgroundTaskExecutionInterval};
     }
 
     public List<OutOfBandManagementDriver> getOutOfBandManagementDrivers() {
@@ -578,7 +578,7 @@ public class OutOfBandManagementServiceImpl extends 
ManagerBase implements OutOf
 
         @Override
         public Long getDelay() {
-            return null;
+            return OutOfBandManagementBackgroundTaskExecutionInterval.value() 
* 1000L;
         }
 
     }