summaryrefslogtreecommitdiffstats
path: root/cli/src/cli-rpc-ops.c
diff options
context:
space:
mode:
Diffstat (limited to 'cli/src/cli-rpc-ops.c')
-rw-r--r--cli/src/cli-rpc-ops.c146
1 files changed, 114 insertions, 32 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index 013dd09b640..252f0b12279 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -2298,7 +2298,8 @@ out:
}
static int
-print_quota_list_output (char *mountdir, char *default_sl, char *path)
+print_quota_list_output (cli_local_t *local, char *mountdir,
+ char *default_sl, char *path)
{
int64_t used_space = 0;
int64_t avail = 0;
@@ -2328,10 +2329,30 @@ print_quota_list_output (char *mountdir, char *default_sl, char *path)
#if defined(ENOATTR) && (ENOATTR != ENODATA)
case ENOATTR:
#endif
- cli_err ("%-40s %s", path, "Limit not set");
+ if (global_state->mode & GLUSTER_MODE_XML) {
+ ret = cli_quota_list_xml_error
+ (local, path, "Limit not set");
+ if (ret) {
+ gf_log ("cli", GF_LOG_ERROR, "Failed "
+ "to print xml output");
+ goto out;
+ }
+ } else {
+ cli_err ("%-40s %s", path, "Limit not set");
+ }
break;
default:
- cli_err ("%-40s %s", path, strerror (errno));
+ if (global_state->mode & GLUSTER_MODE_XML) {
+ ret = cli_quota_list_xml_error
+ (local, path, strerror (errno));
+ if (ret) {
+ gf_log ("cli", GF_LOG_ERROR, "Failed "
+ "to print xml output");
+ goto out;
+ }
+ } else {
+ cli_err ("%-40s %s", path, strerror (errno));
+ }
break;
}
@@ -2355,8 +2376,18 @@ print_quota_list_output (char *mountdir, char *default_sl, char *path)
&used_space, sizeof (used_space));
if (ret < 0) {
- cli_out ("%-40s %7s %9s %11s %7s", path, hl_str, sl_final,
- "N/A", "N/A");
+ if (global_state->mode & GLUSTER_MODE_XML) {
+ ret = cli_quota_xml_output (local, path, hl_str,
+ sl_final, "N/A", "N/A");
+ if (ret) {
+ gf_log ("cli", GF_LOG_ERROR, "Failed to "
+ "output in xml format for quota "
+ "list command");
+ }
+ } else {
+ cli_out ("%-40s %7s %9s %11s %7s", path, hl_str,
+ sl_final, "N/A", "N/A");
+ }
} else {
used_space = ntoh64 (used_space);
@@ -2368,6 +2399,17 @@ print_quota_list_output (char *mountdir, char *default_sl, char *path)
avail = 0;
avail_str = gf_uint64_2human_readable (avail);
+ if (global_state->mode & GLUSTER_MODE_XML) {
+ ret = cli_quota_xml_output (local, path, hl_str,
+ sl_final, used_str, avail_str);
+ if (ret) {
+ gf_log ("cli", GF_LOG_ERROR, "Failed to "
+ "output in xml format for quota "
+ "list command");
+ }
+ goto out;
+ }
+
if (used_str == NULL)
cli_out ("%-40s %7s %9s %11"PRIu64
"%9"PRIu64, path, hl_str,
@@ -2385,14 +2427,17 @@ out:
}
int
-gf_cli_print_limit_list_from_dict (char *volname, dict_t *dict,
- char *default_sl, int count, char *op_errstr)
+gf_cli_print_limit_list_from_dict (cli_local_t *local, char *volname,
+ dict_t *dict, char *default_sl, int count,
+ int op_ret, int op_errno, char *op_errstr)
{
- int ret = -1;
- int i = 0;
- char key[1024] = {0,};
- char mountdir[PATH_MAX] = {0,};
- char *path = NULL;
+ int ret = -1;
+ int i = 0;
+ char key[1024] = {0,};
+ char mountdir[PATH_MAX] = {0,};
+ char *path = NULL;
+ gf_boolean_t xml_err_flag = _gf_false;
+ char err_str[NAME_MAX] = {0,};
if (!dict|| count <= 0)
goto out;
@@ -2401,8 +2446,15 @@ gf_cli_print_limit_list_from_dict (char *volname, dict_t *dict,
* to list them
*/
if (!_limits_set_on_volume (volname)) {
+ snprintf (err_str, sizeof (err_str), "No quota configured on "
+ "volume %s", volname);
+ if (global_state->mode & GLUSTER_MODE_XML) {
+ xml_err_flag = _gf_true;
+ } else {
+ cli_out ("quota: %s", err_str);
+ }
+
ret = 0;
- cli_out ("quota: No quota configured on volume %s", volname);
goto out;
}
@@ -2412,10 +2464,20 @@ gf_cli_print_limit_list_from_dict (char *volname, dict_t *dict,
goto out;
}
- cli_out (" Path Hard-limit "
- "Soft-limit Used Available");
- cli_out ("-----------------------------------------------------"
- "---------------------------");
+ if (global_state->mode & GLUSTER_MODE_XML) {
+ ret = cli_xml_output_vol_quota_limit_list_begin
+ (local, op_ret, op_errno, op_errstr);
+ if (ret) {
+ gf_log ("cli", GF_LOG_ERROR,
+ "Error outputting xml begin");
+ goto out;
+ }
+ } else {
+ cli_out (" Path Hard-limit "
+ "Soft-limit Used Available");
+ cli_out ("-----------------------------------------------------"
+ "---------------------------");
+ }
while (count--) {
snprintf (key, sizeof (key), "path%d", i++);
@@ -2431,10 +2493,18 @@ gf_cli_print_limit_list_from_dict (char *volname, dict_t *dict,
if (ret)
goto out;
GLUSTERD_GET_QUOTA_AUX_MOUNT_PATH (mountdir, volname, path);
- ret = print_quota_list_output (mountdir, default_sl, path);
+ ret = print_quota_list_output (local, mountdir, default_sl,
+ path);
}
out:
+ if (xml_err_flag) {
+ ret = cli_xml_output_str ("volQuota", NULL, -1, 0, err_str);
+ if (ret) {
+ gf_log ("cli", GF_LOG_ERROR, "Error outputting in xml "
+ "format");
+ }
+ }
return ret;
}
@@ -2514,6 +2584,17 @@ print_quota_list_from_quotad (call_frame_t *frame, dict_t *rsp_dict)
avail = 0;
avail_str = gf_uint64_2human_readable (avail);
+ if (global_state->mode & GLUSTER_MODE_XML) {
+ ret = cli_quota_xml_output (local, path, hl_str,
+ sl_final, used_str, avail_str);
+ if (ret) {
+ gf_log ("cli", GF_LOG_ERROR, "Failed in "
+ "printing xml output for quota list "
+ "command");
+ }
+ goto out;
+ }
+
if (used_str == NULL)
cli_out ("%-40s %7s %9s %11"PRIu64
"%9"PRIu64, path, hl_str,
@@ -2623,8 +2704,9 @@ out:
}
void
-gf_cli_quota_list (char *volname, dict_t *dict, int count, char *op_errstr,
- char *default_sl)
+gf_cli_quota_list (cli_local_t *local, char *volname, dict_t *dict,
+ char *default_sl, int count, int op_ret,
+ int op_errno, char *op_errstr)
{
GF_VALIDATE_OR_GOTO ("cli", volname, out);
@@ -2632,8 +2714,9 @@ gf_cli_quota_list (char *volname, dict_t *dict, int count, char *op_errstr,
goto out;
if (count > 0)
- gf_cli_print_limit_list_from_dict (volname, dict, default_sl,
- count, op_errstr);
+ gf_cli_print_limit_list_from_dict (local, volname, dict,
+ default_sl, count, op_ret,
+ op_errno, op_errstr);
out:
return;
}
@@ -2649,7 +2732,6 @@ gf_cli_quota_cbk (struct rpc_req *req, struct iovec *iov,
int32_t type = 0;
call_frame_t *frame = NULL;
char *default_sl = NULL;
- char *limit_list = NULL;
cli_local_t *local = NULL;
dict_t *aggr = NULL;
char *default_sl_dup = NULL;
@@ -2736,18 +2818,18 @@ gf_cli_quota_cbk (struct rpc_req *req, struct iovec *iov,
gf_log (frame->this->name, GF_LOG_TRACE, "failed to get count");
if (type == GF_QUOTA_OPTION_TYPE_LIST) {
+ gf_cli_quota_list (local, volname, dict, default_sl,
+ entry_count, rsp.op_ret,
+ rsp.op_errno, rsp.op_errstr);
if (global_state->mode & GLUSTER_MODE_XML) {
- ret = cli_xml_output_vol_quota_limit_list
- (volname, limit_list, rsp.op_ret,
- rsp.op_errno, rsp.op_errstr);
- if (ret)
- gf_log ("cli", GF_LOG_ERROR,
- "Error outputting to xml");
+ ret = cli_xml_output_vol_quota_limit_list_end (local);
+ if (ret < 0) {
+ ret = -1;
+ gf_log ("cli", GF_LOG_ERROR, "Error in printing"
+ " xml output");
+ }
goto out;
}
-
- gf_cli_quota_list (volname, dict, entry_count, rsp.op_errstr,
- default_sl);
}
xml_output:
generated by cgit (git 2.34.1) at 2024-05-06 03:44:58 +0000