Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

shell: JSON output supported for more commands #329

Merged
merged 3 commits into from
May 26, 2019
Merged

shell: JSON output supported for more commands #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c27359e
shell: JSON output for more commands
acelyc111 May 22, 2019
7032c04
update rdsn
acelyc111 May 23, 2019
c7a115d
json param rename
acelyc111 May 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rdsn
Open in desktop
Submodule rdsn updated 19 files
+1 −0 .gitignore
+0 −12 include/dsn/cpp/rpc_stream.h
+2 −0 include/dsn/dist/replication/replication_app_base.h
+2 −1 include/dsn/dist/replication/replication_ddl_client.h
+17 −14 include/dsn/tool-api/message_parser.h
+3 −0 include/dsn/utility/output_utils.h
+3 −0 src/core/core/message_parser.cpp
+99 −0 src/core/tests/message_reader_test.cpp
+98 −97 src/core/tools/common/thrift_message_parser.cpp
+16 −21 src/core/tools/common/thrift_message_parser.h
+25 −17 src/dist/replication/ddl_lib/replication_ddl_client.cpp
+5 −0 src/dist/replication/lib/replication_app_base.cpp
+12 −2 src/dist/replication/meta_server/duplication/duplication_info.cpp
+4 −1 src/dist/replication/meta_server/duplication/duplication_info.h
+62 −2 src/dist/replication/meta_server/duplication/meta_duplication_service.cpp
+6 −0 src/dist/replication/meta_server/duplication/meta_duplication_service.h
+17 −0 src/dist/replication/meta_server/meta_service.cpp
+11 −6 src/dist/replication/test/meta_test/unit_test/duplication_info_test.cpp
+349 −0 src/dist/replication/test/meta_test/unit_test/meta_duplication_service_test.cpp
37 changes: 33 additions & 4 deletions src/shell/commands/node_management.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,40 @@

bool query_cluster_info(command_executor *e, shell_context *sc, arguments args)
{
::dsn::error_code err = sc->ddl_client->cluster_info("");
if (err == ::dsn::ERR_OK)
std::cout << "get cluster info succeed" << std::endl;
else
static struct option long_options[] = {{"resolve_ip", no_argument, 0, 'r'},
{"json", no_argument, 0, 'j'},
{"output", required_argument, 0, 'o'},
{0, 0, 0, 0}};

std::string out_file;
bool resolve_ip = false;
bool json = false;

optind = 0;
while (true) {
int option_index = 0;
int c = getopt_long(args.argc, args.argv, "rjo:", long_options, &option_index);
if (c == -1)
break;
switch (c) {
case 'r':
resolve_ip = true;
break;
case 'j':
json = true;
break;
case 'o':
out_file = optarg;
break;
default:
return false;
}
}

::dsn::error_code err = sc->ddl_client->cluster_info(out_file, resolve_ip, json);
if (err != ::dsn::ERR_OK) {
std::cout << "get cluster info failed, error=" << err.to_string() << std::endl;
}
return true;
}

Expand Down
167 changes: 88 additions & 79 deletions src/shell/commands/table_management.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,24 +66,35 @@ bool query_app(command_executor *e, shell_context *sc, arguments args)
if (args.argc <= 1)
return false;

static struct option long_options[] = {
{"detailed", no_argument, 0, 'd'}, {"output", required_argument, 0, 'o'}, {0, 0, 0, 0}};
static struct option long_options[] = {{"detailed", no_argument, 0, 'd'},
{"resolve_ip", no_argument, 0, 'r'},
{"output", required_argument, 0, 'o'},
{"json", no_argument, 0, 'j'},
{0, 0, 0, 0}};

std::string app_name = args.argv[1];
std::string out_file;
bool detailed = false;
bool resolve_ip = false;
bool json = false;

optind = 0;
while (true) {
int option_index = 0;
int c;
c = getopt_long(args.argc, args.argv, "do:", long_options, &option_index);
c = getopt_long(args.argc, args.argv, "dro:j", long_options, &option_index);
if (c == -1)
break;
switch (c) {
case 'd':
detailed = true;
break;
case 'r':
resolve_ip = true;
break;
case 'j':
json = true;
break;
case 'o':
out_file = optarg;
break;
Expand All @@ -92,29 +103,16 @@ bool query_app(command_executor *e, shell_context *sc, arguments args)
}
}

dsn::utils::table_printer tp;
if (!(app_name.empty() && out_file.empty())) {
std::cout << "[Parameters]" << std::endl;
if (!app_name.empty())
tp.add_row_name_and_data("app_name", app_name);
if (!out_file.empty())
tp.add_row_name_and_data("out_file", out_file);
}
tp.add_row_name_and_data("detailed", detailed);
tp.output(std::cout);

std::cout << std::endl << "[Result]" << std::endl;

if (app_name.empty()) {
std::cout << "ERROR: null app name" << std::endl;
return false;
}

::dsn::error_code err =
sc->ddl_client->list_app(app_name, detailed, out_file); // TODO resolve ip
if (err == ::dsn::ERR_OK)
std::cout << "list app " << app_name << " succeed" << std::endl;
else
std::cout << "list app " << app_name << " failed, error=" << err.to_string() << std::endl;
sc->ddl_client->list_app(app_name, detailed, json, out_file, resolve_ip);
if (err != ::dsn::ERR_OK) {
std::cout << "query app " << app_name << " failed, error=" << err.to_string() << std::endl;
}
return true;
}

Expand All @@ -123,24 +121,30 @@ bool app_disk(command_executor *e, shell_context *sc, arguments args)
if (args.argc <= 1)
return false;

static struct option long_options[] = {
{"detailed", no_argument, 0, 'd'}, {"output", required_argument, 0, 'o'}, {0, 0, 0, 0}};
static struct option long_options[] = {{"detailed", no_argument, 0, 'd'},
{"json", no_argument, 0, 'j'},
{"output", required_argument, 0, 'o'},
{0, 0, 0, 0}};

std::string app_name = args.argv[1];
std::string out_file;
bool detailed = false;
bool json = false;

optind = 0;
while (true) {
int option_index = 0;
int c;
c = getopt_long(args.argc, args.argv, "do:", long_options, &option_index);
c = getopt_long(args.argc, args.argv, "djo:", long_options, &option_index);
if (c == -1)
break;
switch (c) {
case 'd':
detailed = true;
break;
case 'j':
json = true;
break;
case 'o':
out_file = optarg;
break;
Expand All @@ -149,23 +153,32 @@ bool app_disk(command_executor *e, shell_context *sc, arguments args)
}
}

dsn::utils::table_printer tp_params;
if (app_name.empty()) {
std::cout << "ERROR: null app name" << std::endl;
return false;
}

std::streambuf *buf;
std::ofstream of;

if (!out_file.empty()) {
of.open(out_file);
buf = of.rdbuf();
} else {
buf = std::cout.rdbuf();
}
std::ostream out(buf);

dsn::utils::multi_table_printer mtp;
dsn::utils::table_printer tp_params("parameters");
if (!(app_name.empty() && out_file.empty())) {
std::cout << "[Parameters]" << std::endl;
if (!app_name.empty())
tp_params.add_row_name_and_data("app_name", app_name);
if (!out_file.empty())
tp_params.add_row_name_and_data("out_file", out_file);
}
tp_params.add_row_name_and_data("detailed", detailed);
tp_params.output(std::cout);

std::cout << std::endl << "[Result]" << std::endl;

if (app_name.empty()) {
std::cout << "ERROR: null app name" << std::endl;
return false;
}
mtp.add(std::move(tp_params));

int32_t app_id = 0;
int32_t partition_count = 0;
Expand Down Expand Up @@ -229,25 +242,13 @@ bool app_disk(command_executor *e, shell_context *sc, arguments args)
}
}

// print configuration_query_by_index_response
std::streambuf *buf;
std::ofstream of;

if (!out_file.empty()) {
of.open(out_file);
buf = of.rdbuf();
} else {
buf = std::cout.rdbuf();
}
std::ostream out(buf);

::dsn::utils::table_printer tp_general;
::dsn::utils::table_printer tp_general("result");
tp_general.add_row_name_and_data("app_name", app_name);
tp_general.add_row_name_and_data("app_id", app_id);
tp_general.add_row_name_and_data("partition_count", partition_count);
tp_general.add_row_name_and_data("max_replica_count", max_replica_count);

::dsn::utils::table_printer tp_details;
::dsn::utils::table_printer tp_details("details");
if (detailed) {
tp_details.add_title("pidx");
tp_details.add_column("ballot");
Expand Down Expand Up @@ -372,22 +373,19 @@ bool app_disk(command_executor *e, shell_context *sc, arguments args)
tp_general.add_row_name_and_data("disk_used_for_primary_replicas(MB)",
disk_used_for_primary_replicas);
tp_general.add_row_name_and_data("disk_used_for_all_replicas(MB)", disk_used_for_all_replicas);
tp_general.output(out);
tp_general.add_row_name_and_data("partitions not counted",
std::to_string(partition_count - primary_replicas_count) +
"/" + std::to_string(partition_count));
tp_general.add_row_name_and_data(
"replicas not counted",
std::to_string(partition_count * max_replica_count - all_replicas_count) + "/" +
std::to_string(partition_count * max_replica_count));
mtp.add(std::move(tp_general));
if (detailed) {
out << "details" << std::endl;
tp_details.output(out);
mtp.add(std::move(tp_details));
}
out << std::endl;
mtp.output(out, json ? tp_output_format::kJsonPretty : tp_output_format::kTabular);

if (primary_replicas_count < partition_count) {
out << " (" << (partition_count - primary_replicas_count) << "/" << partition_count
<< " partitions not counted)" << std::endl;
}
if (all_replicas_count < partition_count * max_replica_count) {
out << " (" << (partition_count * max_replica_count - all_replicas_count) << "/"
<< (partition_count * max_replica_count) << " replicas not counted)" << std::endl;
}
std::cout << "list disk usage for app " << app_name << " succeed" << std::endl;
return true;
}

Expand All @@ -396,19 +394,21 @@ bool app_stat(command_executor *e, shell_context *sc, arguments args)
static struct option long_options[] = {{"app_name", required_argument, 0, 'a'},
{"only_qps", required_argument, 0, 'q'},
{"only_usage", required_argument, 0, 'u'},
{"json", no_argument, 0, 'j'},
{"output", required_argument, 0, 'o'},
{0, 0, 0, 0}};

std::string app_name;
std::string out_file;
bool only_qps = false;
bool only_usage = false;
bool json = false;

optind = 0;
while (true) {
int option_index = 0;
int c;
c = getopt_long(args.argc, args.argv, "a:quo:", long_options, &option_index);
c = getopt_long(args.argc, args.argv, "a:qujo:", long_options, &option_index);
if (c == -1)
break;
switch (c) {
Expand All @@ -421,6 +421,9 @@ bool app_stat(command_executor *e, shell_context *sc, arguments args)
case 'u':
only_usage = true;
break;
case 'j':
json = true;
break;
case 'o':
out_file = optarg;
break;
Expand Down Expand Up @@ -481,7 +484,7 @@ bool app_stat(command_executor *e, shell_context *sc, arguments args)
}
std::ostream out(buf);

::dsn::utils::table_printer tp;
::dsn::utils::table_printer tp("app_stat");
tp.add_title(app_name.empty() ? "app_name" : "pidx");
if (app_name.empty()) {
tp.add_column("app_id", tp_alignment::kRight);
Expand Down Expand Up @@ -547,13 +550,8 @@ bool app_stat(command_executor *e, shell_context *sc, arguments args)
: row.rdb_block_cache_hit_count / row.rdb_block_cache_total_count;
tp.append_data(block_cache_hit_rate);
}
tp.output(out);
tp.output(out, json ? tp_output_format::kJsonPretty : tp_output_format::kTabular);

std::cout << std::endl;
if (app_name.empty())
std::cout << "list statistics for apps succeed" << std::endl;
else
std::cout << "list statistics for app " << app_name << " succeed" << std::endl;
return true;
}

Expand Down Expand Up @@ -676,29 +674,40 @@ bool recall_app(command_executor *e, shell_context *sc, arguments args)

bool get_app_envs(command_executor *e, shell_context *sc, arguments args)
{
static struct option long_options[] = {{"json", no_argument, 0, 'j'}, {0, 0, 0, 0}};
acelyc111 marked this conversation as resolved.
Show resolved Hide resolved
bool json = false;
optind = 0;
while (true) {
int option_index = 0;
int c = getopt_long(args.argc, args.argv, "j", long_options, &option_index);
if (c == -1)
break;
switch (c) {
case 'j':
json = true;
break;
default:
return false;
}
}

if (sc->current_app_name.empty()) {
fprintf(stderr, "No app is using now\nUSAGE: use [app_name]\n");
return true;
}

if (args.argc != 1) {
return false;
}

std::map<std::string, std::string> envs;
::dsn::error_code ret = sc->ddl_client->get_app_envs(sc->current_app_name, envs);
if (ret != ::dsn::ERR_OK) {
fprintf(stderr, "get app env failed with err = %s\n", ret.to_string());
return true;
}

std::cout << "get app envs succeed, count = " << envs.size() << std::endl;
if (!envs.empty()) {
std::cout << "=================================" << std::endl;
for (auto &kv : envs)
std::cout << kv.first << " = " << kv.second << std::endl;
std::cout << "=================================" << std::endl;
::dsn::utils::table_printer tp("app_envs");
for (auto &kv : envs) {
tp.add_row_name_and_data(kv.first, kv.second);
}
tp.output(std::cout, json ? tp_output_format::kJsonPretty : tp_output_format::kTabular);

return true;
}
Expand Down
Loading