From 63061e37ed098bf1ad509177484037544eb6b089 Mon Sep 17 00:00:00 2001 From: Kun Huang Date: Tue, 23 Jul 2013 13:46:51 +0800 Subject: [PATCH] Add notes for /srv/node in swift-object-info 'devices' is set in object-server.conf on each node, not in ring data, and the things printed here is just for watching not for running, so just leave a note here. (this https://review.openstack.org/#/c/23951/ is used for running, so just a note is not enough) mark this commit as bug fixing is because this script is the last place using /srv/node but not from conf as Chmouel said. fixes import change on read_metadata fixes bug #885006 Change-Id: I727ec2d01c093af61fd3895e5701d87ef67cd9ff --- bin/swift-object-info | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/swift-object-info b/bin/swift-object-info index 3ecd1ced2d..dae58c194f 100755 --- a/bin/swift-object-info +++ b/bin/swift-object-info @@ -19,7 +19,7 @@ from datetime import datetime from hashlib import md5 from swift.common.ring import Ring -from swift.obj.server import read_metadata +from swift.obj.diskfile import read_metadata from swift.common.utils import hash_path if __name__ == '__main__': @@ -88,4 +88,7 @@ if __name__ == '__main__': else: print 'Content-Length: Not found in metadata' print 'User Metadata: %s' % metadata + print + print 'note: /srv/node is used as default value of `devices`, the real '\ + 'value is set in object-server.conf on each storage node.' fp.close()