diff options
author | Zuul <zuul@review.opendev.org> | 2019-10-15 14:54:03 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2019-10-15 14:54:03 +0000 |
commit | 1e77d6834f321d9c144fdc330bc84fedb24242d7 (patch) | |
tree | 16f123d63014ff7388fef2c65368910e03320468 /bin | |
parent | 4e8572866a013c591c8eb6b023825d7230596786 (diff) | |
parent | 4c66596e630ee63cf2cd54d216c8e443203e59fe (diff) | |
download | swift-1e77d6834f321d9c144fdc330bc84fedb24242d7.tar.gz |
Merge "py3: fix swift-dispersion-populate"
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/swift-dispersion-populate | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/swift-dispersion-populate b/bin/swift-dispersion-populate index 946be0faa..d051630cd 100755 --- a/bin/swift-dispersion-populate +++ b/bin/swift-dispersion-populate @@ -15,6 +15,7 @@ # limitations under the License. from __future__ import print_function +import io import traceback from optparse import OptionParser from sys import exit, stdout @@ -22,8 +23,8 @@ from time import time from eventlet import GreenPool, patcher, sleep from eventlet.pools import Pool +import six from six.moves import range -from six.moves import cStringIO as StringIO from six.moves.configparser import ConfigParser try: @@ -56,7 +57,8 @@ def put_object(connpool, container, obj, report): global retries_done try: with connpool.item() as conn: - conn.put_object(container, obj, StringIO(obj), + data = io.BytesIO(obj if six.PY2 else obj.encode('utf8')) + conn.put_object(container, obj, data, headers={'x-object-meta-dispersion': obj}) retries_done += conn.attempts - 1 if report: |