openstack/deb-swift
Code Issues Proposed changes

Added missing parenthesis in print calls

Browse Source 
Upd. Import print_function from __future__
TrivialFix

Change-Id: Ibcda2c7e4ddbdff2420502dfd7d17db01f3c8056
This commit is contained in:
Maria Malyarova 2016-07-05 17:14:45 +03:00
parent 2bfc036bd9
commit aa12901eda
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bin/swift-dispersion-populate
View File

@ -13,6 +13,7 @@
# implied. # implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from __future__ import print_function
import traceback import traceback
from optparse import OptionParser from optparse import OptionParser
@ -34,7 +35,6 @@ from swift.common.ring import Ring
from swift.common.utils import compute_eta, get_time_units, config_true_value from swift.common.utils import compute_eta, get_time_units, config_true_value
from swift.common.storage_policy import POLICIES from swift.common.storage_policy import POLICIES
insecure = False insecure = False
@ -77,9 +77,9 @@ def report(success):
return return
next_report = time() + 5 next_report = time() + 5
eta, eta_unit = compute_eta(begun, created, need_to_create) eta, eta_unit = compute_eta(begun, created, need_to_create)
print ('\r\x1B[KCreating %s: %d of %d, %d%s left, %d retries' print('\r\x1B[KCreating %s: %d of %d, %d%s left, %d retries'
% (item_type, created, need_to_create, round(eta), eta_unit, % (item_type, created, need_to_create, round(eta), eta_unit,
retries_done)), retries_done), end='')
stdout.flush() stdout.flush()
@ -105,9 +105,9 @@ Usage: %%prog [options] [conf_file]
help='Allow accessing insecure keystone server. ' help='Allow accessing insecure keystone server. '
'The keystone\'s certificate will not be verified.') 'The keystone\'s certificate will not be verified.')
parser.add_option('--no-overlap', action='store_true', default=False, parser.add_option('--no-overlap', action='store_true', default=False,
help='No overlap of partitions if running populate \ help="No overlap of partitions if running populate \
more than once. Will increase coverage by amount shown \ more than once. Will increase coverage by amount shown \
in dispersion.conf file') in dispersion.conf file")
parser.add_option('-P', '--policy-name', dest='policy_name', parser.add_option('-P', '--policy-name', dest='policy_name',
help="Specify storage policy name") help="Specify storage policy name")
@ -127,7 +127,7 @@ Usage: %%prog [options] [conf_file]
policy = POLICIES.get_by_name(options.policy_name) policy = POLICIES.get_by_name(options.policy_name)
if policy is None: if policy is None:
exit('Unable to find policy: %s' % options.policy_name) exit('Unable to find policy: %s' % options.policy_name)
print 'Using storage policy: %s ' % policy.name print('Using storage policy: %s ' % policy.name)
swift_dir = conf.get('swift_dir', '/etc/swift') swift_dir = conf.get('swift_dir', '/etc/swift')
dispersion_coverage = float(conf.get('dispersion_coverage', 1)) dispersion_coverage = float(conf.get('dispersion_coverage', 1))
@ -213,15 +213,15 @@ Usage: %%prog [options] [conf_file]
suffix += 1 suffix += 1
coropool.waitall() coropool.waitall()
elapsed, elapsed_unit = get_time_units(time() - begun) elapsed, elapsed_unit = get_time_units(time() - begun)
print '\r\x1B[KCreated %d containers for dispersion reporting, ' \ print('\r\x1B[KCreated %d containers for dispersion reporting, '
'%d%s, %d retries' % \ '%d%s, %d retries' %
((need_to_create - need_to_queue), round(elapsed), elapsed_unit, ((need_to_create - need_to_queue), round(elapsed), elapsed_unit,
retries_done) retries_done))
if options.no_overlap: if options.no_overlap:
con_coverage = container_ring.partition_count - len(parts_left) con_coverage = container_ring.partition_count - len(parts_left)
print '\r\x1B[KTotal container coverage is now %.2f%%.' % \ print('\r\x1B[KTotal container coverage is now %.2f%%.' %
((float(con_coverage) / container_ring.partition_count ((float(con_coverage) / container_ring.partition_count
* 100)) * 100)))
stdout.flush() stdout.flush()
if object_populate: if object_populate:
@ -269,12 +269,12 @@ Usage: %%prog [options] [conf_file]
suffix += 1 suffix += 1
coropool.waitall() coropool.waitall()
elapsed, elapsed_unit = get_time_units(time() - begun) elapsed, elapsed_unit = get_time_units(time() - begun)
print '\r\x1B[KCreated %d objects for dispersion reporting, ' \ print('\r\x1B[KCreated %d objects for dispersion reporting, '
'%d%s, %d retries' % \ '%d%s, %d retries' %
((need_to_create - need_to_queue), round(elapsed), elapsed_unit, ((need_to_create - need_to_queue), round(elapsed), elapsed_unit,
retries_done) retries_done))
if options.no_overlap: if options.no_overlap:
obj_coverage = object_ring.partition_count - len(parts_left) obj_coverage = object_ring.partition_count - len(parts_left)
print '\r\x1B[KTotal object coverage is now %.2f%%.' % \ print('\r\x1B[KTotal object coverage is now %.2f%%.' %
((float(obj_coverage) / object_ring.partition_count * 100)) ((float(obj_coverage) / object_ring.partition_count * 100)))
stdout.flush() stdout.flush()