From dc40779307095b8d0b2761b77b9cb2904ec721ae Mon Sep 17 00:00:00 2001 From: Clay Gerrard Date: Fri, 28 Feb 2020 10:00:25 -0600 Subject: [PATCH] Use float consistently for proxy timeout settings Change-Id: I433c97df99193ec31c863038b9b6fd20bb3705b8 --- swift/proxy/server.py | 2 +- test/unit/proxy/test_server.py | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/swift/proxy/server.py b/swift/proxy/server.py index 852f66dbc1..56c0afd98c 100644 --- a/swift/proxy/server.py +++ b/swift/proxy/server.py @@ -190,7 +190,7 @@ class Application(object): self.recoverable_node_timeout = float( conf.get('recoverable_node_timeout', self.node_timeout)) self.conn_timeout = float(conf.get('conn_timeout', 0.5)) - self.client_timeout = int(conf.get('client_timeout', 60)) + self.client_timeout = float(conf.get('client_timeout', 60)) self.object_chunk_size = int(conf.get('object_chunk_size', 65536)) self.client_chunk_size = int(conf.get('client_chunk_size', 65536)) self.trans_id_suffix = conf.get('trans_id_suffix', '') diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py index 0066c87417..3f0f2bd367 100644 --- a/test/unit/proxy/test_server.py +++ b/test/unit/proxy/test_server.py @@ -1329,6 +1329,27 @@ class TestProxyServerLoading(unittest.TestCase): for policy in POLICIES: policy.object_ring = None + def test_float_timeouts(self): + conf = { + 'node_timeout': '2.3', + 'recoverable_node_timeout': '1.4', + 'conn_timeout': '0.7', + 'client_timeout': '1.7', + 'post_quorum_timeout': '0.3', + 'concurrency_timeout': '0.2', + + } + for policy in POLICIES: + policy.object_ring = FakeRing() + app = proxy_server.Application(conf, FakeMemcache(), debug_logger(), + FakeRing(), FakeRing()) + self.assertEqual(app.node_timeout, 2.3) + self.assertEqual(app.recoverable_node_timeout, 1.4) + self.assertEqual(app.conn_timeout, 0.7) + self.assertEqual(app.client_timeout, 1.7) + self.assertEqual(app.post_quorum_timeout, 0.3) + self.assertEqual(app.concurrency_timeout, 0.2) + def test_load_policy_rings(self): for policy in POLICIES: self.assertFalse(policy.object_ring)