Skip to content

Make execution of plpython interruptible #5

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.

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

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
50 changes: 50 additions & 0 deletions src/pl/plpython/plpy_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,19 @@ PyObject *PLy_interp_globals = NULL;
/* this doesn't need to be global; use PLy_current_execution_context() */
static PLyExecutionContext *PLy_execution_contexts = NULL;

+/* postgres backend handler for interruption */
Copy link

@ethervoid ethervoid May 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You left some + symbols from the diff that makes this file fail at compilation time

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops! fixing it, thanks!

+static pqsigfunc coreIntHandler = 0;
+static void PLy_handle_interrupt(int sig);

void
_PG_init(void)
{
int **bitmask_ptr;
const int **version_ptr;

/* Catch and process SIGINT signals */
coreIntHandler = pqsignal(SIGINT, PLy_handle_interrupt);

/*
* Set up a shared bitmask variable telling which Python version(s) are
* loaded into this process's address space. If there's more than one, we
Expand Down Expand Up @@ -425,6 +431,9 @@ PLy_current_execution_context(void)
return PLy_execution_contexts;
}

/* Indicate tha a python interruption is pending */
static int PLy_pending_interrupt = 0;

static PLyExecutionContext *
PLy_push_execution_context(void)
{
Expand All @@ -451,6 +460,47 @@ PLy_pop_execution_context(void)

PLy_execution_contexts = context->next;

if (PLy_execution_contexts == NULL) {
// Clear pending interrupts when top level context exits
PLy_pending_interrupt = 0;
}

MemoryContextDelete(context->scratch_ctx);
PLy_free(context);
}

void _PG_fini(void);
void
_PG_fini(void)
{
// Restore previous SIGINT handler
pqsignal(SIGINT, coreIntHandler);
}

static int
PLy_python_interruption_handler()
{
if (!PLy_pending_interrupt) {
Copy link

@ethervoid ethervoid May 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this possible? or we're making defensive programming just in case?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it will happen when the top PlPython context exits and there are unhandled Python interruption; since we can't remove the pending call we set this flag to 0 to make it have no effect.

return 0;
}

PLy_pending_interrupt = 0;
PyErr_SetString(PyExc_RuntimeError, "Execution of function interrupted by signal");
return -1;
}

static void
PLy_handle_interrupt(int sig)
{
if (PLy_execution_contexts != NULL && !PLy_pending_interrupt) {
PLy_pending_interrupt = 1;
Py_AddPendingCall(PLy_python_interruption_handler, NULL);
}
// Fallback to execute prior handlers
if (coreIntHandler != SIG_DFL && coreIntHandler != SIG_IGN) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SIG_DFL act as a process kill so better to have it out of here :)

// There's a catch here: if the prior handler was SIG_DFL we have no easy way
// of invoking it here;
// As that's an unlikely situation we'll just treat SIG_DFL as SIG_IGN.
(*coreIntHandler)(sig);
}
}