Skip to content

Support forcing of IPv4/IPv6 resolution. #215

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

Merged
merged 2 commits into from
Apr 24, 2023
Merged

Support forcing of IPv4/IPv6 resolution. #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7eaba3d
Support forcing of IPv4/IPv6 resolution.
YaacovHazan Apr 20, 2023
95f9c41
Support forcing of IPv4/IPv6 resolution (2)
YaacovHazan Apr 24, 2023
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
11 changes: 8 additions & 3 deletions client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,14 @@ int client::connect(void)
}

// Just in case we got domain name and not ip, we convert it
struct sockaddr_in *ipv4 = (struct sockaddr_in *)addr.ci_addr;
char address[INET_ADDRSTRLEN];
inet_ntop(AF_INET, &(ipv4->sin_addr), address, INET_ADDRSTRLEN);
char address[INET6_ADDRSTRLEN];
if (addr.ci_family == PF_INET) {
struct sockaddr_in *ipv4 = (struct sockaddr_in *)addr.ci_addr;
inet_ntop(AF_INET, &(ipv4->sin_addr), address, INET_ADDRSTRLEN);
} else {
struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)addr.ci_addr;
inet_ntop(AF_INET6, &(ipv6->sin6_addr), address, INET6_ADDRSTRLEN);
}

char port_str[20];
snprintf(port_str, sizeof(port_str)-1, "%u", m_config->port);
Expand Down
2 changes: 1 addition & 1 deletion cluster_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ bool cluster_client::connect_shard_connection(shard_connection* sc, char* addres
memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_PASSIVE;
hints.ai_socktype = SOCK_STREAM;
hints.ai_family = AF_INET;
hints.ai_family = AF_UNSPEC;

int res = getaddrinfo(address, port, &hints, &addr_info);
if (res != 0) {
Expand Down
6 changes: 3 additions & 3 deletions config_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ const char* config_weight_list::print(char *buf, int buf_len)
}


server_addr::server_addr(const char *hostname, int port) :
m_hostname(hostname), m_port(port), m_server_addr(NULL), m_used_addr(NULL), m_last_error(0)
server_addr::server_addr(const char *hostname, int port, int resolution) :
m_hostname(hostname), m_port(port), m_server_addr(NULL), m_used_addr(NULL), m_resolution(resolution), m_last_error(0)
{
int error = resolve();

Expand Down Expand Up @@ -254,7 +254,7 @@ int server_addr::resolve(void)
memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_PASSIVE;
hints.ai_socktype = SOCK_STREAM;
hints.ai_family = PF_UNSPEC;
hints.ai_family = m_resolution;

snprintf(port_str, sizeof(port_str)-1, "%u", m_port);
m_last_error = getaddrinfo(m_hostname.c_str(), port_str, &hints, &m_server_addr);
Expand Down
3 changes: 2 additions & 1 deletion config_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ struct connect_info {
};

struct server_addr {
server_addr(const char *hostname, int port);
server_addr(const char *hostname, int port, int resolution);
virtual ~server_addr();

int get_connect_info(struct connect_info *ci);
Expand All @@ -99,6 +99,7 @@ struct server_addr {
int m_port;
struct addrinfo *m_server_addr;
struct addrinfo *m_used_addr;
int m_resolution;
int m_last_error;
};

Expand Down
19 changes: 17 additions & 2 deletions memtier_benchmark.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ static void config_print(FILE *file, struct benchmark_config *cfg)
"server = %s\n"
"port = %u\n"
"unix socket = %s\n"
"address family = %s\n"
"protocol = %s\n"
#ifdef USE_TLS
"tls = %s\n"
Expand Down Expand Up @@ -147,6 +148,7 @@ static void config_print(FILE *file, struct benchmark_config *cfg)
cfg->server,
cfg->port,
cfg->unix_socket,
cfg->resolution == AF_UNSPEC ? "Unspecified" : cfg->resolution == AF_INET ? "AF_INET" : "AF_INET6",
get_protocol_name(cfg->protocol),
#ifdef USE_TLS
cfg->tls ? "yes" : "no",
Expand Down Expand Up @@ -203,6 +205,7 @@ static void config_print_to_json(json_handler * jsonhandler, struct benchmark_co
jsonhandler->write_obj("server" ,"\"%s\"", cfg->server);
jsonhandler->write_obj("port" ,"%u", cfg->port);
jsonhandler->write_obj("unix socket" ,"\"%s\"", cfg->unix_socket);
jsonhandler->write_obj("address family" ,"\"%s\"", cfg->resolution == AF_UNSPEC ? "Unspecified" : cfg->resolution == AF_INET ? "AF_INET" : "AF_INET6");
jsonhandler->write_obj("protocol" ,"\"%s\"", get_protocol_name(cfg->protocol));
jsonhandler->write_obj("out_file" ,"\"%s\"", cfg->out_file);
#ifdef USE_TLS
Expand Down Expand Up @@ -257,6 +260,8 @@ static void config_init_defaults(struct benchmark_config *cfg)
cfg->server = "localhost";
if (!cfg->port && !cfg->unix_socket)
cfg->port = 6379;
if (!cfg->resolution)
cfg->resolution = AF_UNSPEC;
if (!cfg->run_count)
cfg->run_count = 1;
if (!cfg->clients)
Expand Down Expand Up @@ -409,6 +414,8 @@ static int config_parse_args(int argc, char *argv[], struct benchmark_config *cf
{ "server", 1, 0, 's' },
{ "port", 1, 0, 'p' },
{ "unix-socket", 1, 0, 'S' },
{ "ipv4", 0, 0, '4' },
{ "ipv6", 0, 0, '6' },
{ "protocol", 1, 0, 'P' },
#ifdef USE_TLS
{ "tls", 0, 0, o_tls },
Expand Down Expand Up @@ -473,7 +480,7 @@ static int config_parse_args(int argc, char *argv[], struct benchmark_config *cf
int c;
char *endptr;
while ((c = getopt_long(argc, argv,
"vs:S:p:P:o:x:DRn:c:t:d:a:h", long_options, &option_index)) != -1)
"vs:S:p:P:o:x:DRn:c:t:d:a:h:46", long_options, &option_index)) != -1)
{
switch (c) {
case 'h':
Expand All @@ -500,6 +507,12 @@ static int config_parse_args(int argc, char *argv[], struct benchmark_config *cf
return -1;
}
break;
case '4':
cfg->resolution = AF_INET;
break;
case '6':
cfg->resolution = AF_INET6;
break;
case 'P':
if (strcmp(optarg, "redis") == 0) {
cfg->protocol = PROTOCOL_REDIS_DEFAULT;
Expand Down Expand Up @@ -873,6 +886,8 @@ void usage() {
" -s, --server=ADDR Server address (default: localhost)\n"
" -p, --port=PORT Server port (default: 6379)\n"
" -S, --unix-socket=SOCKET UNIX Domain socket name (default: none)\n"
" -4, --ipv4 Force IPv4 address resolution.\n"
" -6 --ipv6 Force IPv6 address resolution.\n"
" -P, --protocol=PROTOCOL Protocol to use (default: redis).\n"
" other supported protocols are resp2, resp3, memcache_text and memcache_binary.\n"
" when using one of resp2 or resp3 the redis protocol version will be set via HELLO command.\n"
Expand Down Expand Up @@ -1340,7 +1355,7 @@ int main(int argc, char *argv[])

if (cfg.server != NULL && cfg.port > 0) {
try {
cfg.server_addr = new server_addr(cfg.server, cfg.port);
cfg.server_addr = new server_addr(cfg.server, cfg.port, cfg.resolution);
} catch (std::runtime_error& e) {
benchmark_error_log("%s:%u: error: %s\n",
cfg.server, cfg.port, e.what());
Expand Down
1 change: 1 addition & 0 deletions memtier_benchmark.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ struct benchmark_config {
unsigned short port;
struct server_addr *server_addr;
const char *unix_socket;
int resolution;
enum PROTOCOL_TYPE protocol;
const char *out_file;
const char *client_stats;
Expand Down