openstack/swift
Code Issues Proposed changes

Remove invalid connection checking in db_replicator

Browse Source 
Account/Container-replicator checks connection generation and timeout
in HTTP REPLICATE Request in _repl_to_node, but it doesn't really checks
connection but only construction of ReplConnection class.
This patch removes that invalid checking.

Change-Id: Ie6b4062123d998e69c15638b741e7d1ba8a08b62
Closes-Bug: #1359018
This commit is contained in:
Takashi Kajinami 2014-11-24 22:05:07 +09:00
parent 308c6a5e73
commit 7a0c4d2482
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
swift/common/db_replicator.py
View File

@ -35,7 +35,7 @@ from swift.common.utils import get_logger, whataremyips, storage_directory, \
from swift.common import ring from swift.common import ring
from swift.common.http import HTTP_NOT_FOUND, HTTP_INSUFFICIENT_STORAGE from swift.common.http import HTTP_NOT_FOUND, HTTP_INSUFFICIENT_STORAGE
from swift.common.bufferedhttp import BufferedHTTPConnection from swift.common.bufferedhttp import BufferedHTTPConnection
from swift.common.exceptions import DriveNotMounted, ConnectionTimeout from swift.common.exceptions import DriveNotMounted
from swift.common.daemon import Daemon from swift.common.daemon import Daemon
from swift.common.swob import Response, HTTPNotFound, HTTPNoContent, \ from swift.common.swob import Response, HTTPNotFound, HTTPNoContent, \
HTTPAccepted, HTTPBadRequest HTTPAccepted, HTTPBadRequest
@ -370,12 +370,7 @@ class Replicator(Daemon):
:returns: True if successful, False otherwise :returns: True if successful, False otherwise
""" """
with ConnectionTimeout(self.conn_timeout): http = self._http_connect(node, partition, broker.db_file)
http = self._http_connect(node, partition, broker.db_file)
if not http:
self.logger.error(
_('ERROR Unable to connect to remote server: %s'), node)
return False
sync_args = self._gather_sync_args(info) sync_args = self._gather_sync_args(info)
with Timeout(self.node_timeout): with Timeout(self.node_timeout):
response = http.replicate('sync', *sync_args) response = http.replicate('sync', *sync_args)

5
test/unit/common/test_db_replicator.py
View File

@ -1230,11 +1230,6 @@ class TestReplToNode(unittest.TestCase):
self.assertEquals(self.replicator._repl_to_node( self.assertEquals(self.replicator._repl_to_node(
self.fake_node, FakeBroker(), '0', self.fake_info), None) self.fake_node, FakeBroker(), '0', self.fake_info), None)
def test_repl_to_node_http_connect_fails(self):
self.replicator._http_connect = lambda *args: None
self.assertEquals(self.replicator._repl_to_node(
self.fake_node, FakeBroker(), '0', self.fake_info), False)
def test_repl_to_node_not_response(self): def test_repl_to_node_not_response(self):
self.http = mock.Mock(replicate=mock.Mock(return_value=None)) self.http = mock.Mock(replicate=mock.Mock(return_value=None))
self.assertEquals(self.replicator._repl_to_node( self.assertEquals(self.replicator._repl_to_node(