Skip to content
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

Changes to support CosmosDB as trigger store #201

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Changes to support CosmosDB as trigger store #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ae5027
Changes to support CosmosDB as trigger store
Oct 14, 2019
4cb0aee
Merge branch 'master' into cosmosdb-support
asteed Oct 14, 2019
1b0e66b
Fix ci formatting failures
Oct 14, 2019
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
61 changes: 50 additions & 11 deletions action/alarmWebAction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ const CronJob = require('cron').CronJob;
const moment = require('moment');
const common = require('./lib/common');
const Database = require('./lib/Database');
const config = require('./lib/config');

function main(params) {

Expand All @@ -34,7 +33,7 @@ function main(params) {
namespace: triggerParts.namespace,
additionalData: common.constructObject(params.additionalData),
};
var triggerID = config.constructTriggerID(triggerData);
var triggerID = new Database().constructTriggerID(getDBConfig(params), triggerData);

var workers = params.workers instanceof Array ? params.workers : [];
var deleteAfterFireArray = ['false', 'true', 'rules'];
Expand Down Expand Up @@ -147,7 +146,10 @@ function main(params) {
return new Promise(function (resolve, reject) {
common.verifyTriggerAuth(triggerData, false)
.then(() => {
db = new Database(params.DB_URL, params.DB_NAME);
return getDatabase(getDBConfig(params));
})
.then((database) => {
db = database;
return db.getWorkerID(workers);
})
.then((worker) => {
Expand All @@ -173,7 +175,10 @@ function main(params) {
return new Promise(function (resolve, reject) {
common.verifyTriggerAuth(triggerData, false)
.then(() => {
db = new Database(params.DB_URL, params.DB_NAME);
return getDatabase(getDBConfig(params));
})
.then((database) => {
db = database;
return db.getTrigger(triggerID);
})
.then(doc => {
Expand Down Expand Up @@ -223,7 +228,10 @@ function main(params) {

common.verifyTriggerAuth(triggerData, false)
.then(() => {
db = new Database(params.DB_URL, params.DB_NAME);
return getDatabase(getDBConfig(params));
})
.then((database) => {
db = database;
return db.getTrigger(triggerID);
})
.then(trigger => {
Expand Down Expand Up @@ -316,13 +324,13 @@ function main(params) {
if (Object.keys(updatedParams).length === 0) {
return reject(common.sendError(400, 'no updatable parameters were specified'));
}
return db.disableTrigger(trigger._id, trigger, 0, 'updating');
return db.disableTrigger(triggerID, trigger, 0, 'updating');
})
.then(triggerID => {
.then(trigger => {
return db.getTrigger(triggerID);
})
.then(trigger => {
return db.updateTrigger(trigger._id, trigger, updatedParams, 0);
return db.updateTrigger(triggerID, trigger, updatedParams, 0);
})
.then(() => {
resolve({
Expand All @@ -341,13 +349,16 @@ function main(params) {
return new Promise(function (resolve, reject) {
common.verifyTriggerAuth(triggerData, true)
.then(() => {
db = new Database(params.DB_URL, params.DB_NAME);
return getDatabase(getDBConfig(params));
})
.then((database) => {
db = database;
return db.getTrigger(triggerID);
})
.then(trigger => {
return db.disableTrigger(trigger._id, trigger, 0, 'deleting');
return db.disableTrigger(triggerID, trigger, 0, 'deleting');
})
.then(triggerID => {
.then(trigger => {
return db.deleteTrigger(triggerID, 0);
})
.then(() => {
Expand Down Expand Up @@ -392,4 +403,32 @@ function hasSecondsGranularity(cron) {
return fields.length > 5 && fields[fields.length - 6] !== '0';
}

function getDatabase(config) {
return new Promise(function (resolve, reject) {
var db = new Database();
db.initDB(config)
.then((res) =>
{
resolve(db);
})
.catch((err) => {
reject(err);
});
});
}

function getDBConfig(params) {
var config = {};
if(params) {
config = {
dburl: params.DB_URL,
dbname: params.DB_NAME,
type: params.DB_TYPE,
masterkey: params.COSMOSDB_MASTERKEY,
rootdb: params.COSMOSDB_ROOT_DB
};
}
return config;
}

exports.main = main;
7 changes: 5 additions & 2 deletions action/alarmWeb_package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
"name": "alarmWebAction",
"version": "1.0.0",
"main": "alarmWebAction.js",
"dependencies" : {
"cron": "1.7.0"
"dependencies": {
"cron": "1.7.0",
"documentdb": "^1.14.5",
"moment": "^2.12.0",
"nano": "6.4.2"
}
}
220 changes: 39 additions & 181 deletions action/lib/Database.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,209 +15,67 @@
* limitations under the License.
*/

const common = require('./common');
const Config = require('./config');

// constructor for DB object - a thin, promise-loving wrapper around nano
module.exports = function(dbURL, dbName) {
var nano = require('nano')(dbURL);
this.db = nano.db.use(dbName);
var utilsDB = this;
module.exports = function() {

this.getWorkerID = function(availabeWorkers) {

return new Promise((resolve, reject) => {
var workerID = availabeWorkers[0] || 'worker0';

if (availabeWorkers.length > 1) {
utilsDB.db.view('triggerViews', 'triggers_by_worker', {reduce: true, group: true}, function (err, body) {
if (!err) {
var triggersByWorker = {};

availabeWorkers.forEach(worker => {
triggersByWorker[worker] = 0;
});
var database = this;

body.rows.forEach(row => {
if (row.key in triggersByWorker) {
triggersByWorker[row.key] = row.value;
}
});
// init for DB object - a thin, promise-loving wrapper around nano / documentdb
this.initDB = function(config) {

// find which worker has the least number of assigned triggers
for (var worker in triggersByWorker) {
if (triggersByWorker[worker] < triggersByWorker[workerID]) {
workerID = worker;
}
}
resolve(workerID);
} else {
reject(err);
}
});
config.type = typeof config.type !== 'undefined' ? config.type : "couchdb";
var db = {};
return new Promise((resolve, reject) => {
if(config.type === "couchdb") {
console.log("using couchdb");
var couchdb = require('./couchdb');
db = new couchdb(config.dburl, config.dbname);
database.utilsDB = db;
resolve();
}
else {
resolve(workerID);
else if(config.type === "cosmosdb") {
console.log("using cosmosdb");
var cosmosdb = require('./cosmosdb');
db = new cosmosdb(config.dburl, config.masterkey);
db.init(config.rootdb, config.dbname)
.then((res) => {
database.utilsDB = db;
resolve();
});
}
else
reject("type must be couchdb or cosmosdb; found " + config.type);
});
};

this.createTrigger = function(triggerID, newTrigger) {
this.constructTriggerID = function(config, triggerData) {
config.type = typeof config.type !== 'undefined' ? config.type : "couchdb";
var supportsSlash = config.type === "cosmosdb" ? false : true;
return Config.constructTriggerID(triggerData, supportsSlash);
};

return new Promise(function(resolve, reject) {
this.getWorkerID = function(availabeWorkers) {
return database.utilsDB.getWorkerID(availabeWorkers);
};

utilsDB.db.insert(newTrigger, triggerID, function (err) {
if (!err) {
resolve();
}
else {
reject(common.sendError(err.statusCode, 'error creating alarm trigger.', err.message));
}
});
});
this.createTrigger = function(triggerID, newTrigger) {
return database.utilsDB.createTrigger(triggerID, newTrigger);
};

this.getTrigger = function(triggerID, retry = true) {

return new Promise(function(resolve, reject) {

var qName = triggerID.split('/');
var id = retry ? triggerID : qName[0] + '/_/' + qName[2];
utilsDB.db.get(id, function (err, existing) {
if (err) {
if (retry) {
utilsDB.getTrigger(triggerID, false)
.then(doc => {
resolve(doc);
})
.catch(err => {
reject(err);
});
} else {
var name = '/' + qName[1] + '/' + qName[2];
reject(common.sendError(err.statusCode, 'could not find trigger ' + name + ' in the database'));
}
} else {
resolve(existing);
}
});
});
return database.utilsDB.getTrigger(triggerID, retry);
};

this.disableTrigger = function(triggerID, trigger, retryCount, crudMessage) {

if (retryCount === 0) {
//check if it is already disabled
if (trigger.status && trigger.status.active === false) {
return Promise.resolve(triggerID);
}

var message = `Automatically disabled trigger while ${crudMessage}`;
var status = {
'active': false,
'dateChanged': Date.now(),
'reason': {'kind': 'AUTO', 'statusCode': undefined, 'message': message}
};
trigger.status = status;
}

return new Promise(function(resolve, reject) {

utilsDB.db.insert(trigger, triggerID, function (err) {
if (err) {
if (err.statusCode === 409 && retryCount < 5) {
setTimeout(function () {
utilsDB.disableTrigger(triggerID, trigger, (retryCount + 1))
.then(id => {
resolve(id);
})
.catch(err => {
reject(err);
});
}, 1000);
}
else {
reject(common.sendError(err.statusCode, 'there was an error while disabling the trigger in the database.', err.message));
}
}
else {
resolve(triggerID);
}
});
});

return database.utilsDB.disableTrigger(triggerID, trigger, retryCount, crudMessage);
};

this.deleteTrigger = function(triggerID, retryCount) {

return new Promise(function(resolve, reject) {

utilsDB.db.get(triggerID, function (err, existing) {
if (!err) {
utilsDB.db.destroy(existing._id, existing._rev, function (err) {
if (err) {
if (err.statusCode === 409 && retryCount < 5) {
setTimeout(function () {
utilsDB.deleteTrigger(triggerID, (retryCount + 1))
.then(resolve)
.catch(err => {
reject(err);
});
}, 1000);
}
else {
reject(common.sendError(err.statusCode, 'there was an error while deleting the trigger from the database.', err.message));
}
}
else {
resolve();
}
});
}
else {
var qName = triggerID.split('/');
var name = '/' + qName[1] + '/' + qName[2];
reject(common.sendError(err.statusCode, 'could not find trigger ' + name + ' in the database'));
}
});
});
return database.utilsDB.deleteTrigger(triggerID, retryCount);
};

this.updateTrigger = function(triggerID, trigger, params, retryCount) {

if (retryCount === 0) {
for (var key in params) {
trigger[key] = params[key];
}
var status = {
'active': true,
'dateChanged': Date.now()
};
trigger.status = status;
}

return new Promise(function(resolve, reject) {
utilsDB.db.insert(trigger, triggerID, function (err) {
if (err) {
if (err.statusCode === 409 && retryCount < 5) {
setTimeout(function () {
utilsDB.updateTrigger(triggerID, trigger, params, (retryCount + 1))
.then(id => {
resolve(id);
})
.catch(err => {
reject(err);
});
}, 1000);
}
else {
reject(common.sendError(err.statusCode, 'there was an error while updating the trigger in the database.', err.message));
}
}
else {
resolve(triggerID);
}
});
});
return database.utilsDB.updateTrigger(triggerID, trigger, params, retryCount);
};

};
7 changes: 4 additions & 3 deletions action/lib/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ function getOpenWhiskConfig(triggerData) {
return {ignore_certs: true, namespace: triggerData.namespace, api_key: triggerData.apikey};
}

function constructTriggerID(triggerData) {
var triggerID = `${triggerData.namespace}/${triggerData.name}`;
function constructTriggerID(triggerData, supportsSlash) {
var sep = supportsSlash ? '/' : '|';
var triggerID = `${triggerData.namespace}${sep}${triggerData.name}`;
if (triggerData.apikey) {
triggerID = `${triggerData.apikey}/${triggerID}`;
triggerID = `${triggerData.apikey}${sep}${triggerID}`;
}
return triggerID;
}
Expand Down
Loading