Clean up code that was requested
This commit is contained in:
Jay Payne
parent
e61c21b98f
commit
cbbfb80f86
@ -22,18 +22,18 @@ from swift.common.utils import hash_path
|
||||
|
||||
|
||||
if len(sys.argv) < 3 or len(sys.argv) > 5:
|
||||
print 'Usage: %s <ring.gz> <account> [<container>] [<object>]' \
|
||||
% sys.argv[0]
|
||||
print 'Shows the nodes responsible for the item specified.'
|
||||
print 'Example:'
|
||||
print ' $ %s /etc/swift/account.ring.gz MyAccount' % sys.argv[0]
|
||||
print ' Partition 5743883'
|
||||
print ' Hash 96ae332a60b58910784e4417a03e1ad0'
|
||||
print ' 10.1.1.7:8000 sdd1'
|
||||
print ' 10.1.9.2:8000 sdb1'
|
||||
print ' 10.1.5.5:8000 sdf1'
|
||||
print ' 10.1.5.9:8000 sdt1 # [Handoff]'
|
||||
sys.exit(1)
|
||||
print 'Usage: %s <ring.gz> <account> [<container>] [<object>]' \
|
||||
% sys.argv[0]
|
||||
print 'Shows the nodes responsible for the item specified.'
|
||||
print 'Example:'
|
||||
print ' $ %s /etc/swift/account.ring.gz MyAccount' % sys.argv[0]
|
||||
print ' Partition 5743883'
|
||||
print ' Hash 96ae332a60b58910784e4417a03e1ad0'
|
||||
print ' 10.1.1.7:8000 sdd1'
|
||||
print ' 10.1.9.2:8000 sdb1'
|
||||
print ' 10.1.5.5:8000 sdf1'
|
||||
print ' 10.1.5.9:8000 sdt1 # [Handoff]'
|
||||
sys.exit(1)
|
||||
|
||||
ringloc = None
|
||||
account = None
|
||||
@ -44,95 +44,46 @@ if len(sys.argv) > 4: ring,account,container,obj = sys.argv[1:5]
|
||||
elif len(sys.argv) > 3: ring,account,container = sys.argv[1:4]
|
||||
elif len(sys.argv) > 2: ring,account = sys.argv[1:3]
|
||||
|
||||
if obj:
|
||||
hash_str = hash_path(account,container,obj)
|
||||
part, nodes = Ring(ring).get_nodes(account,container,obj)
|
||||
target = "%s/%s/%s" % (account, container, obj)
|
||||
elif container:
|
||||
hash_str = hash_path(account,container)
|
||||
part, nodes = Ring(ring).get_nodes(account,container)
|
||||
target = "%s/%s" % (account,container)
|
||||
elif account:
|
||||
hash_str = hash_path(account)
|
||||
part, nodes = Ring(ring).get_nodes(account)
|
||||
target = "%s" % (account)
|
||||
|
||||
more_nodes = list(Ring(ring).get_more_nodes(part))
|
||||
|
||||
print '\nAccount \t%s' % account
|
||||
print 'Container\t%s' % container
|
||||
print 'Object \t%s\n' % obj
|
||||
print '\nPartition\t%s' % part
|
||||
print 'Hash \t%s\n' % hash_str
|
||||
|
||||
if obj:
|
||||
hash_str = hash_path(account,container,obj)
|
||||
part, nodes = Ring(ring).get_nodes(account,container,obj)
|
||||
more_nodes = Ring(ring).get_more_nodes(part)
|
||||
print '\nPartition\t%s' % part
|
||||
print 'Hash \t%s\n' % hash_str
|
||||
for node in nodes:
|
||||
print 'Server:Port Device\t%s:%s %s' % (node['ip'], node['port'], node['device'])
|
||||
for mnode in more_nodes:
|
||||
print 'Server:Port Device\t%s:%s %s\t [Handoff]' \
|
||||
% (node['ip'], node['port'], node['device'])
|
||||
print "\n"
|
||||
more_nodes = Ring(ring).get_more_nodes(part)
|
||||
for node in nodes:
|
||||
acct_cont_obj = "%s/%s/%s" % (account, container, obj)
|
||||
print 'curl -I -XHEAD "http://%s:%s/%s/%s/%s"' \
|
||||
% (node['ip'],node['port'],node['device'],part,urllib.quote(acct_cont_obj))
|
||||
for mnode in more_nodes:
|
||||
acct_cont_obj = "%s/%s/%s" % (account, container, obj)
|
||||
print 'curl -I -XHEAD "http://%s:%s/%s/%s/%s" # [Handoff]' \
|
||||
% (mnode['ip'],mnode['port'],mnode['device'],part,urllib.quote(acct_cont_obj))
|
||||
print "\n"
|
||||
more_nodes = Ring(ring).get_more_nodes(part)
|
||||
for node in nodes:
|
||||
print 'ssh %s "ls -lah /srv/node/%s/objects/%s/%s/%s/"' \
|
||||
% (node['ip'],node['device'],part,hash_str[-3:],hash_str)
|
||||
for mnode in more_nodes:
|
||||
print 'ssh %s "ls -lah /srv/node/%s/objects/%s/%s/%s/" # [Handoff]' \
|
||||
% (mnode['ip'],mnode['device'],part,hash_str[-3:],hash_str)
|
||||
elif container:
|
||||
hash_str = hash_path(account,container)
|
||||
part, nodes = Ring(ring).get_nodes(account,container)
|
||||
more_nodes = Ring(ring).get_more_nodes(part)
|
||||
print '\nPartition %s' % part
|
||||
print 'Hash %s\n' % hash_str
|
||||
for node in nodes:
|
||||
print 'Server:Port Device\t%s:%s %s' \
|
||||
% (node['ip'], node['port'], node['device'])
|
||||
for mnode in more_nodes:
|
||||
print 'Server:Port Device\t%s:%s %s\t [Handoff]' \
|
||||
% (mnode['ip'], mnode['port'], mnode['device'])
|
||||
print "\n"
|
||||
more_nodes = Ring(ring).get_more_nodes(part)
|
||||
for node in nodes:
|
||||
acct_cont = "%s/%s" % (account,container)
|
||||
print 'curl -I -XHEAD "http://%s:%s/%s/%s/%s"' \
|
||||
% (node['ip'],node['port'],node['device'],part,urllib.quote(acct_cont))
|
||||
for mnode in more_nodes:
|
||||
acct_cont = "%s/%s" % (account,container)
|
||||
print 'curl -I -XHEAD "http://%s:%s/%s/%s/%s" # [Handoff]' \
|
||||
% (mnode['ip'],mnode['port'],mnode['device'],part,urllib.quote(acct_cont))
|
||||
print "\n"
|
||||
more_nodes = Ring(ring).get_more_nodes(part)
|
||||
for node in nodes:
|
||||
print 'ssh %s "ls -lah /srv/node/%s/containers/%s/%s/%s/%s.db"' \
|
||||
% (node['ip'],node['device'],part,hash_str[-3:],hash_str,hash_str)
|
||||
for mnode in more_nodes:
|
||||
print 'ssh %s "ls -lah /srv/node/%s/containers/%s/%s/%s/%s.db" # [Handoff]' \
|
||||
% (mnode['ip'],mnode['device'],part,hash_str[-3:],hash_str,hash_str)
|
||||
elif account:
|
||||
hash_str = hash_path(account)
|
||||
part, nodes = Ring(ring).get_nodes(account)
|
||||
more_nodes = Ring(ring).get_more_nodes(part)
|
||||
print '\nPartition %s' % part
|
||||
print 'Hash %s\n' % hash_str
|
||||
for node in nodes:
|
||||
print 'Server:Port Device\t%s:%s %s' \
|
||||
% (node['ip'], node['port'], node['device'])
|
||||
for mnode in more_nodes:
|
||||
print 'Server:Port Device\t%s:%s %s\t [Handoff]' \
|
||||
% (mnode['ip'], mnode['port'], mnode['device'])
|
||||
print "\n"
|
||||
for node in nodes:
|
||||
print 'curl -I -XHEAD "http://%s:%s/%s/%s/%s"' \
|
||||
% (node['ip'],node['port'],node['device'],part, urllib.quote(account))
|
||||
more_nodes = Ring(ring).get_more_nodes(part)
|
||||
for mnode in more_nodes:
|
||||
print 'curl -I -XHEAD "http://%s:%s/%s/%s/%s" # [Handoff]' \
|
||||
% (mnode['ip'],mnode['port'],mnode['device'],part, urllib.quote(account))
|
||||
print "\n"
|
||||
for node in nodes:
|
||||
print 'ssh %s "ls -lah /srv/node/%s/accounts/%s/%s/%s/%s.db"' \
|
||||
% (node['ip'],node['device'],part,hash_str[-3:],hash_str,hash_str)
|
||||
more_nodes = Ring(ring).get_more_nodes(part)
|
||||
for mnode in more_nodes:
|
||||
print 'ssh %s "ls -lah /srv/node/%s/accounts/%s/%s/%s/%s.db" # [Handoff]' \
|
||||
% (mnode['ip'],mnode['device'],part,hash_str[-3:],hash_str,hash_str)
|
||||
print "\n\n"
|
||||
for node in nodes:
|
||||
print 'Server:Port Device\t%s:%s %s' % (node['ip'], node['port'],
|
||||
node['device'])
|
||||
for mnode in more_nodes:
|
||||
print 'Server:Port Device\t%s:%s %s\t [Handoff]' \
|
||||
% (node['ip'], node['port'], node['device'])
|
||||
print "\n"
|
||||
for node in nodes:
|
||||
print 'curl -I -XHEAD "http://%s:%s/%s/%s/%s"' \
|
||||
% (node['ip'], node['port'], node['device'], part,
|
||||
urllib.quote(target))
|
||||
for mnode in more_nodes:
|
||||
print 'curl -I -XHEAD "http://%s:%s/%s/%s/%s" # [Handoff]' \
|
||||
% (mnode['ip'], mnode['port'], mnode['device'], part,
|
||||
urllib.quote(target))
|
||||
print "\n"
|
||||
for node in nodes:
|
||||
print 'ssh %s "ls -lah /srv/node/%s/objects/%s/%s/%s/"' \
|
||||
% (node['ip'], node['device'], part, hash_str[-3:], hash_str)
|
||||
for mnode in more_nodes:
|
||||
print 'ssh %s "ls -lah /srv/node/%s/objects/%s/%s/%s/" # [Handoff]' \
|
||||
% (mnode['ip'], mnode['device'], part, hash_str[-3:], hash_str)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user