database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

AbortOutOfAnyTransaction() just before backend exit, to ensure that

Browse Source 
resources are cleaned up if the user disconnected mid-transaction.
Great thanks to Hiroshi for pointing out what should have been obvious...
This commit is contained in:
Tom Lane 2000-08-30 20:30:06 +00:00
parent 7bc654bb16
commit 16dc9bafb7
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.173 2000/08/29 09:36:47 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.174 2000/08/30 20:30:06 tgl Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -1404,14 +1404,14 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.173 $ $Date: 2000/08/29 09:36:47 $\n"); puts("$Revision: 1.174 $ $Date: 2000/08/30 20:30:06 $\n");
} }
/* /*
* Initialize the deferred trigger manager * Initialize the deferred trigger manager
*/ */
if (DeferredTriggerInit() != 0) if (DeferredTriggerInit() != 0)
proc_exit(0); goto normalexit;
SetProcessingMode(NormalProcessing); SetProcessingMode(NormalProcessing);
@ -1451,10 +1451,8 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
AbortCurrentTransaction(); AbortCurrentTransaction();
if (ExitAfterAbort) if (ExitAfterAbort)
{ goto errorexit;
ProcReleaseLocks(); /* Just to be sure... */
proc_exit(0);
}
/* /*
* If we recovered successfully, return to normal top-level context * If we recovered successfully, return to normal top-level context
* and clear ErrorContext for next time. * and clear ErrorContext for next time.
@ -1547,8 +1545,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (HandleFunctionRequest() == EOF) if (HandleFunctionRequest() == EOF)
{ {
/* lost frontend connection during F message input */ /* lost frontend connection during F message input */
pq_close(); goto normalexit;
proc_exit(0);
} }
break; break;
@ -1607,11 +1604,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
*/ */
case 'X': case 'X':
case EOF: case EOF:
if (!IsUnderPostmaster) goto normalexit;
ShutdownXLOG();
pq_close();
proc_exit(0);
break;
default: default:
elog(ERROR, "unknown frontend message was received"); elog(ERROR, "unknown frontend message was received");
@ -1649,10 +1642,20 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
*/ */
MemoryContextCheck(TopMemoryContext); MemoryContextCheck(TopMemoryContext);
#endif #endif
} /* infinite for-loop */ } /* end of main loop */
proc_exit(0); /* shouldn't get here... */ normalexit:
return 1; ExitAfterAbort = true; /* ensure we will exit if elog during abort */
AbortOutOfAnyTransaction();
if (!IsUnderPostmaster)
ShutdownXLOG();
errorexit:
pq_close();
ProcReleaseLocks(); /* Just to be sure... */
proc_exit(0);
return 1; /* keep compiler quiet */
} }
#ifndef HAVE_GETRUSAGE #ifndef HAVE_GETRUSAGE