Skip to content

Commit 87d633d

Browse files
committed
tools/rados: deprecate --write-{object,omap,xattr}
With the introduction of OMAP read benchmarking they became `--object`, `--omap` and `--xattr` respectively. Signed-off-by: Radoslaw Zarzynski <[email protected]>
1 parent 9c60cfc commit 87d633d

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

src/tools/rados/rados.cc

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,12 @@ void usage(ostream& out)
252252
" prefix output with date/time\n"
253253
" --no-verify\n"
254254
" do not verify contents of read objects\n"
255-
" --write-object\n"
256-
" write contents to the objects\n"
257-
" --write-omap\n"
258-
" write contents to the omap\n"
259-
" --write-xattr\n"
260-
" write contents to the extended attributes\n"
255+
" --object | --write-object (deprecated)\n"
256+
" read or write contents to the objects\n"
257+
" --omap | --write-omap (deprecated)\n"
258+
" read or write contents to the omap\n"
259+
" --xattr | write-xattr (deprecated)\n"
260+
" read or write contents to the extended attributes\n"
261261
"\n"
262262
"LOAD GEN OPTIONS:\n"
263263
" --num-objects total number of objects\n"
@@ -4284,17 +4284,19 @@ int main(int argc, const char **argv)
42844284
} else if (ceph_argparse_witharg(args, i, &val, "-o", "--output", (char*)NULL)) {
42854285
opts["output"] = val;
42864286
} else if (ceph_argparse_flag(args, i, "--write-omap", (char*)NULL)) {
4287-
// write- prefixed dests are legacy
4287+
// write- prefixed dests are legacy and have been deprecated
42884288
opts["dest-omap"] = "true";
42894289
} else if (ceph_argparse_flag(args, i, "--write-object", (char*)NULL)) {
4290+
// write- prefixed dests are legacy and have been deprecated
42904291
opts["dest-obj"] = "true";
42914292
} else if (ceph_argparse_flag(args, i, "--write-xattr", (char*)NULL)) {
4293+
// write- prefixed dests are legacy and have been deprecated
42924294
opts["dest-xattr"] = "true";
4293-
} else if (ceph_argparse_flag(args, i, "--read-omap", (char*)NULL)) {
4295+
} else if (ceph_argparse_flag(args, i, "--omap", (char*)NULL)) {
42944296
opts["dest-omap"] = "true";
4295-
} else if (ceph_argparse_flag(args, i, "--read-object", (char*)NULL)) {
4297+
} else if (ceph_argparse_flag(args, i, "--object", (char*)NULL)) {
42964298
opts["dest-obj"] = "true";
4297-
} else if (ceph_argparse_flag(args, i, "--read-xattr", (char*)NULL)) {
4299+
} else if (ceph_argparse_flag(args, i, "--xattr", (char*)NULL)) {
42984300
opts["dest-xattr"] = "true";
42994301
} else if (ceph_argparse_flag(args, i, "--with-clones", (char*)NULL)) {
43004302
opts["with-clones"] = "true";

0 commit comments

Comments
 (0)