Revert "{179084052}: Closing inactive in-process cached connections"

This reverts commit 6235d86.

Signed-off-by: Rivers Zhang <hzhang320@bloomberg.net>

# Conflicts:
#	db/db_tunables.h

Author: riverszhang89

db/db_tunables.c

@@ -379,7 +379,6 @@ extern int gbl_noleader_retry_duration_ms;
 extern int gbl_noleader_retry_poll_ms;
 
 extern char *gbl_iam_dbname;
-extern int gbl_inproc_conn_ttl;
 
 /* util/ctrace.c */
 extern int nlogs;

db/db_tunables.h

@@ -2554,8 +2554,6 @@ REGISTER_TUNABLE("iam_dbname",
                  "override dbname for IAM",
                  TUNABLE_STRING, &gbl_iam_dbname, READEARLY | READONLY, NULL,
                  NULL, NULL, NULL);
-REGISTER_TUNABLE("inproc_conn_ttl", "Close in-process cached connections after this many seconds of inactivity (Default: 10s)",
-                 TUNABLE_INTEGER, &gbl_inproc_conn_ttl, 0, NULL, NULL, NULL, NULL);
 REGISTER_TUNABLE("comdb2_oplog_preserve_seqno", "Preserve max value of the seqno in llmeta", TUNABLE_BOOLEAN, &gbl_comdb2_oplog_preserve_seqno, INTERNAL, NULL, NULL, NULL, NULL);
 REGISTER_TUNABLE("queue_nonodh_scan_limit", "For comdb2_queues, stop queue scan at this depth (Default: 10000)", TUNABLE_INTEGER, &gbl_nonodh_queue_scan_limit, 0, NULL, NULL, NULL, NULL);
 #endif /* _DB_TUNABLES_H */

plugins/newsql/newsql_evbuffer.c

@@ -936,31 +936,19 @@ static void rd_payload(int dummyfd, short what, void *arg)
     process_newsql_payload(appdata, query);
 }
 
-/* 10-second in-process cache TTL (does not affect idle connections or connections held by sockpool) */
-int gbl_inproc_conn_ttl = 10;
 static void rd_hdr(int dummyfd, short what, void *arg)
 {
     struct newsqlheader hdr;
     struct newsql_appdata_evbuffer *appdata = arg;
-    struct sqlclntstate *clnt = &appdata->clnt;
-
     if (evbuffer_get_length(appdata->rd_buf) >= sizeof(struct newsqlheader)) {
         goto hdr;
     }
-    if (dummyfd >= 0 && (what & EV_TIMEOUT) && clnt->in_local_cache) {
-        newsql_cleanup(appdata);
-        return;
-    }
     if (rd_evbuffer(appdata) <= 0 && (what & EV_READ)) {
         newsql_cleanup(appdata);
         return;
     }
     if (evbuffer_get_length(appdata->rd_buf) < sizeof(struct newsqlheader)) {
-        struct timeval idle_evbuffer_time = {
-            .tv_sec = gbl_inproc_conn_ttl,
-            .tv_usec = 0
-        };
-        add_rd_event(appdata, appdata->rd_hdr_ev, ((gbl_inproc_conn_ttl <= 0) ? NULL : &idle_evbuffer_time));
+        add_rd_event(appdata, appdata->rd_hdr_ev, NULL);
         return;
     }
 hdr:

tests/tunables.test/t00_all_tunables.expected

@@ -448,7 +448,6 @@
 (name='init_with_time_based_genids', description='Enables time-based GENIDs', type='BOOLEAN', value='OFF', read_only='Y')
 (name='inline_mtraps', description='inline_mtraps', type='BOOLEAN', value='OFF', read_only='N')
 (name='inmem_repdb_memory', description='Current memory usage of in-memory repdb.  (Default: 0)', type='INTEGER', value='0', read_only='Y')
-(name='inproc_conn_ttl', description='Close in-process cached connections after this many seconds of inactivity (Default: 10s)', type='INTEGER', value='10', read_only='N')
 (name='instant_schema_change', description='When possible (eg: when just adding fields) schema change will not rebuild the underlying tables. (Default: on)', type='BOOLEAN', value='ON', read_only='Y')
 (name='iomap_enabled', description='Map file that tells comdb2ar to pause while we fsync', type='BOOLEAN', value='ON', read_only='N')
 (name='ioqueue', description='Maximum depth of the I/O prefaulting queue. (Default: 0)', type='INTEGER', value='0', read_only='Y')