wip

Signed-off-by: roman khapov <[email protected]>

Author: rkhapov

docker/functional/tests/lagpolling/lag-conf.conf

@@ -112,7 +112,7 @@ database "postgres" {
 		authentication "none"
 		storage "postgres_server"
 
-		pool "transaction"
+		pool "session"
 		pool_size 0
 		pool_timeout 0
 		pool_ttl 60

docker/functional/tests/lagpolling/runner.sh

@@ -1,6 +1,9 @@
 #!/bin/bash -x
 
 
+# disable options for this run
+# because it has some bug that leads to odyssey connection stuck
+# if options is defined
 /usr/bin/odyssey /tests/lagpolling/lag-conf.conf
 sleep 3
 
@@ -16,16 +19,24 @@ for _ in $(seq 1 3); do
 	PGPASSWORD=lolol psql -h localhost -p6432 -dpostgres -Uuser1 -c 'select 3' || exit 1 
 done
 
-service postgresql restart || true
+# sudo -u postgres /usr/lib/postgresql/16/bin/pg_ctl -D /var/lib/postgresql/16/repl/ restart
+# until pg_isready -h localhost -p 5433 -U postgres -d postgres; do
+#   echo "Wait for replica..."
+#   sleep 1
+# done
 
-sleep 1
+# sudo -u postgres /usr/lib/postgresql/16/bin/pg_ctl -D /var/lib/postgresql/16/main/ restart
+# until pg_isready -h localhost -p 5432 -U postgres -d postgres; do
+#   echo "Wait for primary..."
+#   sleep 1
+# done
 
-PGPASSWORD=lolol psql -h localhost -p6432 -dpostgres -Uuser1 -c 'select 3' || exit 1
+# PGPASSWORD=lolol timeout 1s psql -h localhost -p6432 -dpostgres -Uuser1 -c 'select 3' || exit 1
 
-# test bad backend connections closed properly
+# # test bad backend connections closed properly
 
-for _ in $(seq 1 3); do
-	PGPASSWORD=lolol psql -h localhost -p6432 -dpostgres -Uuser1 -c 'select 3' || exit 1 
-done
+# for _ in $(seq 1 3); do
+# 	PGPASSWORD=lolol timeout 1s psql -h localhost -p6432 -dpostgres -Uuser1 -c 'select 3' || exit 1 
+# done
 
 ody-stop

sources/config.c

@@ -92,6 +92,9 @@ void od_config_free(od_config_t *config)
 		listen = od_container_of(i, od_config_listen_t, link);
 		od_config_listen_free(listen);
 	}
+	if (config->unix_socket_mode) {
+		od_free(config->unix_socket_mode);
+	}
 	if (config->log_file)
 		od_free(config->log_file);
 	if (config->log_format)
@@ -106,8 +109,8 @@ void od_config_free(od_config_t *config)
 		od_free(config->log_syslog_facility);
 	if (config->locks_dir) {
 		od_free(config->locks_dir);
-		if (config->hba_file)
-			od_free(config->hba_file);
+	if (config->hba_file)
+		od_free(config->hba_file);
 	}
 	if (config->external_auth_socket_path)
 		od_free(config->external_auth_socket_path);

sources/frontend.c

@@ -2032,7 +2032,7 @@ od_frontend_check_replica_catchup(od_instance_t *instance, od_client_t *client)
 static int wait_client_activity(od_client_t *client)
 {
 	/* io_cond is set up by client or server relay */
-	if (machine_cond_wait(client->io_cond, 10 * 1000 /* 10 sec */) == 0) {
+	if (machine_cond_wait(client->io_cond, 1 * 1000 /* 10 sec */) == 0) {
 		client->time_last_active = machine_time_us();
 		od_dbg_printf_on_dvl_lvl(
 			1, "change client last active time %lld\n",
@@ -2041,6 +2041,8 @@ static int wait_client_activity(od_client_t *client)
 		return 1;
 	}
 
+	od_log(&od_global_get()->instance->logger, "HUI", client, client->server, "waiting for activity");
+
 	return 0;
 }
 

sources/router.c

@@ -785,8 +785,8 @@ void od_router_detach(od_router_t *router, od_client_t *client)
 	client->server = NULL;
 	server->client = NULL;
 
-	machine_cond_propagate(server->io.on_read, NULL);
-	machine_cond_propagate(server->io.on_write, NULL);
+	// machine_cond_propagate(server->io.on_read, NULL);
+	// machine_cond_propagate(server->io.on_write, NULL);
 
 	if (od_likely(!server->offline)) {
 		od_instance_t *instance = server->global->instance;