Skip to content

Task Scheduler Implementation #988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 29, 2016
Merged

Task Scheduler Implementation #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46b433d
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Nov 25, 2016
ccdc58e
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Nov 28, 2016
c8e0db9
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Nov 28, 2016
e2d614b
Task Scheduler Implementation
Durgesh1988 Nov 28, 2016
74d8be0
Task Scheduler Implementation
Durgesh1988 Nov 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,10 @@
$scope.repeatPattern = 'Repeat Every -' + $scope.chefJenkScriptTaskObj.repeats;
$scope.cronDetails = {
cronStartOn : $scope.chefJenkScriptTaskObj.cronStart,
cronStartEnd : $scope.chefJenkScriptTaskObj.cronEnd,
cronEndOn : $scope.chefJenkScriptTaskObj.cronEnd,
cronRepeatEvery : $scope.chefJenkScriptTaskObj.repeatBy,
cronFrequency: $scope.chefJenkScriptTaskObj.repeats,
cronTime: startTimeHour + ':' + startTimeMinute,
cronTime: typeof startTimeHour !=='undefined'? startTimeHour : new Date().getHours() + ':' + typeof startTimeMinute !=='undefined'? startTimeMinute:new Date().getMinutes(),
cronDays: $scope.chefJenkScriptTaskObj.dayOfWeek,
cronMonth: $scope.chefJenkScriptTaskObj.monthOfYear
}
Expand Down
50 changes: 47 additions & 3 deletions server/app/cronjobs/catalyst-scheduler/catalystScheduler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var instancesDao = require('_pr/model/classes/instance/instance');
var taskDao = require('_pr/model/classes/tasks/tasks.js');
var schedulerService = require('_pr/services/schedulerService');
var async = require('async');
var cronTab = require('node-crontab');

var catalystSync = module.exports = {};

Expand All @@ -16,6 +17,9 @@ catalystSync.executeScheduledInstances = function executeScheduledInstances() {
var resultList =[];
for (var i = 0; i < instances.length; i++) {
(function(instance) {
if(instance.cronJobIds && instance.cronJobIds !== null){
cronTab.cancelJobIds(instance.cronJobIds);
}
resultList.push(function(callback){schedulerService.executeSchedulerForInstances(instance,callback);});
if(resultList.length === instances.length){
async.parallel(resultList,function(err,results){
Expand Down Expand Up @@ -43,12 +47,52 @@ catalystSync.executeScheduledTasks = function executeScheduledTasks() {
return;
}
if (tasks && tasks.length) {
var resultList =[];
var resultList =[],parallelTaskList=[],serialTaskList=[];
for (var i = 0; i < tasks.length; i++) {
(function(task) {
resultList.push(function(callback){schedulerService.executeSchedulerForTasks(task,callback);});
if(task.cronJobId && task.cronJobId !== null){
cronTab.cancelJob(task.cronJobId);
}
if(task.executionOrder === 'PARALLEL'){
resultList.push(function(callback){schedulerService.executeSchedulerForTasks(task,callback);});
parallelTaskList.push(function(callback){schedulerService.executeSchedulerForTasks(task,callback);});
}else{
resultList.push(function(callback){schedulerService.executeSchedulerForTasks(task,callback);});
if(serialTaskList.length ===0) {
serialTaskList.push(function (next) {
schedulerService.executeSchedulerForTasks(task, next);
});
}else{
serialTaskList.push(function (execution,next) {
schedulerService.executeSchedulerForTasks(task, next);
});
}
}
if(resultList.length === tasks.length){
async.parallel(resultList,function(err,results){
async.parallel({
parallelTask: function(callback){
async.parallel(parallelTaskList,function(err,data){
if(err){
callback(err,null);
return;
}
logger.debug("Parallel Task Scheduler Completed");
callback(null,data);
return;
})
},
serialTask: function(callback){
async.waterfall(serialTaskList,function(err,data){
if(err){
callback(err,null);
return;
}
logger.debug("Serial Task Scheduler Completed");
callback(null,data);
return;
})
}
},function(err,results){
if(err){
logger.error(err);
return;
Expand Down
7 changes: 6 additions & 1 deletion server/app/model/classes/tasks/tasks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@ var taskSchema = new Schema({
required: false,
default:false
},
executionOrder:{
type: String,
required: false,
trim: true
},
taskScheduler:{
cronStartOn: {
type: String,
Expand All @@ -147,7 +152,7 @@ var taskSchema = new Schema({
required: false,
trim: true
},
cronPatten: {
cronPattern: {
type: String,
required: false,
trim: true
Expand Down
18 changes: 5 additions & 13 deletions server/app/routes/v1.0/routes_organizations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ var Docker = require('_pr/model/docker.js');
var orgValidator = require('_pr/validators/organizationValidator');
var validate = require('express-validation');
var taskService = require('_pr/services/taskService');
var schedulerService = require('_pr/services/schedulerService');
var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
var compositeBlueprintModel = require('_pr/model/composite-blueprints/composite-blueprints.js');
var Cryptography = require('_pr/lib/utils/cryptography');
var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js');

module.exports.setRoutes = function(app, sessionVerification) {
/*
Expand Down Expand Up @@ -975,8 +975,8 @@ module.exports.setRoutes = function(app, sessionVerification) {
taskData.orgName = project[0].orgname;
taskData.bgName = project[0].productgroupname;
taskData.projectName = project[0].projectname;
if(req.body.taskScheduler && req.body.taskScheduler !== null) {
taskData.taskScheduler = apiUtil.createCronJobPattern(req.body.taskScheduler);
if(taskData.taskScheduler && taskData.taskScheduler !== null) {
taskData.taskScheduler = apiUtil.createCronJobPattern(taskData.taskScheduler);
taskData.isTaskScheduled = true;
}
configmgmtDao.getEnvNameFromEnvId(req.params.envId, function(err, envName) {
Expand All @@ -1000,11 +1000,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
return;
}
if(task.isTaskScheduled === true){
schedulerService.executeSchedulerForTasks(task,function(err,data){
if(err){
logger.error("Error in executing task scheduler");
}
})
catalystSync.executeScheduledTasks();
};
res.send(task);
logger.debug("Exit post() for /organizations/%s/businessGroups/%s/projects/%s/environments/%s/tasks", req.params.orgId, req.params.bgId, req.params.projectId, req.params.environments);
Expand All @@ -1019,11 +1015,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
return;
}
if(task.isTaskScheduled === true){
schedulerService.executeSchedulerForTasks(task,function(err,data){
if(err){
logger.error("Error in executing task scheduler");
}
})
catalystSync.executeScheduledTasks();
};
res.send(task);
logger.debug("Exit post() for /organizations/%s/businessGroups/%s/projects/%s/environments/%s/tasks", req.params.orgId, req.params.bgId, req.params.projectId, req.params.environments);
Expand Down
13 changes: 3 additions & 10 deletions server/app/routes/v1.0/routes_tasks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ var async = require('async');
var apiUtil = require('_pr/lib/utils/apiUtil.js');
var Cryptography = require('_pr/lib/utils/cryptography');
var schedulerService = require('_pr/services/schedulerService');
var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js');



Expand Down Expand Up @@ -542,11 +543,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
}
if (updateCount) {
if(taskData.isTaskScheduled === true){
schedulerService.executeSchedulerForTasks(task,function(err,data){
if(err){
logger.error("Error in executing task scheduler");
}
})
catalystSync.executeScheduledTasks();
};
res.send({
updateCount: updateCount
Expand All @@ -567,11 +564,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
}
if (updateCount) {
if(taskData.isTaskScheduled === true){
schedulerService.executeSchedulerForTasks(task,function(err,data){
if(err){
logger.error("Error in executing task scheduler");
}
})
catalystSync.executeScheduledTasks();
};
res.send({
updateCount: updateCount
Expand Down
2 changes: 1 addition & 1 deletion server/app/services/auditTrailService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){
for(var i = 0; i < botAuditTrail.length; i++){
(function(auditTrail){
count++;
if(auditTrail.endedOn && auditTrail.endedOn !== null) {
if(auditTrail.endedOn && auditTrail.endedOn !== null && auditTrail.actionStatus !== 'failed') {
var executionTime = getExecutionTime(auditTrail.endedOn, auditTrail.startedOn);
totalTimeInSeconds = totalTimeInSeconds + (600 - executionTime);
}
Expand Down
25 changes: 2 additions & 23 deletions server/app/services/instanceService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var AppData = require('_pr/model/app-deploy/app-data');
var instancesDao = require('_pr/model/classes/instance/instance');
var providerService = require('_pr/services/providerService.js');
var schedulerService = require('_pr/services/schedulerService.js');
var crontab = require('node-crontab');
var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js');


var instanceService = module.exports = {};
Expand Down Expand Up @@ -1473,34 +1473,13 @@ function updateScheduler(instanceScheduler, callback) {
function(schedulerDetails,next){
schedulerDetails.interval = instanceScheduler.interval;
instancesDao.updateScheduler(instanceScheduler.instanceIds, schedulerDetails,next);
},
function(updateSchedulerDetails,next){
instancesDao.getInstances(instanceScheduler.instanceIds,next);
}
],function(err,results){
if(err){
return callback(err, null);
}else{
callback(null, {"message": "Scheduler Updated."});
var resultList =[];
for (var i = 0; i < results.length; i++) {
(function(instance) {
if(instance.cronJobIds && instance.cronJobIds.length > 0){
crontab.cancelJobIds(instance.cronJobIds);
}
resultList.push(function(callback){schedulerService.executeSchedulerForInstances(instance,callback);});
if(resultList.length === results.length){
async.parallel(resultList,function(err,results){
if(err){
logger.error(err);
return;
}
logger.debug("Instance Scheduler Results>>"+results);
return;
})
}
})(results[i]);
}
catalystSync.executeScheduledInstances();
return;
}
});
Expand Down