|
28 | 28 | * |
29 | 29 | * |
30 | 30 | * IDENTIFICATION |
31 | | - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.209 2001/03/13 01:17:05 tgl Exp $ |
| 31 | + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.210 2001/03/1417:58:46 tgl Exp $ |
32 | 32 | * |
33 | 33 | * NOTES |
34 | 34 | * |
@@ -804,6 +804,11 @@ ServerLoop(void) |
804 | 804 | { |
805 | 805 | /* Time to make the checkpoint... */ |
806 | 806 | CheckPointPID=CheckPointDataBase(); |
| 807 | +/* if fork failed, schedule another try at 0.1 normal delay */ |
| 808 | +if (CheckPointPID==0) |
| 809 | +{ |
| 810 | +checkpointed=now- (9*CheckPointTimeout) /10; |
| 811 | +} |
807 | 812 | } |
808 | 813 | } |
809 | 814 |
|
@@ -2124,6 +2129,7 @@ schedule_checkpoint(SIGNAL_ARGS) |
2124 | 2129 | Shutdown==NoShutdown&& !FatalError) |
2125 | 2130 | { |
2126 | 2131 | CheckPointPID=CheckPointDataBase(); |
| 2132 | +/* note: if fork fails, CheckPointPID stays 0; nothing happens */ |
2127 | 2133 | } |
2128 | 2134 |
|
2129 | 2135 | errno=save_errno; |
@@ -2264,6 +2270,9 @@ InitSSL(void) |
2264 | 2270 |
|
2265 | 2271 | /* |
2266 | 2272 | * Fire off a subprocess for startup/shutdown/checkpoint. |
| 2273 | + * |
| 2274 | + * Return value is subprocess' PID, or 0 if failed to start subprocess |
| 2275 | + * (0 is returned only for checkpoint case). |
2267 | 2276 | */ |
2268 | 2277 | staticpid_t |
2269 | 2278 | SSDataBase(intxlop) |
@@ -2332,8 +2341,15 @@ SSDataBase(int xlop) |
2332 | 2341 |
|
2333 | 2342 | fprintf(stderr,"%s Data Base: fork failed: %s\n", |
2334 | 2343 | ((xlop==BS_XLOG_STARTUP) ?"Startup" : |
2335 | | -((xlop==BS_XLOG_CHECKPOINT) ?"CheckPoint" : |
2336 | | -"Shutdown")),strerror(errno)); |
| 2344 | + ((xlop==BS_XLOG_CHECKPOINT) ?"CheckPoint" : |
| 2345 | +"Shutdown")), |
| 2346 | +strerror(errno)); |
| 2347 | +/* |
| 2348 | + * fork failure is fatal during startup/shutdown, but there's |
| 2349 | + * no need to choke if a routine checkpoint fails. |
| 2350 | + */ |
| 2351 | +if (xlop==BS_XLOG_CHECKPOINT) |
| 2352 | +return0; |
2337 | 2353 | ExitPostmaster(1); |
2338 | 2354 | } |
2339 | 2355 |
|
@@ -2363,7 +2379,7 @@ SSDataBase(int xlop) |
2363 | 2379 | TouchSocketLockFile(); |
2364 | 2380 | } |
2365 | 2381 |
|
2366 | | -return(pid); |
| 2382 | +returnpid; |
2367 | 2383 | } |
2368 | 2384 |
|
2369 | 2385 |
|
|