openstack/swift
Code Issues Proposed changes

Remove ssync iter_hook usage

Browse Source 
Apparently that disappeared and now the whole thing does on its own what this
was trying to achieve.

Change-Id: If20016cb80c855e3e8373de5d56926ef8f8e7dac
This commit is contained in:
gholt
2013-12-04 00:10:46 +00:00
committed by Samuel Merritt
parent 341fe7fd92
commit f5ba1ca1f9
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
swift/obj/ssync_sender.py
View File

@@ -14,11 +14,6 @@
# limitations under the License. # limitations under the License.
import urllib import urllib
import eventlet
import eventlet.wsgi
import eventlet.greenio
from swift.common import bufferedhttp from swift.common import bufferedhttp
from swift.common import exceptions from swift.common import exceptions
from swift.common import http from swift.common import http
@@ -288,7 +283,7 @@ class Sender(object):
msg = '\r\n'.join(msg) + '\r\n\r\n' msg = '\r\n'.join(msg) + '\r\n\r\n'
with exceptions.MessageTimeout(self.daemon.node_timeout, 'send_put'): with exceptions.MessageTimeout(self.daemon.node_timeout, 'send_put'):
self.connection.send('%x\r\n%s\r\n' % (len(msg), msg)) self.connection.send('%x\r\n%s\r\n' % (len(msg), msg))
for chunk in df.reader(iter_hook=eventlet.sleep): for chunk in df.reader():
with exceptions.MessageTimeout( with exceptions.MessageTimeout(
self.daemon.node_timeout, 'send_put chunk'): self.daemon.node_timeout, 'send_put chunk'):
self.connection.send('%x\r\n%s\r\n' % (len(chunk), chunk)) self.connection.send('%x\r\n%s\r\n' % (len(chunk), chunk))