]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rados: return legacy address in 'lock info'
authorJason Dillaman <dillaman@redhat.com>
Fri, 25 Jan 2019 14:12:15 +0000 (09:12 -0500)
committerJason Dillaman <dillaman@redhat.com>
Fri, 25 Jan 2019 14:12:15 +0000 (09:12 -0500)
There is no need to differentiate v1 vs v2 addresses and we should
avoid breaking backwards compatibility in the output.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/tools/rados/rados.cc

index b0531c377482e8bb331027fa6cf6ef61a0cc40df..9774dfdede6cb4f6f6463092ca3515d9c456b6bf 100644 (file)
@@ -1261,7 +1261,7 @@ static int do_lock_cmd(std::vector<const char*> &nargs,
       formatter->dump_string("cookie", id.cookie);
       formatter->dump_string("description", info.description);
       formatter->dump_stream("expiration") << info.expiration;
-      formatter->dump_stream("addr") << info.addr;
+      formatter->dump_stream("addr") << info.addr.get_legacy_str();
       formatter->close_section();
     }
     formatter->close_section();