RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9599 from sdieffen/feature15904

Browse Source 
added -f flag for formatting to rados command line tool

Reviewed-by: Samuel Just <sjust@redhat.com>
This commit is contained in:
Samuel Just 2016-06-17 14:46:11 -07:00 committed by GitHub
commit 60052a677a
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/tools/rados/rados.cc
View File

@ -41,6 +41,7 @@ using namespace libradosstriper;
#include <stdexcept>
#include <climits>
#include <locale>
#include <memory>
#include "cls/lock/cls_lock_client.h"
#include "include/compat.h"
@ -3284,12 +3285,36 @@ int main(int argc, const char **argv)
argv_to_vec(argc, argv, args);
env_to_vec(args);
std::map < std::string, std::string > opts;
std::string val;
// Necessary to support usage of -f for formatting,
// since global_init will remove the -f using ceph
// argparse procedures.
for (auto j = args.begin(); j != args.end(); ++j) {
if (strcmp(*j, "--") == 0) {
break;
} else if ((j+1) == args.end()) {
// This can't be a formatting call (no format arg)
break;
} else if (strcmp(*j, "-f") == 0) {
val = *(j+1);
unique_ptr<Formatter> formatter(Formatter::create(val.c_str()));
if (formatter) {
j = args.erase(j);
opts["format"] = val;
j = args.erase(j);
break;
}
}
}
global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0);
common_init_finish(g_ceph_context);
std::map < std::string, std::string > opts;
std::vector<const char*>::iterator i;
std::string val;
for (i = args.begin(); i != args.end(); ) {
if (ceph_argparse_double_dash(args, i)) {
break;