AMBARI-4256. Time interval between batches in a request_schedule should be in seconds. (swagle)

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java

@@ -31,7 +31,6 @@ import org.apache.ambari.server.controller.spi.Request;
 import org.apache.ambari.server.controller.spi.RequestStatus;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
-import org.apache.ambari.server.controller.spi.ResourcePredicateEvaluator;
 import org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
@@ -43,7 +42,6 @@ import org.apache.ambari.server.state.scheduler.BatchSettings;
 import org.apache.ambari.server.state.scheduler.RequestExecution;
 import org.apache.ambari.server.state.scheduler.RequestExecutionFactory;
 import org.apache.ambari.server.state.scheduler.Schedule;
-import org.apache.ambari.server.utils.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -83,7 +81,7 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP
     PropertyHelper.getPropertyId("RequestSchedule", "update_time");
 
   protected static final String REQUEST_SCHEDULE_BATCH_SEPARATION_PROPERTY_ID =
-    PropertyHelper.getPropertyId("batch_settings", "batch_separation_in_minutes");
+    PropertyHelper.getPropertyId("batch_settings", "batch_separation_in_seconds");
   protected static final String REQUEST_SCHEDULE_BATCH_TOLERATION_PROPERTY_ID =
     PropertyHelper.getPropertyId("batch_settings", "task_failure_tolerance");
   protected static final String REQUEST_SCHEDULE_BATCH_REQUESTS_PROPERTY_ID =
@@ -573,7 +571,7 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP
                   ((String) batchMapEntry.getValue()));
               } else if (batchMapEntry.getKey().equals
                   (REQUEST_SCHEDULE_BATCH_SEPARATION_PROPERTY_ID)) {
-                batchSettings.setBatchSeparationInMinutes(Integer.valueOf
+                batchSettings.setBatchSeparationInSeconds(Integer.valueOf
                   ((String) batchMapEntry.getValue()));
               } else if (batchMapEntry.getKey().equals
                   (REQUEST_SCHEDULE_BATCH_REQUESTS_PROPERTY_ID)) {

ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestScheduleEntity.java

@@ -63,8 +63,8 @@ public class RequestScheduleEntity {
   @Column(name = "status")
   private String status;
 
-  @Column(name = "batch_separation_minutes")
-  private Integer batchSeparationInMinutes;
+  @Column(name = "batch_separation_seconds")
+  private Integer batchSeparationInSeconds;
 
   @Column(name = "batch_toleration_limit")
   private Integer batchTolerationLimit;
@@ -148,12 +148,12 @@ public class RequestScheduleEntity {
     this.status = status;
   }
 
-  public Integer getBatchSeparationInMinutes() {
-    return batchSeparationInMinutes;
+  public Integer getBatchSeparationInSeconds() {
+    return batchSeparationInSeconds;
   }
 
-  public void setBatchSeparationInMinutes(Integer batchSeparationInMinutes) {
-    this.batchSeparationInMinutes = batchSeparationInMinutes;
+  public void setBatchSeparationInSeconds(Integer batchSeparationInMinutes) {
+    this.batchSeparationInSeconds = batchSeparationInMinutes;
   }
 
   public Integer getBatchTolerationLimit() {

ambari-server/src/main/java/org/apache/ambari/server/scheduler/AbstractLinearExecutionJob.java

@@ -88,11 +88,11 @@ public abstract class AbstractLinearExecutionJob implements ExecutionJob {
     JobDataMap jobDataMap = context.getMergedJobDataMap();
     String nextJobName = jobDataMap.getString(NEXT_EXECUTION_JOB_NAME_KEY);
     String nextJobGroup = jobDataMap.getString(NEXT_EXECUTION_JOB_GROUP_KEY);
-    Integer separationMinutes = jobDataMap.getIntegerFromString(
-      (NEXT_EXECUTION_SEPARATION_MINUTES));
+    Integer separationSeconds = jobDataMap.getIntegerFromString(
+      (NEXT_EXECUTION_SEPARATION_SECONDS));
 
-    if (separationMinutes == null) {
-      separationMinutes = 0;
+    if (separationSeconds == null) {
+      separationSeconds = 0;
     }
 
     // Create trigger for next job execution
@@ -100,7 +100,7 @@ public abstract class AbstractLinearExecutionJob implements ExecutionJob {
       .forJob(nextJobName, nextJobGroup)
       .withIdentity("TriggerForJob-" + nextJobName, LINEAR_EXECUTION_TRIGGER_GROUP)
       .withSchedule(simpleSchedule().withMisfireHandlingInstructionFireNow())
-      .startAt(futureDate(separationMinutes, DateBuilder.IntervalUnit.MINUTE))
+      .startAt(futureDate(separationSeconds, DateBuilder.IntervalUnit.SECOND))
       .build();
 
     executionScheduleManager.scheduleJob(trigger);

ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionJob.java

@@ -25,7 +25,7 @@ import org.quartz.Job;
 public interface ExecutionJob extends Job {
   public static final String NEXT_EXECUTION_JOB_NAME_KEY = "ExecutionJob.Name";
   public static final String NEXT_EXECUTION_JOB_GROUP_KEY = "ExecutionJob.Group";
-  public static final String NEXT_EXECUTION_SEPARATION_MINUTES =
+  public static final String NEXT_EXECUTION_SEPARATION_SECONDS =
     "ExecutionJob.SeparationMinutes";
   public static final String LINEAR_EXECUTION_JOB_GROUP =
     "LinearExecutionJobs";

ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/BatchSettings.java

@@ -21,17 +21,17 @@ import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 public class BatchSettings {
-  private Integer batchSeparationInMinutes;
+  private Integer batchSeparationInSeconds;
   private Integer taskFailureTolerance;
 
   @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY)
-  @JsonProperty("batch_separation_in_minutes")
-  public Integer getBatchSeparationInMinutes() {
-    return batchSeparationInMinutes;
+  @JsonProperty("batch_separation_in_seconds")
+  public Integer getBatchSeparationInSeconds() {
+    return batchSeparationInSeconds;
   }
 
-  public void setBatchSeparationInMinutes(Integer batchSeparationInMinutes) {
-    this.batchSeparationInMinutes = batchSeparationInMinutes;
+  public void setBatchSeparationInSeconds(Integer batchSeparationInSeconds) {
+    this.batchSeparationInSeconds = batchSeparationInSeconds;
   }
 
   @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY)

ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/RequestExecutionImpl.java

@@ -100,7 +100,7 @@ public class RequestExecutionImpl implements RequestExecution {
     schedule = new Schedule();
 
     BatchSettings batchSettings = new BatchSettings();
-    batchSettings.setBatchSeparationInMinutes(requestScheduleEntity.getBatchSeparationInMinutes());
+    batchSettings.setBatchSeparationInSeconds(requestScheduleEntity.getBatchSeparationInSeconds());
     batchSettings.setTaskFailureToleranceLimit(requestScheduleEntity.getBatchTolerationLimit());
 
     batch.setBatchSettings(batchSettings);
@@ -309,7 +309,7 @@ public class RequestExecutionImpl implements RequestExecution {
     if (batch != null) {
       BatchSettings settings = batch.getBatchSettings();
       if (settings != null) {
-        requestScheduleEntity.setBatchSeparationInMinutes(settings.getBatchSeparationInMinutes());
+        requestScheduleEntity.setBatchSeparationInSeconds(settings.getBatchSeparationInSeconds());
         requestScheduleEntity.setBatchTolerationLimit(settings.getTaskFailureToleranceLimit());
       }
     }

ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql

@@ -52,7 +52,7 @@ CREATE TABLE ambari_sequences (sequence_name VARCHAR(255), value DECIMAL(38) NOT
 CREATE TABLE confgroupclusterconfigmapping (config_group_id BIGINT NOT NULL, cluster_id BIGINT NOT NULL, config_type VARCHAR(255) NOT NULL, version_tag VARCHAR(255) NOT NULL, user_name VARCHAR(255) DEFAULT '_db', create_timestamp BIGINT NOT NULL, PRIMARY KEY(config_group_id, cluster_id, config_type));
 CREATE TABLE configgroup (group_id BIGINT, cluster_id BIGINT NOT NULL, group_name VARCHAR(255) NOT NULL, tag VARCHAR(1024) NOT NULL, description VARCHAR(1024), create_timestamp BIGINT NOT NULL, PRIMARY KEY(group_id));
 CREATE TABLE configgrouphostmapping (config_group_id BIGINT NOT NULL, host_name VARCHAR(255) NOT NULL, PRIMARY KEY(config_group_id, host_name));
-CREATE TABLE requestschedule (schedule_id bigint, cluster_id BIGINT NOT NULL, description varchar(255), status varchar(255), batch_separation_minutes smallint, batch_toleration_limit smallint, create_user varchar(255), create_timestamp bigint, update_user varchar(255), update_timestamp bigint, minutes varchar(10), hours varchar(10), days_of_month varchar(10), month varchar(10), day_of_week varchar(10), yearToSchedule varchar(10), startTime varchar(50), endTime varchar(50), last_execution_status varchar(255), PRIMARY KEY(schedule_id));
+CREATE TABLE requestschedule (schedule_id bigint, cluster_id BIGINT NOT NULL, description varchar(255), status varchar(255), batch_separation_seconds smallint, batch_toleration_limit smallint, create_user varchar(255), create_timestamp bigint, update_user varchar(255), update_timestamp bigint, minutes varchar(10), hours varchar(10), days_of_month varchar(10), month varchar(10), day_of_week varchar(10), yearToSchedule varchar(10), startTime varchar(50), endTime varchar(50), last_execution_status varchar(255), PRIMARY KEY(schedule_id));
 CREATE TABLE requestschedulebatchrequest (schedule_id bigint, batch_id bigint, request_id bigint, request_type varchar(255), request_uri varchar(1024), request_body LONGBLOB, request_status varchar(255), return_code smallint, return_message varchar(255), PRIMARY KEY(schedule_id, batch_id));
 CREATE TABLE action (action_name VARCHAR(255) NOT NULL, action_type VARCHAR(32) NOT NULL, inputs VARCHAR(1000), target_service VARCHAR(255), target_component VARCHAR(255), default_timeout SMALLINT NOT NULL, description VARCHAR(1000), target_type VARCHAR(32), PRIMARY KEY (action_name));
 

ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql

@@ -43,7 +43,7 @@ CREATE TABLE configgroup (group_id NUMBER(19), cluster_id NUMBER(19) NOT NULL, g
 CREATE TABLE confgroupclusterconfigmapping (config_group_id NUMBER(19) NOT NULL, cluster_id NUMBER(19) NOT NULL, config_type VARCHAR2(255) NOT NULL, version_tag VARCHAR2(255) NOT NULL, user_name VARCHAR2(255) DEFAULT '_db', create_timestamp NUMBER(19) NOT NULL, PRIMARY KEY(config_group_id, cluster_id, config_type));
 CREATE TABLE configgrouphostmapping (config_group_id NUMBER(19) NOT NULL, host_name VARCHAR2(255) NOT NULL, PRIMARY KEY(config_group_id, host_name));
 CREATE TABLE action (action_name VARCHAR2(255) NOT NULL, action_type VARCHAR2(255) NOT NULL, inputs VARCHAR2(1024), target_service VARCHAR2(255), target_component VARCHAR2(255), default_timeout NUMBER(10) NOT NULL, description VARCHAR2(1024), target_type VARCHAR2(255), PRIMARY KEY (action_name));
-CREATE TABLE ambari.requestschedule (schedule_id NUMBER(19), cluster_id NUMBER(19) NOT NULL, description VARCHAR2(255), status VARCHAR2(255), batch_separation_minutes smallint, batch_toleration_limit smallint, create_user VARCHAR2(255), create_timestamp NUMBER(19), update_user VARCHAR2(255), update_timestamp NUMBER(19), minutes VARCHAR2(10), hours VARCHAR2(10), days_of_month VARCHAR2(10), month VARCHAR2(10), day_of_week VARCHAR2(10), yearToSchedule VARCHAR2(10), startTime VARCHAR2(50), endTime VARCHAR2(50), last_execution_status VARCHAR2(255), PRIMARY KEY(schedule_id));
+CREATE TABLE ambari.requestschedule (schedule_id NUMBER(19), cluster_id NUMBER(19) NOT NULL, description VARCHAR2(255), status VARCHAR2(255), batch_separation_seconds smallint, batch_toleration_limit smallint, create_user VARCHAR2(255), create_timestamp NUMBER(19), update_user VARCHAR2(255), update_timestamp NUMBER(19), minutes VARCHAR2(10), hours VARCHAR2(10), days_of_month VARCHAR2(10), month VARCHAR2(10), day_of_week VARCHAR2(10), yearToSchedule VARCHAR2(10), startTime VARCHAR2(50), endTime VARCHAR2(50), last_execution_status VARCHAR2(255), PRIMARY KEY(schedule_id));
 CREATE TABLE ambari.requestschedulebatchrequest (schedule_id NUMBER(19), batch_id NUMBER(19), request_id NUMBER(19), request_type VARCHAR2(255), request_uri VARCHAR2(1024), request_body BLOB, request_status VARCHAR2(255), return_code smallint, return_message VARCHAR2(255), PRIMARY KEY(schedule_id, batch_id));
 
 ALTER TABLE users ADD CONSTRAINT UNQ_users_0 UNIQUE (user_name, ldap_user);

ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql

@@ -110,7 +110,7 @@ GRANT ALL PRIVILEGES ON TABLE ambari.configgrouphostmapping TO :username;
 CREATE TABLE ambari.action (action_name VARCHAR(255) NOT NULL, action_type VARCHAR(32) NOT NULL, inputs VARCHAR(1000), target_service VARCHAR(255), target_component VARCHAR(255), default_timeout SMALLINT NOT NULL, description VARCHAR(1000), target_type VARCHAR(32), PRIMARY KEY (action_name));
 GRANT ALL PRIVILEGES ON TABLE ambari.action TO :username;
 
-CREATE TABLE ambari.requestschedule (schedule_id bigint, cluster_id bigint NOT NULL, description varchar(255), status varchar(255), batch_separation_minutes smallint, batch_toleration_limit smallint, create_user varchar(255), create_timestamp bigint, update_user varchar(255), update_timestamp bigint, minutes varchar(10), hours varchar(10), days_of_month varchar(10), month varchar(10), day_of_week varchar(10), yearToSchedule varchar(10), startTime varchar(50), endTime varchar(50), last_execution_status varchar(255), PRIMARY KEY(schedule_id));
+CREATE TABLE ambari.requestschedule (schedule_id bigint, cluster_id bigint NOT NULL, description varchar(255), status varchar(255), batch_separation_seconds smallint, batch_toleration_limit smallint, create_user varchar(255), create_timestamp bigint, update_user varchar(255), update_timestamp bigint, minutes varchar(10), hours varchar(10), days_of_month varchar(10), month varchar(10), day_of_week varchar(10), yearToSchedule varchar(10), startTime varchar(50), endTime varchar(50), last_execution_status varchar(255), PRIMARY KEY(schedule_id));
 GRANT ALL PRIVILEGES ON TABLE ambari.requestschedule TO :username;
 
 CREATE TABLE ambari.requestschedulebatchrequest (schedule_id bigint, batch_id bigint, request_id bigint, request_type varchar(255), request_uri varchar(1024), request_body BYTEA, request_status varchar(255), return_code smallint, return_message varchar(255), PRIMARY KEY(schedule_id, batch_id));

ambari-server/src/main/resources/Ambari-DDL-Postgres-REMOTE-CREATE.sql

@@ -45,7 +45,7 @@ CREATE TABLE ambari.ambari_sequences (sequence_name VARCHAR(255) PRIMARY KEY, "v
 CREATE TABLE ambari.configgroup (group_id BIGINT, cluster_id BIGINT NOT NULL, group_name VARCHAR(255) NOT NULL, tag VARCHAR(1024) NOT NULL, description VARCHAR(1024), create_timestamp BIGINT NOT NULL, PRIMARY KEY(group_id));
 CREATE TABLE ambari.confgroupclusterconfigmapping (config_group_id BIGINT NOT NULL, cluster_id BIGINT NOT NULL, config_type VARCHAR(255) NOT NULL, version_tag VARCHAR(255) NOT NULL, user_name VARCHAR(255) DEFAULT '_db', create_timestamp BIGINT NOT NULL, PRIMARY KEY(config_group_id, cluster_id, config_type));
 CREATE TABLE ambari.configgrouphostmapping (config_group_id BIGINT NOT NULL, host_name VARCHAR(255) NOT NULL, PRIMARY KEY(config_group_id, host_name));
-CREATE TABLE ambari.requestschedule (schedule_id bigint, cluster_id BIGINT NOT NULL, status varchar(255), batch_separation_minutes smallint, batch_toleration_limit smallint, create_user varchar(255), create_timestamp bigint, update_user varchar(255), update_timestamp bigint, minutes varchar(10), hours varchar(10), days_of_month varchar(10), month varchar(10), day_of_week varchar(10), yearToSchedule varchar(10), startTime varchar(50), endTime varchar(50), last_execution_status varchar(255), PRIMARY KEY(schedule_id));
+CREATE TABLE ambari.requestschedule (schedule_id bigint, cluster_id BIGINT NOT NULL, status varchar(255), batch_separation_seconds smallint, batch_toleration_limit smallint, create_user varchar(255), create_timestamp bigint, update_user varchar(255), update_timestamp bigint, minutes varchar(10), hours varchar(10), days_of_month varchar(10), month varchar(10), day_of_week varchar(10), yearToSchedule varchar(10), startTime varchar(50), endTime varchar(50), last_execution_status varchar(255), PRIMARY KEY(schedule_id));
 CREATE TABLE ambari.requestschedulebatchrequest (schedule_id bigint, batch_id bigint, request_id bigint, request_type varchar(255), request_uri varchar(1024), request_body BYTEA, request_status varchar(255), return_code smallint, return_message varchar(255), PRIMARY KEY(schedule_id, batch_id));
 
 ALTER TABLE ambari.clusterconfig ADD CONSTRAINT FK_clusterconfig_cluster_id FOREIGN KEY (cluster_id) REFERENCES ambari.clusters (cluster_id);