openstack/swift
Code Issues Proposed changes

Merge "Remove ssync iter_hook usage"

Browse Source
This commit is contained in:
Jenkins 2013-12-05 01:54:32 +00:00 committed by Gerrit Code Review
commit fd167982e0
1 changed files with 1 additions and 6 deletions
Show Stats 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.
import urllib
import eventlet
import eventlet.wsgi
import eventlet.greenio
from swift.common import bufferedhttp
from swift.common import exceptions
from swift.common import http
@ -288,7 +283,7 @@ class Sender(object):
msg = '\r\n'.join(msg) + '\r\n\r\n'
with exceptions.MessageTimeout(self.daemon.node_timeout, 'send_put'):
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(
self.daemon.node_timeout, 'send_put chunk'):
self.connection.send('%x\r\n%s\r\n' % (len(chunk), chunk))