|
16 | 16 | * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. |
17 | 17 | * Copyright (c) 2013-2014 Intel, Inc. All rights reserved. |
18 | 18 | * Copyright (c) 2014 NVIDIA Corporation. All rights reserved. |
| 19 | + * Copyright (c) 2017 IBM Corporation. All rights reserved. |
19 | 20 | * $COPYRIGHT$ |
20 | 21 | * |
21 | 22 | * Additional copyrights may follow |
@@ -400,27 +401,26 @@ static int tcp_component_register(void) |
400 | 401 | &mca_oob_tcp_component.disable_ipv6_family); |
401 | 402 | #endif // OPAL_ENABLE_IPV6 |
402 | 403 |
|
403 | | - // Default to keepalives every 60 seconds |
404 | | - mca_oob_tcp_component.keepalive_time = 60; |
| 404 | + // Wait for this amount of time before sending the first keepalive probe |
| 405 | + mca_oob_tcp_component.keepalive_time = 300; |
405 | 406 | (void)mca_base_component_var_register(component, "keepalive_time", |
406 | 407 | "Idle time in seconds before starting to send keepalives (keepalive_time <= 0 disables keepalive functionality)", |
407 | 408 | MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, |
408 | 409 | OPAL_INFO_LVL_5, |
409 | 410 | MCA_BASE_VAR_SCOPE_READONLY, |
410 | 411 | &mca_oob_tcp_component.keepalive_time); |
411 | 412 |
|
412 | | - // Default to keepalive retry interval time of 5 seconds |
413 | | - mca_oob_tcp_component.keepalive_intvl = 5; |
| 413 | + // Resend keepalive probe every INT seconds |
| 414 | + mca_oob_tcp_component.keepalive_intvl = 20; |
414 | 415 | (void)mca_base_component_var_register(component, "keepalive_intvl", |
415 | 416 | "Time between successive keepalive pings when peer has not responded, in seconds (ignored if keepalive_time <= 0)", |
416 | 417 | MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, |
417 | 418 | OPAL_INFO_LVL_5, |
418 | 419 | MCA_BASE_VAR_SCOPE_READONLY, |
419 | 420 | &mca_oob_tcp_component.keepalive_intvl); |
420 | 421 |
|
421 | | - // Default to retrying a keepalive 3 times before declaring the |
422 | | - // peer kaput |
423 | | - mca_oob_tcp_component.keepalive_probes = 3; |
| 422 | + // After sending PR probes every INT seconds consider the connection dead |
| 423 | + mca_oob_tcp_component.keepalive_probes = 9; |
424 | 424 | (void)mca_base_component_var_register(component, "keepalive_probes", |
425 | 425 | "Number of keepalives that can be missed before declaring error (ignored if keepalive_time <= 0)", |
426 | 426 | MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, |
|
0 commit comments