GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 15:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drbd: New net configuration option socket-check-timeout

Browse source 
In setups involving a DRBD-proxy and connections that experience a lot of
buffer-bloat it might be necessary to set ping-timeout to an
unusual high value. By default DRBD uses the same value to wait if a newly
established TCP-connection is stable. Since the DRBD-proxy is usually located
in the same data center such a long wait time may hinder DRBD's connect process.

In such setups socket-check-timeout should be set to
at least to the round trip time between DRBD and DRBD-proxy. I.e. in most
cases to 1.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Philipp Reisner 2014-03-18 14:24:35 +01:00
parent 4920e37a9e
commit 5d0b17f1a2
3 changed files with 36 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

46
drivers/block/drbd/drbd_receiver.c
View file

@ -819,7 +819,7 @@ static int receive_first_packet(struct drbd_connection *connection, struct socke
* drbd_socket_okay() - Free the socket if its connection is not okay * drbd_socket_okay() - Free the socket if its connection is not okay
* @sock: pointer to the pointer to the socket. * @sock: pointer to the pointer to the socket.
*/ */
static int drbd_socket_okay(struct socket **sock) static bool drbd_socket_okay(struct socket **sock)
{ {
int rr; int rr;
char tb[4]; char tb[4];
@ -837,6 +837,30 @@ static int drbd_socket_okay(struct socket **sock)
return false; return false;
} }
} }
static bool connection_established(struct drbd_connection *connection,
struct socket **sock1,
struct socket **sock2)
{
struct net_conf *nc;
int timeout;
bool ok;
if (!*sock1 || !*sock2)
return false;
rcu_read_lock();
nc = rcu_dereference(connection->net_conf);
timeout = (nc->sock_check_timeo ?: nc->ping_timeo) * HZ / 10;
rcu_read_unlock();
schedule_timeout_interruptible(timeout);
ok = drbd_socket_okay(sock1);
ok = drbd_socket_okay(sock2) && ok;
return ok;
}
/* Gets called if a connection is established, or if a new minor gets created /* Gets called if a connection is established, or if a new minor gets created
in a connection */ in a connection */
int drbd_connected(struct drbd_peer_device *peer_device) int drbd_connected(struct drbd_peer_device *peer_device)
@ -878,8 +902,8 @@ static int conn_connect(struct drbd_connection *connection)
struct drbd_socket sock, msock; struct drbd_socket sock, msock;
struct drbd_peer_device *peer_device; struct drbd_peer_device *peer_device;
struct net_conf *nc; struct net_conf *nc;
int vnr, timeout, h, ok; int vnr, timeout, h;
bool discard_my_data; bool discard_my_data, ok;
enum drbd_state_rv rv; enum drbd_state_rv rv;
struct accept_wait_data ad = { struct accept_wait_data ad = {
.connection = connection, .connection = connection,
@ -923,17 +947,8 @@ static int conn_connect(struct drbd_connection *connection)
} }
} }
if (sock.socket && msock.socket) { if (connection_established(connection, &sock.socket, &msock.socket))
rcu_read_lock(); break;
nc = rcu_dereference(connection->net_conf);
timeout = nc->ping_timeo * HZ / 10;
rcu_read_unlock();
schedule_timeout_interruptible(timeout);
ok = drbd_socket_okay(&sock.socket);
ok = drbd_socket_okay(&msock.socket) && ok;
if (ok)
break;
}
retry: retry:
s = drbd_wait_for_connect(connection, &ad); s = drbd_wait_for_connect(connection, &ad);
@ -979,8 +994,7 @@ randomize:
goto out_release_sockets; goto out_release_sockets;
} }
ok = drbd_socket_okay(&sock.socket); ok = connection_established(connection, &sock.socket, &msock.socket);
ok = drbd_socket_okay(&msock.socket) && ok;
} while (!ok); } while (!ok);
if (ad.s_listen) if (ad.s_listen)

1
include/linux/drbd_genl.h
View file

@ -174,6 +174,7 @@ GENL_struct(DRBD_NLA_NET_CONF, 5, net_conf,
/* 9: __str_field_def(31, DRBD_GENLA_F_MANDATORY, name, SHARED_SECRET_MAX) */ /* 9: __str_field_def(31, DRBD_GENLA_F_MANDATORY, name, SHARED_SECRET_MAX) */
/* 9: __u32_field(32, DRBD_F_REQUIRED | DRBD_F_INVARIANT, peer_node_id) */ /* 9: __u32_field(32, DRBD_F_REQUIRED | DRBD_F_INVARIANT, peer_node_id) */
__flg_field_def(33, 0 /* OPTIONAL */, csums_after_crash_only, DRBD_CSUMS_AFTER_CRASH_ONLY_DEF) __flg_field_def(33, 0 /* OPTIONAL */, csums_after_crash_only, DRBD_CSUMS_AFTER_CRASH_ONLY_DEF)
__u32_field_def(34, 0 /* OPTIONAL */, sock_check_timeo, DRBD_SOCKET_CHECK_TIMEO_DEF)
) )
GENL_struct(DRBD_NLA_SET_ROLE_PARMS, 6, set_role_parms, GENL_struct(DRBD_NLA_SET_ROLE_PARMS, 6, set_role_parms,

5
include/linux/drbd_limits.h
View file

@ -225,4 +225,9 @@
#define DRBD_AL_STRIPE_SIZE_MAX 16777216 #define DRBD_AL_STRIPE_SIZE_MAX 16777216
#define DRBD_AL_STRIPE_SIZE_DEF 32 #define DRBD_AL_STRIPE_SIZE_DEF 32
#define DRBD_AL_STRIPE_SIZE_SCALE 'k' /* kilobytes */ #define DRBD_AL_STRIPE_SIZE_SCALE 'k' /* kilobytes */
#define DRBD_SOCKET_CHECK_TIMEO_MIN 0
#define DRBD_SOCKET_CHECK_TIMEO_MAX DRBD_PING_TIMEO_MAX
#define DRBD_SOCKET_CHECK_TIMEO_DEF 0
#define DRBD_SOCKET_CHECK_TIMEO_SCALE '1'
#endif #endif