Skip to content

Port newsql_connect changes #5662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chands10 wants to merge 2 commits into
base: main
Choose a base branch
from
+40 −23
Open

Port newsql_connect changes #5662

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2865ae
Port newsql_connect changes
chands10 Jan 8, 2026
ef3f6db
Try with ssl changes
chands10 Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 40 additions & 23 deletions cdb2api/cdb2api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3383,6 +3383,9 @@ static int try_ssl(cdb2_hndl_tp *hndl, SBUF2 *sb)
int rc, dossl = 0;
cdb2_ssl_sess *p;

if (sslio_has_ssl(sb))
return 0;

if (SSL_IS_REQUIRED(hndl->c_sslmode)) {
switch (hndl->s_sslmode) {
case PEER_SSL_UNSUPPORTED:
Expand Down Expand Up @@ -3473,7 +3476,11 @@ static int try_ssl(cdb2_hndl_tp *hndl, SBUF2 *sb)
&hndl->key, &hndl->ca, &hndl->crl, hndl->num_hosts, NULL,
hndl->min_tls_ver, hndl->errstr, sizeof(hndl->errstr));
if (rc != 0) {
hndl->sslerr = 1;
if (SSL_IS_REQUIRED(hndl->c_sslmode)) {
hndl->sslerr = 1;
} else {
hndl->c_sslmode = SSL_ALLOW;
}
return -1;
}

Expand All @@ -3484,6 +3491,8 @@ static int try_ssl(cdb2_hndl_tp *hndl, SBUF2 *sb)
SSL_CTX_free(ctx);
if (rc != 1) {
hndl->sslerr = sbuf2lasterror(sb, hndl->errstr, sizeof(hndl->errstr));
/* Don't leave an incomplete SSL connection here. Shut it down and reset sbuf.
Caller will reconnect upon a null `hndl->sb'. */
/* If SSL_connect() fails, invalidate the session. */
if (p != NULL)
p->sessobj = NULL;
Expand All @@ -3493,9 +3502,8 @@ static int try_ssl(cdb2_hndl_tp *hndl, SBUF2 *sb)
return 0;
}

static int cdb2portmux_route(cdb2_hndl_tp *hndl, const char *remote_host,
const char *app, const char *service,
const char *instance)
static int cdb2portmux_route(cdb2_hndl_tp *hndl, const char *remote_host, const char *app, const char *service,
const char *instance, int timeout)
{
char name[128];
char res[32];
Expand All @@ -3510,17 +3518,14 @@ static int cdb2portmux_route(cdb2_hndl_tp *hndl, const char *remote_host,

debugprint("name %s\n", name);

fd = cdb2_tcpconnecth_to(hndl, remote_host, CDB2_PORTMUXPORT, 0,
hndl->connect_timeout);
fd = cdb2_tcpconnecth_to(hndl, remote_host, CDB2_PORTMUXPORT, 0, timeout);
if (fd < 0)
return -1;
ss = sbuf2open(fd, 0);
if (ss == 0) {
close(fd);
return -1;
}
const int timeout = hndl->api_call_timeout < hndl->connect_timeout ? hndl->api_call_timeout : hndl->connect_timeout;
sbuf2settimeout(ss, timeout, timeout);
sbuf2printf(ss, "rte %s\n", name);
sbuf2flush(ss);
res[0] = '\0';
Expand Down Expand Up @@ -3606,6 +3611,7 @@ static int newsql_connect(cdb2_hndl_tp *hndl, int idx)
SBUF2 *sb = NULL;
void *callbackrc;
int overwrite_rc = 0;
int max_retries = MAX_RETRIES;
cdb2_event *e = NULL;
int use_local_cache;

Expand All @@ -3629,6 +3635,12 @@ static int newsql_connect(cdb2_hndl_tp *hndl, int idx)
}

retry_newsql_connect:
if (max_retries < 0) {
rc = -1;
goto after_callback;
}
max_retries--;

if (!hndl->is_admin && !(hndl->flags & CDB2_MASTER)) {
if (hndl->num_hosts && hndl->is_rejected && connect_host_on_reject) {
char host_typestr[TYPESTR_LEN - TYPE_LEN + CDB2HOSTNAME_LEN];
Expand Down Expand Up @@ -3661,7 +3673,7 @@ static int newsql_connect(cdb2_hndl_tp *hndl, int idx)
if (!cdb2_allow_pmux_route)
fd = cdb2_tcpconnecth_to(hndl, host, port, 0, hndl->connect_timeout);
else
fd = cdb2portmux_route(hndl, host, "comdb2", "replication", hndl->dbname);
fd = cdb2portmux_route(hndl, host, "comdb2", "replication", hndl->dbname, hndl->connect_timeout);
LOG_CALL("%s(%s@%s): fd=%d\n", __func__, hndl->dbname, host, fd);
if (fd < 0) {
rc = -1;
Expand All @@ -3687,19 +3699,23 @@ static int newsql_connect(cdb2_hndl_tp *hndl, int idx)
}
}

sbuf2settimeout(sb, hndl->socket_timeout, hndl->socket_timeout);

hndl_set_sbuf(hndl, sb);
if (try_ssl(hndl, sb) != 0) {
sbuf2close(sb);
rc = -1;
goto after_callback;
if (hndl->sb)
sbuf2close(sb);
fd = -1;
sb = NULL;
hndl->sb = NULL;
/* We're downgraded to plaintext, reconnect without SSL now. */
if (!hndl->sslerr && !SSL_IS_PREFERRED(hndl->c_sslmode)) {
rc = 0;
goto retry_newsql_connect;
} else {
rc = -1;
goto after_callback;
}
}

hndl->sb = sb;
hndl->num_set_commands_sent = 0;
hndl->sent_client_info = 0;
hndl->connected_host = idx;
hndl->hosts_connected[hndl->connected_host] = 1;
debugprint("connected_host=%s\n", hndl->hosts[hndl->connected_host]);

after_callback:
Expand Down Expand Up @@ -4032,8 +4048,10 @@ static int cdb2_connect_sqlhost(cdb2_hndl_tp *hndl)
* master.*/
/* After this retry on other nodes. */
bzero(hndl->hosts_connected, sizeof(hndl->hosts_connected));
if (newsql_connect(hndl, hndl->master) == 0)
if (newsql_connect(hndl, hndl->master) == 0) {
hndl->connected_host = hndl->master;
return 0;
}
}

/* Can't connect to any of the nodes, re-check information about db. */
Expand Down Expand Up @@ -7520,8 +7538,7 @@ static int comdb2db_get_dbhosts(cdb2_hndl_tp *hndl, const char *comdb2db_name, i
fd =
cdb2_tcpconnecth_to(hndl, host, port, 0, hndl->connect_timeout);
} else {
fd = cdb2portmux_route(hndl, host, "comdb2", "replication",
comdb2db_name);
fd = cdb2portmux_route(hndl, host, "comdb2", "replication", comdb2db_name, hndl->connect_timeout);
}
is_sockfd = 0;

Expand Down Expand Up @@ -7781,7 +7798,7 @@ static int cdb2_dbinfo_query(cdb2_hndl_tp *hndl, const char *type, const char *d
fd =
cdb2_tcpconnecth_to(hndl, host, port, 0, hndl->connect_timeout);
} else {
fd = cdb2portmux_route(hndl, host, "comdb2", "replication", dbname);
fd = cdb2portmux_route(hndl, host, "comdb2", "replication", dbname, hndl->connect_timeout);
debugprint("cdb2portmux_route fd=%d'\n", fd);
if (fd < 0) {
snprintf(hndl->errstr, sizeof(hndl->errstr), "%s: Can't route connection to host %s", __func__, host);
Expand Down