Remove drop_on_error, it was a bad idea.

It was a workaround for broken plan-cache in Postgres,
but it's behviour for common case - some queries giving always errors -
is very nasty - it can drop all connections in pool.

diff --git a/doc/config.txt b/doc/config.txt
index e1def72c9d6ae015b7ca583ec8138d9b9219666c..a91fab7a5a038bb5b7319a6de80e82af523e9037 100644 (file)
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -273,14 +273,6 @@ online restart.
 
 Default: 60
 
-==== drop_on_error ====
-
-If error appears from server, the connection will not be reused but dropped
-after client is finished with it.  This allows to survive broken cached plans.
-Set to 0 if errors from server are normal for your workflow.
-
-Default: 1
-
 === Dangerous timeouts ===
 
 Setting following timeouts cause unexcpected errors.

diff --git a/include/bouncer.h b/include/bouncer.h
index e0d4be15259688b65a695e68d501b4601dcfc0b8..e398a2649959d789bcd5148d017569ba8d5a118a 100644 (file)
--- a/include/bouncer.h
+++ b/include/bouncer.h
@@ -327,7 +327,6 @@ extern char *cf_logfile;
 extern char *cf_pidfile;
 
 extern char *cf_ignore_startup_params;
-extern int cf_drop_on_error;
 
 extern char *cf_admin_users;
 extern char *cf_stats_users;

diff --git a/src/main.c b/src/main.c
index 6ee1b7bd4af4af7e84d732fd33bad4dcdd7b893c..01a7e55c0be928a0c57ead2daf9e0de35d61d743 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -95,7 +95,6 @@ usec_t cf_server_check_delay = 30 * USEC;
 int cf_server_round_robin = 0;
 
 char *cf_ignore_startup_params = "";
-int cf_drop_on_error = 1;
 
 usec_t cf_server_lifetime = 60*60*USEC;
 usec_t cf_server_idle_timeout = 10*60*USEC;
@@ -153,7 +152,6 @@ ConfElem bouncer_params[] = {
 {"server_round_robin", true, CF_INT, &cf_server_round_robin},
 {"suspend_timeout",    true, CF_TIME, &cf_suspend_timeout},
 {"ignore_startup_parameters", true, CF_STR, &cf_ignore_startup_params},
-{"drop_on_error",      true, CF_INT, &cf_drop_on_error},
 
 {"pkt_buf",            false, CF_INT, &cf_sbuf_len},
 {"tcp_defer_accept",   true, {cf_get_int, set_defer_accept}, &cf_tcp_defer_accept},

diff --git a/src/server.c b/src/server.c
index e5637bb60237372f0beb4a91382ca19717ce1b02..5f75004d6acfb7915697084c3230a74b4b44ee58 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -242,10 +242,6 @@ static bool handle_server_work(PgSocket *server, PktHdr *pkt)
                        disconnect_server(server, true, "invalid server parameter");
                        return false;
                }
-               if (cf_drop_on_error && !server->close_needed) {
-                       log_server_error("drop_on_error", pkt);
-                       server->close_needed = 1;
-               }
 
        case 'N':               /* NoticeResponse */
                break;