From dd45426da1904e875c1e240f747bc0637672b5f6 Mon Sep 17 00:00:00 2001
From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Sat, 2 Mar 2019 17:16:34 +0800
Subject: [PATCH] msg: rename ms_tcp_read_timeout to ms_connection_idle_timeout

The old nameing is confusing, e.g., it actually indicates we should tear
down the underlying connection which has no read/write activities
at both sides (namely connection is idle) for over 15 minutes.

Master PR: https://github.com/ceph/ceph/pull/27337

This does not follow the normal backport process because the protocol
of transport layer of Ceph has been greatly changed for Nautilus.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---
 src/common/legacy_config_opts.h   | 2 +-
 src/common/options.cc             | 2 +-
 src/msg/async/AsyncConnection.cc  | 2 +-
 src/msg/simple/Pipe.cc            | 2 +-
 src/test/librados/watch_notify.cc | 6 +++---
 src/test/msgr/test_msgr.cc        | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 7dac8782d2349..5cee83eac1dbc 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -137,7 +137,7 @@ OPTION(ms_bind_retry_delay, OPT_INT) // Delay between attemps to bind
 OPTION(ms_bind_before_connect, OPT_BOOL)
 OPTION(ms_tcp_listen_backlog, OPT_INT)
 OPTION(ms_rwthread_stack_bytes, OPT_U64)
-OPTION(ms_tcp_read_timeout, OPT_U64)
+OPTION(ms_connection_idle_timeout, OPT_U64)
 OPTION(ms_pq_max_tokens_per_priority, OPT_U64)
 OPTION(ms_pq_min_cost, OPT_U64)
 OPTION(ms_inject_socket_failures, OPT_U64)
diff --git a/src/common/options.cc b/src/common/options.cc
index fdbc23312aeee..a6b872cdf6f6c 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -707,7 +707,7 @@ std::vector<Option> get_global_options() {
     .set_default(1_M)
     .set_description(""),
 
-    Option("ms_tcp_read_timeout", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
+    Option("ms_connection_idle_timeout", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
     .set_default(900)
     .set_description(""),
 
diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 2d70468c2d8c0..70fe74917fad5 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -128,7 +128,7 @@ AsyncConnection::AsyncConnection(CephContext *cct, AsyncMessenger *m, DispatchQu
     recv_max_prefetch(MAX(msgr->cct->_conf->ms_tcp_prefetch_max_size, TCP_PREFETCH_MIN_SIZE)),
     recv_start(0), recv_end(0),
     last_active(ceph::coarse_mono_clock::now()),
-    inactive_timeout_us(cct->_conf->ms_tcp_read_timeout*1000*1000),
+    inactive_timeout_us(cct->_conf->ms_connection_idle_timeout*1000*1000),
     authorizer(NULL), replacing(false),
     is_reset_from_peer(false), once_ready(false), state_buffer(NULL), state_offset(0),
     worker(w), center(&w->center)
diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
index 98c51be7cd2d9..6f264b9858379 100644
--- a/src/msg/simple/Pipe.cc
+++ b/src/msg/simple/Pipe.cc
@@ -166,7 +166,7 @@ Pipe::Pipe(SimpleMessenger *r, int st, PipeConnection *con)
   }
     
 
-  msgr->timeout = msgr->cct->_conf->ms_tcp_read_timeout * 1000; //convert to ms
+  msgr->timeout = msgr->cct->_conf->ms_connection_idle_timeout * 1000; //convert to ms
   if (msgr->timeout == 0)
     msgr->timeout = -1;
 
diff --git a/src/test/librados/watch_notify.cc b/src/test/librados/watch_notify.cc
index 3ea9bead7582e..9e14a82910180 100644
--- a/src/test/librados/watch_notify.cc
+++ b/src/test/librados/watch_notify.cc
@@ -794,10 +794,10 @@ TEST_F(LibRadosWatchNotify, Watch3Timeout) {
     // timer of timeout on OSD side will be reset by the new request.
     char conf[128];
     ASSERT_EQ(0, rados_conf_get(cluster,
-                                "ms_tcp_read_timeout",
+                                "ms_connection_idle_timeout",
                                 conf, sizeof(conf)));
-    auto tcp_read_timeout = std::stoll(conf);
-    ASSERT_LT(timeout, tcp_read_timeout);
+    auto connection_idle_timeout = std::stoll(conf);
+    ASSERT_LT(timeout, connection_idle_timeout);
   }
   ASSERT_EQ(0,
 	    rados_watch3(ioctx, notify_oid, &handle,
diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc
index 6c56600787e16..a3c83e3ab72d9 100644
--- a/src/test/msgr/test_msgr.cc
+++ b/src/test/msgr/test_msgr.cc
@@ -382,7 +382,7 @@ TEST_P(MessengerTest, FeatureTest) {
 }
 
 TEST_P(MessengerTest, TimeoutTest) {
-  g_ceph_context->_conf->set_val("ms_tcp_read_timeout", "1");
+  g_ceph_context->_conf->set_val("ms_connection_idle_timeout", "1");
   FakeDispatcher cli_dispatcher(false), srv_dispatcher(true);
   entity_addr_t bind_addr;
   bind_addr.parse("127.0.0.1");
@@ -416,7 +416,7 @@ TEST_P(MessengerTest, TimeoutTest) {
 
   client_msgr->shutdown();
   client_msgr->wait();
-  g_ceph_context->_conf->set_val("ms_tcp_read_timeout", "900");
+  g_ceph_context->_conf->set_val("ms_connection_idle_timeout", "900");
 }
 
 TEST_P(MessengerTest, StatefulTest) {
-- 
2.39.5