Merge pull request ceph#64696 from rzarzynski/wip-bug-71966

rzarzynski · web-flow · commit cdb6321adefb · 2025-09-01T16:34:00.000+02:00
tools: make rados ls aware about the locator concept

Reviewed-by: Matan Breizman &lt;mbreizma@redhat.com&gt;
diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
@@ -2533,7 +2533,8 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
 #endif // WITH_LIBRADOSSTRIPER
           if (pgid) {
             uint32_t ps;
-            if (io_ctx.get_object_pg_hash_position2(i->get_oid(), &ps) || pgid->ps() != ps) {
+            if (const auto& key = i->get_locator().size() ? i->get_locator() : i->get_oid();
+		io_ctx.get_object_pg_hash_position2(key, &ps) || pgid->ps() != ps) {
               break;
 	    }
           }

Original file line number	Diff line number	Diff line change
`@@ -2533,7 +2533,8 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,`
`2533`	`2533`	`#endif // WITH_LIBRADOSSTRIPER`
`2534`	`2534`	`if (pgid) {`
`2535`	`2535`	`uint32_t ps;`
`2536`		`- if (io_ctx.get_object_pg_hash_position2(i->get_oid(), &ps) \|\| pgid->ps() != ps) {`
	`2536`	`+ if (const auto& key = i->get_locator().size() ? i->get_locator() : i->get_oid();`
	`2537`	`+ io_ctx.get_object_pg_hash_position2(key, &ps) \|\| pgid->ps() != ps) {`
`2537`	`2538`	`break;`
`2538`	`2539`	`}`
`2539`	`2540`	`}`