cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Terminate backend when cancel did not work

Browse Source
This commit is contained in:
Daniel García Aubert 2019-05-27 15:11:52 +02:00
parent 19b9aab042
commit c0b5997745
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/services/stream_copy.js
View File

@ -8,7 +8,8 @@ const ACTION_TO = 'to';
const ACTION_FROM = 'from';
const DEFAULT_TIMEOUT = "'5h'";
const cancelQuery = pid => `SELECT pg_cancel_backend(${pid})`;
const cancelQuery = pid => `SELECT pg_cancel_backend(${pid}) as cancelled`;
const terminateQuery = pid => `SELECT pg_terminate_backend(${pid}) as terminated`;
const timeoutQuery = timeout => `SET statement_timeout=${timeout}`;
module.exports = class StreamCopy {
@ -70,20 +71,34 @@ module.exports = class StreamCopy {
cancel () {
const pid = this.clientProcessID;
const pg = new PSQL(this.dbParams);
const actionType = this.action === ACTION_TO ? ACTION_TO : ACTION_FROM;
pg.query(cancelQuery(pid), (err, result) => {
if (err) {
return this.logger.error(err);
}
const actionType = this.action === ACTION_TO ? ACTION_TO : ACTION_FROM;
const isCancelled = result.rows[0].pg_cancel_backend;
const isCancelled = result.rows.length && result.rows[0].cancelled;
if (!isCancelled) {
return this.logger.error(new Error(`Unable to cancel "copy ${actionType}" stream query (pid: ${pid})`));
if (isCancelled) {
return this.logger.info(`Canceled "copy ${actionType}" stream query successfully (pid: ${pid})`);
}
return this.logger.info(`Canceled "copy ${actionType}" stream query successfully (pid: ${pid})`);
return pg.query(terminateQuery(pid), (err, result) => {
if (err) {
return this.logger.error(err);
}
const isTerminated = result.rows.length && result.rows[0].terminated;
if (!isTerminated) {
return this.logger.error(
new Error(`Unable to terminate "copy ${actionType}" stream query (pid: ${pid})`)
);
}
return this.logger.info(`Terminated "copy ${actionType}" stream query successfully (pid: ${pid})`);
});
});
}
};