andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cli: Changes and enhancements to XML output

Browse Source 
This patch contains several xml related changes which fix some bugs and
introduce xml output for commands which were missing it. These include,
* XML output for rebalance & remove-brick status
* XML output for replace-brick
* XML output for 'volume status all' in on xml document
* proper XML output for "volume {create|start|stop|delete}"
* type & status of a volume in 'volume info' is now given as a string as well

This patch also cleans up the '#if (HAVE_LIB_XML)' sections from the code-base,
so that it is not littered around.

Change-Id: I5bb022adf0fedf7e3ead92b4b79bfa02b0b5fef5
BUG: 828131
Signed-off-by: Kaushal M <kaushal@redhat.com>
Reviewed-on: http://review.gluster.org/3869
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
This commit is contained in:
Kaushal M 2012-09-06 13:08:00 +05:30 committed by Anand Avati
parent 6be13228c4
commit f1f3d1c62d
6 changed files with 913 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

334
cli/src/cli-rpc-ops.c
View File

@ -48,20 +48,19 @@ extern rpc_clnt_prog_t *cli_rpc_prog;
extern int cli_op_ret;
extern int connected;
char *cli_volume_type[] = {"Distribute",
"Stripe",
"Replicate",
"Striped-Replicate",
"Distributed-Stripe",
"Distributed-Replicate",
"Distributed-Striped-Replicate",
};
char *cli_vol_type_str[] = {"Distribute",
"Stripe",
"Replicate",
"Striped-Replicate",
"Distributed-Stripe",
"Distributed-Replicate",
"Distributed-Striped-Replicate",
};
char *cli_volume_status[] = {"Created",
"Started",
"Stopped"
};
char *cli_vol_status_str[] = {"Created",
"Started",
"Stopped",
};
int32_t
gf_cli_get_volume (call_frame_t *frame, xlator_t *this,
@ -179,7 +178,6 @@ gf_cli_probe_cbk (struct rpc_req *req, struct iovec *iov,
gf_log ("cli", GF_LOG_ERROR, "%s", msg);
}
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_str ("peerProbe", msg, rsp.op_ret,
rsp.op_errno, NULL);
@ -188,7 +186,7 @@ gf_cli_probe_cbk (struct rpc_req *req, struct iovec *iov,
"Error outputting to xml");
goto out;
}
#endif
if (!rsp.op_ret)
cli_out ("peer probe: %s", msg);
else
@ -263,7 +261,6 @@ gf_cli_deprobe_cbk (struct rpc_req *req, struct iovec *iov,
snprintf (msg, sizeof (msg), "success");
}
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_str ("peerDetach", msg, rsp.op_ret,
rsp.op_errno, NULL);
@ -272,7 +269,7 @@ gf_cli_deprobe_cbk (struct rpc_req *req, struct iovec *iov,
"Error outputting to xml");
goto out;
}
#endif
if (!rsp.op_ret)
cli_out ("peer detach: %s", msg);
else
@ -324,7 +321,6 @@ gf_cli_list_friends_cbk (struct rpc_req *req, struct iovec *iov,
if (!rsp.friends.friends_len) {
snprintf (msg, sizeof (msg),
"peer status: No peers present");
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_peer_status (dict,
rsp.op_ret,
@ -335,7 +331,6 @@ gf_cli_list_friends_cbk (struct rpc_req *req, struct iovec *iov,
"Error outputting to xml");
goto out;
}
#endif
cli_err ("%s", msg);
ret = 0;
goto out;
@ -358,7 +353,6 @@ gf_cli_list_friends_cbk (struct rpc_req *req, struct iovec *iov,
goto out;
}
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_peer_status (dict, rsp.op_ret,
rsp.op_errno, msg);
@ -367,9 +361,8 @@ gf_cli_list_friends_cbk (struct rpc_req *req, struct iovec *iov,
"Error outputting to xml");
goto out;
}
#endif
ret = dict_get_int32 (dict, "count", &count);
ret = dict_get_int32 (dict, "count", &count);
if (ret) {
goto out;
}
@ -419,16 +412,13 @@ gf_cli_list_friends_cbk (struct rpc_req *req, struct iovec *iov,
i++;
}
} else {
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_peer_status (dict, rsp.op_ret,
rsp.op_errno, NULL);
if (ret)
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
} else
#endif
{
} else {
ret = -1;
}
goto out;
@ -520,10 +510,8 @@ gf_cli_get_volume_cbk (struct rpc_req *req, struct iovec *iov,
}
if (!rsp.dict.dict_len) {
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML)
goto xml_output;
#endif
cli_err ("No volumes present");
ret = 0;
goto out;
@ -567,16 +555,11 @@ gf_cli_get_volume_cbk (struct rpc_req *req, struct iovec *iov,
"Volume %s does not exist",
local->get_vol.volname);
ret = -1;
#if (HAVE_LIB_XML)
if (!(global_state->mode & GLUSTER_MODE_XML))
#endif
{
goto out;
}
}
}
#if (HAVE_LIB_XML)
xml_output:
if (global_state->mode & GLUSTER_MODE_XML) {
/* For GET_NEXT_VOLUME output is already begun in
@ -610,7 +593,6 @@ xml_output:
}
goto out;
}
#endif
while ( i < count) {
cli_out (" ");
@ -666,9 +648,9 @@ xml_output:
vol_type = type + 3;
cli_out ("Volume Name: %s", volname);
cli_out ("Type: %s", cli_volume_type[vol_type]);
cli_out ("Type: %s", cli_vol_type_str[vol_type]);
cli_out ("Volume ID: %s", volume_id_str);
cli_out ("Status: %s", cli_volume_status[status]);
cli_out ("Status: %s", cli_vol_status_str[status]);
if (type == GF_CLUSTER_TYPE_STRIPE_REPLICATE) {
cli_out ("Number of Bricks: %d x %d x %d = %d",
@ -770,6 +752,7 @@ gf_cli_create_volume_cbk (struct rpc_req *req, struct iovec *iov,
cli_local_t *local = NULL;
char *volname = NULL;
dict_t *dict = NULL;
dict_t *rsp_dict = NULL;
if (-1 == req->rpc_status) {
goto out;
@ -783,22 +766,34 @@ gf_cli_create_volume_cbk (struct rpc_req *req, struct iovec *iov,
goto out;
}
gf_log ("cli", GF_LOG_INFO, "Received resp to create volume");
dict = local->dict;
ret = dict_get_str (dict, "volname", &volname);
if (ret)
goto out;
gf_log ("cli", GF_LOG_INFO, "Received resp to create volume");
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_dict ("volCreate", dict, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
if (rsp.op_ret == 0) {
rsp_dict = dict_new ();
ret = dict_unserialize (rsp.dict.dict_val,
rsp.dict.dict_len,
&rsp_dict);
if (ret) {
gf_log ("cli", GF_LOG_ERROR,
"Failed rsp_dict unserialization");
goto out;
}
}
ret = cli_xml_output_vol_create (rsp_dict, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
if (ret)
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
cli_err ("volume create: %s: failed: %s", volname,
@ -828,6 +823,7 @@ gf_cli_delete_volume_cbk (struct rpc_req *req, struct iovec *iov,
char *volname = NULL;
call_frame_t *frame = NULL;
dict_t *dict = NULL;
dict_t *rsp_dict = NULL;
if (-1 == req->rpc_status) {
goto out;
@ -853,16 +849,27 @@ gf_cli_delete_volume_cbk (struct rpc_req *req, struct iovec *iov,
gf_log ("cli", GF_LOG_INFO, "Received resp to delete volume");
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_dict ("volDelete", dict, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
if (rsp.op_ret == 0) {
rsp_dict = dict_new ();
ret = dict_unserialize (rsp.dict.dict_val,
rsp.dict.dict_len,
&rsp_dict);
if (ret) {
gf_log ("cli", GF_LOG_ERROR,
"Failed rsp_dict unserialization");
goto out;
}
}
ret = cli_xml_output_generic_volume ("volDelete", rsp_dict,
rsp.op_ret, rsp.op_errno,
rsp.op_errstr);
if (ret)
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
cli_err ("volume delete: %s: failed: %s", volname,
@ -892,6 +899,7 @@ gf_cli_start_volume_cbk (struct rpc_req *req, struct iovec *iov,
char *volname = NULL;
call_frame_t *frame = NULL;
dict_t *dict = NULL;
dict_t *rsp_dict = NULL;
if (-1 == req->rpc_status) {
goto out;
@ -919,16 +927,27 @@ gf_cli_start_volume_cbk (struct rpc_req *req, struct iovec *iov,
gf_log ("cli", GF_LOG_INFO, "Received resp to start volume");
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_dict ("volStart", dict, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
if (rsp.op_ret == 0) {
rsp_dict = dict_new ();
ret = dict_unserialize (rsp.dict.dict_val,
rsp.dict.dict_len,
&rsp_dict);
if (ret) {
gf_log ("cli", GF_LOG_ERROR,
"Failed rsp_dict unserialization");
goto out;
}
}
ret = cli_xml_output_generic_volume ("volStart", rsp_dict,
rsp.op_ret, rsp.op_errno,
rsp.op_errstr);
if (ret)
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
cli_err ("volume start: %s: failed: %s", volname,
@ -957,6 +976,7 @@ gf_cli_stop_volume_cbk (struct rpc_req *req, struct iovec *iov,
char *volname = NULL;
call_frame_t *frame = NULL;
dict_t *dict = NULL;
dict_t *rsp_dict = NULL;
if (-1 == req->rpc_status) {
goto out;
@ -985,16 +1005,27 @@ gf_cli_stop_volume_cbk (struct rpc_req *req, struct iovec *iov,
gf_log ("cli", GF_LOG_INFO, "Received resp to stop volume");
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_dict ("volStop", dict, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
if (rsp.op_ret == 0) {
rsp_dict = dict_new ();
ret = dict_unserialize (rsp.dict.dict_val,
rsp.dict.dict_len,
&rsp_dict);
if (ret) {
gf_log ("cli", GF_LOG_ERROR,
"Failed rsp_dict unserialization");
goto out;
}
}
ret = cli_xml_output_generic_volume ("volStop", rsp_dict,
rsp.op_ret, rsp.op_errno,
rsp.op_errstr);
if (ret)
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
cli_err ("volume stop: %s: failed: %s", volname, rsp.op_errstr);
@ -1128,6 +1159,13 @@ gf_cli_defrag_volume_cbk (struct rpc_req *req, struct iovec *iov,
}
}
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_vol_rebalance (cmd, dict, rsp.op_ret,
rsp.op_errno,
rsp.op_errstr);
goto out;
}
ret = dict_get_int32 (dict, "count", &counter);
if (ret) {
gf_log (THIS->name, GF_LOG_ERROR, "count not set");
@ -1217,16 +1255,6 @@ gf_cli_defrag_volume_cbk (struct rpc_req *req, struct iovec *iov,
done:
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_str ("volRebalance", msg, rsp.op_ret,
status_rcd, rsp.op_errstr);
if (ret)
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret)
cli_err ("volume rebalance: %s: failed: %s", volname, msg);
else
@ -1265,7 +1293,6 @@ gf_cli_rename_volume_cbk (struct rpc_req *req, struct iovec *iov,
snprintf (msg, sizeof (msg), "Rename volume %s",
(rsp.op_ret) ? "unsuccessful": "successful");
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_str ("volRename", msg, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
@ -1274,7 +1301,6 @@ gf_cli_rename_volume_cbk (struct rpc_req *req, struct iovec *iov,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret)
cli_err ("volume rename: failed");
@ -1314,7 +1340,6 @@ gf_cli_reset_volume_cbk (struct rpc_req *req, struct iovec *iov,
snprintf (msg, sizeof (msg), "reset volume %s",
(rsp.op_ret) ? "unsuccessful": "successful");
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_str ("volReset", msg, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
@ -1323,7 +1348,6 @@ gf_cli_reset_volume_cbk (struct rpc_req *req, struct iovec *iov,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret)
cli_err ("volume reset: failed: %s", msg);
@ -1372,7 +1396,6 @@ gf_cli_set_volume_cbk (struct rpc_req *req, struct iovec *iov,
snprintf (msg, sizeof (msg), "Set volume %s",
(rsp.op_ret) ? "unsuccessful": "successful");
#if (HAVE_LIB_XML)
if ((global_state->mode & GLUSTER_MODE_XML) && (help_str == NULL)) {
ret = cli_xml_output_str ("volSet", msg, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
@ -1381,7 +1404,6 @@ gf_cli_set_volume_cbk (struct rpc_req *req, struct iovec *iov,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
cli_err ("volume set: failed: %s", rsp.op_errstr);
@ -1431,7 +1453,6 @@ gf_cli_add_brick_cbk (struct rpc_req *req, struct iovec *iov,
snprintf (msg, sizeof (msg), "Add Brick %s",
(rsp.op_ret) ? "unsuccessful": "successful");
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_str ("volAddBrick", msg, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
@ -1440,7 +1461,6 @@ gf_cli_add_brick_cbk (struct rpc_req *req, struct iovec *iov,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret)
cli_err ("volume add-brick: failed: %s", rsp.op_errstr);
@ -1466,7 +1486,7 @@ gf_cli3_remove_brick_status_cbk (struct rpc_req *req, struct iovec *iov,
uint64_t size = 0;
uint64_t lookup = 0;
dict_t *dict = NULL;
//char msg[1024] = {0,};
char msg[1024] = {0,};
char key[256] = {0,};
int32_t i = 1;
int32_t counter = 0;
@ -1490,11 +1510,16 @@ gf_cli3_remove_brick_status_cbk (struct rpc_req *req, struct iovec *iov,
ret = rsp.op_ret;
if (rsp.op_ret == -1) {
if (strcmp (rsp.op_errstr, ""))
cli_err ("volume remove-brick: failed: %s",
rsp.op_errstr);
snprintf (msg, sizeof (msg), "volume remove-brick: "
"failed: %s", rsp.op_errstr);
else
cli_err ("volume remove-brick: failed: "
"status getting failed");
snprintf (msg, sizeof (msg), "volume remove-brick: "
"failed: status getting failed");
if (global_state->mode & GLUSTER_MODE_XML)
goto xml_output;
cli_err ("%s", msg);
goto out;
}
@ -1506,13 +1531,35 @@ gf_cli3_remove_brick_status_cbk (struct rpc_req *req, struct iovec *iov,
rsp.dict.dict_len,
&dict);
if (ret < 0) {
gf_log ("glusterd", GF_LOG_ERROR,
"failed to "
"unserialize req-buffer to dictionary");
strncpy (msg, "failed to unserialize req-buffer to "
"dictionary", sizeof (msg));
if (global_state->mode & GLUSTER_MODE_XML) {
rsp.op_ret = -1;
goto xml_output;
}
gf_log ("cli", GF_LOG_ERROR, "%s", msg);
goto out;
}
}
xml_output:
if (global_state->mode & GLUSTER_MODE_XML) {
if (strcmp (rsp.op_errstr, "")) {
ret = cli_xml_output_vol_remove_brick (_gf_true, dict,
rsp.op_ret,
rsp.op_errno,
rsp.op_errstr);
} else {
ret = cli_xml_output_vol_remove_brick (_gf_true, dict,
rsp.op_ret,
rsp.op_errno,
msg);
}
goto out;
}
ret = dict_get_int32 (dict, "count", &counter);
if (ret) {
gf_log (THIS->name, GF_LOG_ERROR, "count not set");
@ -1601,21 +1648,6 @@ gf_cli3_remove_brick_status_cbk (struct rpc_req *req, struct iovec *iov,
i++;
} while (i <= counter);
//TODO: Do proper xml output
/*
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_str ("volRemoveBrick", msg, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
if (ret)
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
goto out;
}
#endif
cli_out ("%s", msg);
*/
out:
free (rsp.dict.dict_val); //malloced by xdr
if (dict)
@ -1680,16 +1712,16 @@ gf_cli_remove_brick_cbk (struct rpc_req *req, struct iovec *iov,
snprintf (msg, sizeof (msg), "Remove Brick %s %s", cmd_str,
(rsp.op_ret) ? "unsuccessful": "successful");
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_str ("volRemoveBrick", msg, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
ret = cli_xml_output_vol_remove_brick (_gf_false, NULL,
rsp.op_ret, rsp.op_errno,
rsp.op_errstr);
if (ret)
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret)
cli_err ("volume remove-brick: failed: %s", rsp.op_errstr);
else
@ -1839,21 +1871,20 @@ gf_cli_replace_brick_cbk (struct rpc_req *req, struct iovec *iov,
snprintf (msg, sizeof (msg), "%s",
rb_operation_str ? rb_operation_str : "Unknown operation");
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_str ("volReplaceBrick", msg, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
ret = cli_xml_output_vol_replace_brick (replace_op, rsp_dict,
rsp.op_ret,
rsp.op_errno, msg);
if (ret)
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret)
cli_err ("volume replace-brick: failed: %s", msg);
else
cli_out ("volume replace-brick: success");
cli_out ("volume replace-brick: success: %s", msg);
ret = rsp.op_ret;
out:
@ -1892,7 +1923,6 @@ gf_cli_log_rotate_cbk (struct rpc_req *req, struct iovec *iov,
snprintf (msg, sizeof (msg), "log rotate %s",
(rsp.op_ret) ? "unsuccessful": "successful");
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_str ("volLogRotate", msg, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
@ -1901,7 +1931,6 @@ gf_cli_log_rotate_cbk (struct rpc_req *req, struct iovec *iov,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret)
cli_err ("volume log-rotate: failed: %s", msg);
@ -1943,7 +1972,6 @@ gf_cli_sync_volume_cbk (struct rpc_req *req, struct iovec *iov,
snprintf (msg, sizeof (msg), "volume sync: %s",
(rsp.op_ret) ? "failed": "success");
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_str ("volSync", msg, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
@ -1952,7 +1980,6 @@ gf_cli_sync_volume_cbk (struct rpc_req *req, struct iovec *iov,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret)
cli_err ("%s", msg);
@ -2106,10 +2133,9 @@ gf_cli_quota_cbk (struct rpc_req *req, struct iovec *iov,
strcmp (rsp.op_errstr, "") == 0) {
snprintf (msg, sizeof (msg), "command unsuccessful %s",
rsp.op_errstr);
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML)
goto xml_output;
#endif
goto out;
}
@ -2144,7 +2170,6 @@ gf_cli_quota_cbk (struct rpc_req *req, struct iovec *iov,
"failed to get type");
if (type == GF_QUOTA_OPTION_TYPE_LIST) {
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_vol_quota_limit_list
(volname, limit_list, rsp.op_ret,
@ -2155,7 +2180,7 @@ gf_cli_quota_cbk (struct rpc_req *req, struct iovec *iov,
goto out;
}
#endif
if (limit_list) {
gf_cli_print_limit_list (volname,
limit_list,
@ -2175,7 +2200,6 @@ gf_cli_quota_cbk (struct rpc_req *req, struct iovec *iov,
snprintf (msg, sizeof (msg), "successful");
}
#if (HAVE_LIB_XML)
xml_output:
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_str ("volQuota", msg, rsp.op_ret,
@ -2185,7 +2209,6 @@ xml_output:
"Error outputting to xml");
goto out;
}
#endif
if (strlen (msg) > 0) {
if (rsp.op_ret)
@ -2393,7 +2416,6 @@ gf_cli_get_next_volume (call_frame_t *frame, xlator_t *this,
ctx = data;
local = frame->local;
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_vol_info_begin (local, 0, 0, "");
if (ret) {
@ -2401,16 +2423,14 @@ gf_cli_get_next_volume (call_frame_t *frame, xlator_t *this,
goto out;
}
}
#endif
ret = gf_cli_get_volume (frame, this, data);
if (!local || !local->get_vol.volname) {
#if (HAVE_LIB_XML)
if ((global_state->mode & GLUSTER_MODE_XML))
goto end_xml;
#endif
cli_err ("No volumes present");
goto out;
}
@ -2425,14 +2445,12 @@ gf_cli_get_next_volume (call_frame_t *frame, xlator_t *this,
ctx->volname = local->get_vol.volname;
}
#if (HAVE_LIB_XML)
end_xml:
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_vol_info_end (local);
if (ret)
gf_log ("cli", GF_LOG_ERROR, "Error outputting to xml");
}
#endif
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
@ -3283,7 +3301,6 @@ gf_cli_gsync_set_cbk (struct rpc_req *req, struct iovec *iov,
if (ret)
goto out;
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_dict ("volGeoRep", dict, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
@ -3292,7 +3309,6 @@ gf_cli_gsync_set_cbk (struct rpc_req *req, struct iovec *iov,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret) {
cli_err ("%s", rsp.op_errstr ? rsp.op_errstr :
@ -3606,7 +3622,6 @@ gf_cli_profile_volume_cbk (struct rpc_req *req, struct iovec *iov,
dict->extra_stdfree = rsp.dict.dict_val;
}
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_vol_profile (dict, rsp.op_ret,
rsp.op_errno,
@ -3616,7 +3631,6 @@ gf_cli_profile_volume_cbk (struct rpc_req *req, struct iovec *iov,
"Error outputting to xml");
goto out;
}
#endif
ret = dict_get_str (dict, "volname", &volname);
if (ret)
@ -3809,7 +3823,6 @@ gf_cli_top_volume_cbk (struct rpc_req *req, struct iovec *iov,
goto out;
}
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_vol_top (dict, rsp.op_ret,
rsp.op_errno,
@ -3820,7 +3833,6 @@ gf_cli_top_volume_cbk (struct rpc_req *req, struct iovec *iov,
}
goto out;
}
#endif
ret = dict_get_int32 (dict, "count", &brick_count);
if (ret)
@ -5048,6 +5060,7 @@ gf_cli_status_cbk (struct rpc_req *req, struct iovec *iov,
gf_cli_rsp rsp = {0,};
cli_volume_status_t status = {0};
cli_local_t *local = NULL;
gf_boolean_t wipe_local = _gf_false;
char msg[1024] = {0,};
if (req->rpc_status == -1)
@ -5062,6 +5075,15 @@ gf_cli_status_cbk (struct rpc_req *req, struct iovec *iov,
gf_log ("cli", GF_LOG_DEBUG, "Received response to status cmd");
local = ((call_frame_t *)myframe)->local;
if (!local) {
local = cli_local_get ();
if (!local) {
ret = -1;
gf_log ("cli", GF_LOG_ERROR, "Failed to get local");
goto out;
}
wipe_local = _gf_true;
}
if (rsp.op_ret) {
if (strcmp (rsp.op_errstr, ""))
@ -5070,14 +5092,13 @@ gf_cli_status_cbk (struct rpc_req *req, struct iovec *iov,
snprintf (msg, sizeof (msg), "Unable to obtain volume "
"status information.");
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
cli_xml_output_str ("volStatus", msg, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
ret = 0;
goto out;
}
#endif
cli_err ("%s", msg);
if (local && local->all) {
ret = 0;
@ -5134,17 +5155,34 @@ gf_cli_status_cbk (struct rpc_req *req, struct iovec *iov,
index_max = brick_index_max + other_count;
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_vol_status (dict, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
if (!local->all) {
ret = cli_xml_output_vol_status_begin (local,
rsp.op_ret,
rsp.op_errno,
rsp.op_errstr);
if (ret) {
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
goto out;
}
}
ret = cli_xml_output_vol_status (local, dict);
if (ret) {
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
goto out;
}
if (!local->all) {
ret = cli_xml_output_vol_status_end (local);
if (ret) {
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
}
}
goto out;
}
#endif
status.brick = GF_CALLOC (1, PATH_MAX + 256, gf_common_mt_strdup);
@ -5255,6 +5293,9 @@ out:
if (dict)
dict_unref (dict);
GF_FREE (status.brick);
if (local && wipe_local) {
cli_local_wipe (local);
}
cli_cmd_broadcast_response (ret);
return ret;
@ -5298,7 +5339,8 @@ gf_cli_status_volume_all (call_frame_t *frame, xlator_t *this, void *data)
if (frame->local) {
local = frame->local;
local->all = _gf_true;
}
} else
goto out;
ret = dict_get_uint32 (local->dict, "cmd", &cmd);
if (ret)
@ -5329,6 +5371,16 @@ gf_cli_status_volume_all (call_frame_t *frame, xlator_t *this, void *data)
cmd &= ~GF_CLI_STATUS_ALL;
cmd |= GF_CLI_STATUS_VOL;
if (global_state->mode & GLUSTER_MODE_XML) {
//TODO: Pass proper op_* values
ret = cli_xml_output_vol_status_begin (local, 0,0, NULL);
if (ret) {
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
goto out;
}
}
for (i = 0; i < vol_count; i++) {
dict = dict_new ();
@ -5356,6 +5408,10 @@ gf_cli_status_volume_all (call_frame_t *frame, xlator_t *this, void *data)
dict_unref (dict);
}
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_vol_status_end (local);
}
out:
if (ret)
gf_log ("cli", GF_LOG_ERROR, "status all failed");
@ -5365,6 +5421,13 @@ gf_cli_status_volume_all (call_frame_t *frame, xlator_t *this, void *data)
if (ret && dict)
dict_unref (dict);
if (local)
cli_local_wipe (local);
if (frame)
frame->local = NULL;
return ret;
}
@ -5724,7 +5787,6 @@ gf_cli_statedump_volume_cbk (struct rpc_req *req, struct iovec *iov,
else
snprintf (msg, sizeof (msg), "Volume statedump successful");
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_str ("volStatedump", msg, rsp.op_ret,
rsp.op_errno, rsp.op_errstr);
@ -5733,7 +5795,6 @@ gf_cli_statedump_volume_cbk (struct rpc_req *req, struct iovec *iov,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret)
cli_err ("volume statedump: failed: %s", msg);
@ -5804,7 +5865,6 @@ gf_cli_list_volume_cbk (struct rpc_req *req, struct iovec *iov,
goto out;
}
#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_vol_list (dict, rsp.op_ret, rsp.op_errno,
rsp.op_errstr);
@ -5813,7 +5873,7 @@ gf_cli_list_volume_cbk (struct rpc_req *req, struct iovec *iov,
"Error outputting to xml");
goto out;
}
#endif
if (rsp.op_ret)
cli_err ("%s", rsp.op_errstr);
else {

637
cli/src/cli-xml-output.c
View File

@ -103,11 +103,13 @@ out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
}
#endif
int
cli_xml_output_str (char *op, char *str, int op_ret, int op_errno,
char *op_errstr)
{
#if (HAVE_LIB_XML)
int ret = -1;
xmlTextWriterPtr writer = NULL;
xmlBufferPtr buf = NULL;
@ -133,8 +135,12 @@ cli_xml_output_str (char *op, char *str, int op_ret, int op_errno,
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
#if (HAVE_LIB_XML)
int
cli_xml_output_data_pair (dict_t *this, char *key, data_t *value,
void *data)
@ -149,11 +155,13 @@ cli_xml_output_data_pair (dict_t *this, char *key, data_t *value,
return ret;
}
#endif
int
cli_xml_output_dict ( char *op, dict_t *dict, int op_ret, int op_errno,
char *op_errstr)
{
#if (HAVE_LIB_XML)
int ret = -1;
xmlTextWriterPtr writer = NULL;
xmlBufferPtr buf = NULL;
@ -161,11 +169,17 @@ cli_xml_output_dict ( char *op, dict_t *dict, int op_ret, int op_errno,
ret = cli_begin_xml_output (&writer, &buf);
if (ret)
goto out;
ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
if (ret)
goto out;
/* <"op"> */
ret = xmlTextWriterStartElement (writer, (xmlChar *)op);
XML_RET_CHECK_AND_GOTO (ret, out);
dict_foreach (dict, cli_xml_output_data_pair, &writer);
if (dict)
dict_foreach (dict, cli_xml_output_data_pair, &writer);
/* </"op"> */
ret = xmlTextWriterEndElement (writer);
@ -175,8 +189,12 @@ cli_xml_output_dict ( char *op, dict_t *dict, int op_ret, int op_errno,
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
#if (HAVE_LIB_XML)
int
cli_xml_output_vol_status_common (xmlTextWriterPtr writer, dict_t *dict,
int brick_index, int *online,
@ -1267,14 +1285,67 @@ out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
}
#endif
int
cli_xml_output_vol_status (dict_t *dict, int op_ret, int op_errno,
char *op_errstr)
cli_xml_output_vol_status_begin (cli_local_t *local, int op_ret, int op_errno,
char *op_errstr)
{
#if (HAVE_LIB_XML)
int ret = -1;
ret = cli_begin_xml_output (&(local->writer), &(local->buf));
XML_RET_CHECK_AND_GOTO (ret, out);
ret = cli_xml_output_common (local->writer, op_ret, op_errno,
op_errstr);
XML_RET_CHECK_AND_GOTO (ret, out);
/* <volStatus> */
ret = xmlTextWriterStartElement (local->writer,
(xmlChar *) "volStatus");
XML_RET_CHECK_AND_GOTO (ret, out);
/* <volumes> */
ret = xmlTextWriterStartElement (local->writer, (xmlChar *)"volumes");
XML_RET_CHECK_AND_GOTO (ret, out);
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
int
cli_xml_output_vol_status_end (cli_local_t *local)
{
#if (HAVE_LIB_XML)
int ret = -1;
/* </volumes> */
ret = xmlTextWriterEndElement (local->writer);
XML_RET_CHECK_AND_GOTO (ret, out);
/* </volStatus> */
ret = xmlTextWriterEndElement (local->writer);
XML_RET_CHECK_AND_GOTO(ret, out);
ret = cli_end_xml_output (local->writer, local->buf);
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
int
cli_xml_output_vol_status (cli_local_t *local, dict_t *dict)
{
#if (HAVE_LIB_XML)
int ret = -1;
xmlTextWriterPtr writer = NULL;
xmlBufferPtr buf = NULL;
char *volname = NULL;
int brick_count = 0;
int brick_index_max = -1;
@ -1285,30 +1356,25 @@ cli_xml_output_vol_status (dict_t *dict, int op_ret, int op_errno,
gf_boolean_t node_present = _gf_true;
int i;
ret = cli_begin_xml_output (&writer, &buf);
if (ret)
goto out;
ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
if (ret)
goto out;
/* <volStatus> */
ret = xmlTextWriterStartElement (writer, (xmlChar *)"volStatus");
/* <volume> */
ret = xmlTextWriterStartElement (local->writer, (xmlChar *)"volume");
XML_RET_CHECK_AND_GOTO (ret, out);
ret = dict_get_str (dict, "volname", &volname);
if (ret)
goto out;
ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"volName",
"%s", volname);
ret = xmlTextWriterWriteFormatElement (local->writer,
(xmlChar *)"volName", "%s",
volname);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = dict_get_int32 (dict, "count", &brick_count);
if (ret)
goto out;
ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"nodeCount",
"%d", brick_count);
ret = xmlTextWriterWriteFormatElement (local->writer,
(xmlChar *)"nodeCount", "%d",
brick_count);
if (ret)
goto out;
@ -1327,10 +1393,11 @@ cli_xml_output_vol_status (dict_t *dict, int op_ret, int op_errno,
for (i = 0; i <= index_max; i++) {
/* <node> */
ret = xmlTextWriterStartElement (writer, (xmlChar *)"node");
ret = xmlTextWriterStartElement (local->writer,
(xmlChar *)"node");
XML_RET_CHECK_AND_GOTO (ret, out);
ret = cli_xml_output_vol_status_common (writer, dict, i,
ret = cli_xml_output_vol_status_common (local->writer, dict, i,
&online, &node_present);
if (ret) {
if (node_present)
@ -1341,7 +1408,7 @@ cli_xml_output_vol_status (dict_t *dict, int op_ret, int op_errno,
switch (cmd & GF_CLI_STATUS_MASK) {
case GF_CLI_STATUS_DETAIL:
ret = cli_xml_output_vol_status_detail (writer,
ret = cli_xml_output_vol_status_detail (local->writer,
dict, i);
if (ret)
goto out;
@ -1350,7 +1417,7 @@ cli_xml_output_vol_status (dict_t *dict, int op_ret, int op_errno,
case GF_CLI_STATUS_MEM:
if (online) {
ret = cli_xml_output_vol_status_mem
(writer, dict, i);
(local->writer, dict, i);
if (ret)
goto out;
}
@ -1359,7 +1426,7 @@ cli_xml_output_vol_status (dict_t *dict, int op_ret, int op_errno,
case GF_CLI_STATUS_CLIENTS:
if (online) {
ret = cli_xml_output_vol_status_clients
(writer, dict, i);
(local->writer, dict, i);
if (ret)
goto out;
}
@ -1368,7 +1435,7 @@ cli_xml_output_vol_status (dict_t *dict, int op_ret, int op_errno,
case GF_CLI_STATUS_INODE:
if (online) {
ret = cli_xml_output_vol_status_inode
(writer, dict, i);
(local->writer, dict, i);
if (ret)
goto out;
}
@ -1377,7 +1444,7 @@ cli_xml_output_vol_status (dict_t *dict, int op_ret, int op_errno,
case GF_CLI_STATUS_FD:
if (online) {
ret = cli_xml_output_vol_status_fd
(writer, dict, i);
(local->writer, dict, i);
if (ret)
goto out;
}
@ -1386,7 +1453,7 @@ cli_xml_output_vol_status (dict_t *dict, int op_ret, int op_errno,
case GF_CLI_STATUS_CALLPOOL:
if (online) {
ret = cli_xml_output_vol_status_callpool
(writer, dict, i);
(local->writer, dict, i);
if (ret)
goto out;
}
@ -1397,24 +1464,23 @@ cli_xml_output_vol_status (dict_t *dict, int op_ret, int op_errno,
}
/* </node> */
ret = xmlTextWriterEndElement (writer);
ret = xmlTextWriterEndElement (local->writer);
XML_RET_CHECK_AND_GOTO (ret, out);
}
/* </volStatus> */
ret = xmlTextWriterEndElement (writer);
/* </volume> */
ret = xmlTextWriterEndElement (local->writer);
XML_RET_CHECK_AND_GOTO (ret, out);
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
ret = cli_end_xml_output (writer, buf);
if (ret)
goto out;
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
#if (HAVE_LIB_XML)
int
cli_xml_output_vol_top_rw_perf (xmlTextWriterPtr writer, dict_t *dict,
int brick_index, int member_index)
@ -1519,11 +1585,13 @@ out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
}
#endif
int
cli_xml_output_vol_top (dict_t *dict, int op_ret, int op_errno,
char *op_errstr)
{
#if (HAVE_LIB_XML)
int ret = -1;
xmlTextWriterPtr writer = NULL;
xmlBufferPtr buf = NULL;
@ -1693,8 +1761,12 @@ cli_xml_output_vol_top (dict_t *dict, int op_ret, int op_errno,
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
#if (HAVE_LIB_XML)
int
cli_xml_output_vol_profile_stats (xmlTextWriterPtr writer, dict_t *dict,
int brick_index, int interval)
@ -1870,11 +1942,13 @@ out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
}
#endif
int
cli_xml_output_vol_profile (dict_t *dict, int op_ret, int op_errno,
char *op_errstr)
{
#if (HAVE_LIB_XML)
int ret = -1;
xmlTextWriterPtr writer = NULL;
xmlBufferPtr buf = NULL;
@ -1970,13 +2044,16 @@ cont:
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
int
cli_xml_output_vol_list (dict_t *dict, int op_ret, int op_errno,
char *op_errstr)
{
#if (HAVE_LIB_XML)
int ret = -1;
xmlTextWriterPtr writer = NULL;
xmlBufferPtr buf = NULL;
@ -2024,8 +2101,12 @@ cli_xml_output_vol_list (dict_t *dict, int op_ret, int op_errno,
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
#if (HAVE_LIB_XML)
int
cli_xml_output_vol_info_option (xmlTextWriterPtr writer, char *substr,
char *optstr, char *valstr)
@ -2123,10 +2204,12 @@ out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
}
#endif
int
cli_xml_output_vol_info (cli_local_t *local, dict_t *dict)
{
#if (HAVE_LIB_XML)
int ret = 0;
int count = 0;
char *volname = NULL;
@ -2174,16 +2257,6 @@ cli_xml_output_vol_info (cli_local_t *local, dict_t *dict)
"%s", volume_id);
XML_RET_CHECK_AND_GOTO (ret, out);
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "volume%d.type", i);
ret = dict_get_int32 (dict, key, &type);
if (ret)
goto out;
ret = xmlTextWriterWriteFormatElement (local->writer,
(xmlChar *)"type",
"%d", type);
XML_RET_CHECK_AND_GOTO (ret, out);
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "volume%d.status", i);
ret = dict_get_int32 (dict, key, &status);
@ -2194,6 +2267,11 @@ cli_xml_output_vol_info (cli_local_t *local, dict_t *dict)
"%d", status);
XML_RET_CHECK_AND_GOTO (ret, out);
ret =xmlTextWriterWriteFormatElement
(local->writer, (xmlChar *)"statusStr", "%s",
cli_vol_status_str[status]);
XML_RET_CHECK_AND_GOTO (ret, out);
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "volume%d.brick_count", i);
ret = dict_get_int32 (dict, key, &brick_count);
@ -2234,6 +2312,25 @@ cli_xml_output_vol_info (cli_local_t *local, dict_t *dict)
"%d", replica_count);
XML_RET_CHECK_AND_GOTO (ret, out);
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "volume%d.type", i);
ret = dict_get_int32 (dict, key, &type);
if (ret)
goto out;
/* For Distributed-(stripe,replicate,stipe-replicate) types */
if ((type > 0) && (dist_count < brick_count))
type += 3;
ret = xmlTextWriterWriteFormatElement (local->writer,
(xmlChar *)"type",
"%d", type);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
(xmlChar *)"typeStr",
"%s",
cli_vol_type_str[type]);
XML_RET_CHECK_AND_GOTO (ret, out);
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "volume%d.transport", i);
ret = dict_get_int32 (dict, key, &transport);
@ -2276,18 +2373,24 @@ cli_xml_output_vol_info (cli_local_t *local, dict_t *dict)
XML_RET_CHECK_AND_GOTO (ret, out);
}
GF_FREE (local->get_vol.volname);
local->get_vol.volname = gf_strdup (volname);
local->vol_count += count;
if (volname) {
local->get_vol.volname = gf_strdup (volname);
local->vol_count += count;
}
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
int
cli_xml_output_vol_info_begin (cli_local_t *local, int op_ret, int op_errno,
char *op_errstr)
{
#if (HAVE_LIB_XML)
int ret = -1;
GF_ASSERT (local);
@ -2315,11 +2418,15 @@ cli_xml_output_vol_info_begin (cli_local_t *local, int op_ret, int op_errno,
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
int
cli_xml_output_vol_info_end (cli_local_t *local)
{
#if (HAVE_LIB_XML)
int ret = -1;
GF_ASSERT (local);
@ -2341,6 +2448,9 @@ cli_xml_output_vol_info_end (cli_local_t *local)
out:
gf_log ("cli", GF_LOG_ERROR, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
int
@ -2348,6 +2458,7 @@ cli_xml_output_vol_quota_limit_list (char *volname, char *limit_list,
int op_ret, int op_errno,
char *op_errstr)
{
#if (HAVE_LIB_XML)
int ret = -1;
xmlTextWriterPtr writer = NULL;
xmlBufferPtr buf = NULL;
@ -2484,12 +2595,16 @@ out:
GF_FREE (size_str);
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
int
cli_xml_output_peer_status (dict_t *dict, int op_ret, int op_errno,
char *op_errstr)
{
#if (HAVE_LIB_XML)
int ret = -1;
xmlTextWriterPtr writer = NULL;
xmlBufferPtr buf = NULL;
@ -2610,6 +2725,434 @@ cont:
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
#if (HAVE_LIB_XML)
/* Used for rebalance stop/status, remove-brick status */
int
cli_xml_output_vol_rebalance_status (xmlTextWriterPtr writer, dict_t *dict)
{
int ret = -1;
int count = 0;
char *node_name = NULL;
uint64_t files = 0;
uint64_t size = 0;
uint64_t lookups = 0;
int status_rcd = 0;
uint64_t failures = 0;
uint64_t total_files = 0;
uint64_t total_size = 0;
uint64_t total_lookups = 0;
uint64_t total_failures = 0;
char key[1024] = {0,};
int i = 0;
if (!dict) {
ret = 0;
goto out;
}
ret = dict_get_int32 (dict, "count", &count);
if (ret)
goto out;
ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"nodeCount",
"%d", count);
XML_RET_CHECK_AND_GOTO (ret, out);
while (i < count) {
i++;
/* <node> */
ret = xmlTextWriterStartElement (writer, (xmlChar *)"node");
XML_RET_CHECK_AND_GOTO (ret, out);
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "node-uuid-%d", i);
ret = dict_get_str (dict, key, &node_name);
if (ret)
goto out;
ret = xmlTextWriterWriteFormatElement (writer,
(xmlChar *)"nodeName",
"%s", node_name);
XML_RET_CHECK_AND_GOTO (ret, out);
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "files-%d", i);
ret = dict_get_uint64 (dict, key, &files);
if (ret)
goto out;
total_files += files;
ret = xmlTextWriterWriteFormatElement (writer,
(xmlChar *)"files",
"%"PRIu64, files);
XML_RET_CHECK_AND_GOTO (ret, out);
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "size-%d", i);
ret = dict_get_uint64 (dict, key, &size);
if (ret)
goto out;
total_size += size;
ret = xmlTextWriterWriteFormatElement (writer,
(xmlChar *)"size",
"%"PRIu64,size);
XML_RET_CHECK_AND_GOTO (ret, out);
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "lookups-%d", i);
ret = dict_get_uint64 (dict, key, &lookups);
if (ret)
goto out;
total_lookups += lookups;
ret = xmlTextWriterWriteFormatElement (writer,
(xmlChar *)"lookups",
"%"PRIu64, lookups);
XML_RET_CHECK_AND_GOTO (ret, out);
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "failures-%d", i);
ret = dict_get_uint64 (dict, key, &failures);
if (ret)
goto out;
total_failures += failures;
ret = xmlTextWriterWriteFormatElement (writer,
(xmlChar *)"failures",
"%"PRIu64, failures);
XML_RET_CHECK_AND_GOTO (ret, out);
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "status-%d", i);
ret = dict_get_int32 (dict, key, &status_rcd);
if (ret)
goto out;
ret = xmlTextWriterWriteFormatElement (writer,
(xmlChar *)"status",
"%d", status_rcd);
XML_RET_CHECK_AND_GOTO (ret, out);
/* </node> */
ret = xmlTextWriterEndElement (writer);
XML_RET_CHECK_AND_GOTO (ret, out);
}
/* Aggregate status */
/* <aggregate> */
ret = xmlTextWriterStartElement (writer, (xmlChar *)"aggregate");
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (writer,(xmlChar *)"files",
"%"PRIu64, total_files);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (writer,(xmlChar *)"size",
"%"PRIu64, total_size);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (writer,(xmlChar *)"lookups",
"%"PRIu64, total_lookups);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (writer,(xmlChar *)"failures",
"%"PRIu64, total_failures);
XML_RET_CHECK_AND_GOTO (ret, out);
// TODO : Aggregate status
/* </aggregate> */
ret = xmlTextWriterEndElement (writer);
XML_RET_CHECK_AND_GOTO (ret, out);
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
}
#endif
int
cli_xml_output_vol_rebalance (gf_cli_defrag_type op, dict_t *dict, int op_ret,
int op_errno, char *op_errstr)
{
#if (HAVE_LIB_XML)
int ret = -1;
xmlTextWriterPtr writer = NULL;
xmlBufferPtr buf = NULL;
ret = cli_begin_xml_output (&writer, &buf);
if (ret)
goto out;
ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
if (ret)
goto out;
/* <volRebalance> */
ret = xmlTextWriterStartElement (writer, (xmlChar *)"volRebalance");
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"op",
"%d", op);
XML_RET_CHECK_AND_GOTO (ret, out);
if ((GF_DEFRAG_CMD_STOP == op) || (GF_DEFRAG_CMD_STATUS == op)) {
ret = cli_xml_output_vol_rebalance_status (writer, dict);
if (ret)
goto out;
}
/* </volRebalance> */
ret = xmlTextWriterEndElement (writer);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = cli_end_xml_output (writer, buf);
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
int
cli_xml_output_vol_remove_brick (gf_boolean_t status_op, dict_t *dict,
int op_ret, int op_errno, char *op_errstr)
{
#if (HAVE_LIB_XML)
int ret = -1;
xmlTextWriterPtr writer = NULL;
xmlBufferPtr buf = NULL;
ret = cli_begin_xml_output (&writer, &buf);
if (ret)
goto out;
ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
if (ret)
goto out;
/* <volRemoveBrick> */
ret = xmlTextWriterStartElement (writer, (xmlChar *)"volRemoveBrick");
XML_RET_CHECK_AND_GOTO (ret, out);
if (status_op) {
ret = cli_xml_output_vol_rebalance_status (writer, dict);
if (ret)
goto out;
}
/* </volRemoveBrick> */
ret = xmlTextWriterEndElement (writer);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = cli_end_xml_output (writer, buf);
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
int
cli_xml_output_vol_replace_brick (gf1_cli_replace_op op, dict_t *dict,
int op_ret, int op_errno, char *op_errstr)
{
#if (HAVE_LIB_XML)
int ret = -1;
int status = 0;
uint64_t files = 0;
char *current_file = 0;
xmlTextWriterPtr writer = NULL;
xmlBufferPtr buf = NULL;
ret = cli_begin_xml_output (&writer, &buf);
if (ret)
goto out;
ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
if (ret)
goto out;
/* <volReplaceBrick> */
ret = xmlTextWriterStartElement (writer, (xmlChar *)"volReplaceBrick");
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"op",
"%d", op);
XML_RET_CHECK_AND_GOTO (ret, out);
if (GF_REPLACE_OP_STATUS == op) {
ret = dict_get_int32 (dict, "status", &status);
if (ret)
goto out;
ret = xmlTextWriterWriteFormatElement (writer,
(xmlChar *)"status",
"%d", status);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = dict_get_uint64 (dict, "files", &files);
if (ret)
goto out;
ret = xmlTextWriterWriteFormatElement (writer,
(xmlChar *)"files",
"%"PRIu64, files);
XML_RET_CHECK_AND_GOTO (ret, out);
if (status)
goto cont;
ret = dict_get_str (dict, "current_file", &current_file);
if (ret)
goto out;
ret = xmlTextWriterWriteFormatElement (writer,
(xmlChar *)"currentFile",
"%s", current_file);
XML_RET_CHECK_AND_GOTO (ret, out);
}
cont:
/* </volReplaceBrick> */
ret = xmlTextWriterEndElement (writer);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = cli_end_xml_output (writer, buf);
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
int
cli_xml_output_vol_create (dict_t *dict, int op_ret, int op_errno,
char *op_errstr)
{
#if (HAVE_LIB_XML)
int ret = -1;
xmlTextWriterPtr writer = NULL;
xmlBufferPtr buf = NULL;
char *volname = NULL;
char *volid = NULL;
ret = cli_begin_xml_output (&writer, &buf);
if (ret)
goto out;
ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
if (ret)
goto out;
if (dict) {
/* <volCreate> */
ret = xmlTextWriterStartElement (writer,
(xmlChar *)"volCreate");
XML_RET_CHECK_AND_GOTO (ret, out);
/* <volume> */
ret = xmlTextWriterStartElement (writer, (xmlChar *)"volume");
XML_RET_CHECK_AND_GOTO (ret, out);
ret = dict_get_str (dict, "volname", &volname);
if (ret)
goto out;
ret = xmlTextWriterWriteFormatElement (writer,
(xmlChar *) "name",
"%s", volname);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = dict_get_str (dict, "volume-id", &volid);
if (ret)
goto out;
ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"id",
"%s", volid);
XML_RET_CHECK_AND_GOTO (ret, out);
/* </volume> */
ret = xmlTextWriterEndElement (writer);
XML_RET_CHECK_AND_GOTO (ret, out);
/* </volCreate> */
ret = xmlTextWriterEndElement (writer);
XML_RET_CHECK_AND_GOTO (ret, out);
}
ret = cli_end_xml_output (writer, buf);
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}
int
cli_xml_output_generic_volume (char *op, dict_t *dict, int op_ret, int op_errno,
char *op_errstr)
{
#if (HAVE_LIB_XML)
int ret = -1;
xmlTextWriterPtr writer = NULL;
xmlBufferPtr buf = NULL;
char *volname = NULL;
char *volid = NULL;
GF_ASSERT (op);
ret = cli_begin_xml_output (&writer, &buf);
if (ret)
goto out;
ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
if (ret)
goto out;
if (dict) {
/* <"op"> */
ret = xmlTextWriterStartElement (writer, (xmlChar *)op);
XML_RET_CHECK_AND_GOTO (ret, out);
/* <volume> */
ret = xmlTextWriterStartElement (writer, (xmlChar *)"volume");
XML_RET_CHECK_AND_GOTO (ret, out);
ret = dict_get_str (dict, "volname", &volname);
if (ret)
goto out;
ret = xmlTextWriterWriteFormatElement (writer,
(xmlChar *) "name",
"%s", volname);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = dict_get_str (dict, "vol-id", &volid);
if (ret)
goto out;
ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"id",
"%s", volid);
XML_RET_CHECK_AND_GOTO (ret, out);
/* </volume> */
ret = xmlTextWriterEndElement (writer);
XML_RET_CHECK_AND_GOTO (ret, out);
/* </"op"> */
ret = xmlTextWriterEndElement (writer);
XML_RET_CHECK_AND_GOTO (ret, out);
}
ret = cli_end_xml_output (writer, buf);
out:
gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
return ret;
#else
return 0;
#endif
}

4
cli/src/cli.c
View File

@ -294,7 +294,11 @@ cli_opt_parse (char *opt, struct cli_state *state)
}
if (strcmp (opt, "xml") == 0) {
#if (HAVE_LIB_XML)
state->mode |= GLUSTER_MODE_XML;
#else
cli_err ("XML output not supported. Ignoring '--xml' option");
#endif
return 0;
}

36
cli/src/cli.h
View File

@ -19,6 +19,8 @@
#include "glusterfs.h"
#include "protocol-common.h"
#include "cli1-xdr.h"
#if (HAVE_LIB_XML)
#include <libxml/encoding.h>
#include <libxml/xmlwriter.h>
@ -48,6 +50,9 @@ struct cli_cmd_word;
struct cli_cmd_tree;
struct cli_cmd;
extern char *cli_vol_type_str[];
extern char *cli_vol_status_str[];
typedef int (cli_cmd_cbk_t)(struct cli_state *state,
struct cli_cmd_word *word,
const char **words,
@ -288,7 +293,6 @@ cli_get_detail_status (dict_t *dict, int i, cli_volume_status_t *status);
void
cli_print_line (int len);
#if (HAVE_LIB_XML)
int
cli_xml_output_str (char *op, char *str, int op_ret, int op_errno,
char *op_errstr);
@ -306,8 +310,14 @@ cli_xml_output_vol_profile (dict_t *dict, int op_ret, int op_errno,
char *op_errstr);
int
cli_xml_output_vol_status (dict_t *dict, int op_ret, int op_errno,
char *op_errstr);
cli_xml_output_vol_status_begin (cli_local_t *local, int op_ret, int op_errno,
char *op_errstr);
int
cli_xml_output_vol_status_end (cli_local_t *local);
int
cli_xml_output_vol_status (cli_local_t *local, dict_t *dict);
int
cli_xml_output_vol_list (dict_t *dict, int op_ret, int op_errno,
@ -331,6 +341,24 @@ cli_xml_output_vol_quota_limit_list (char *volname, char *limit_list,
int
cli_xml_output_peer_status (dict_t *dict, int op_ret, int op_errno,
char *op_errstr);
#endif
int
cli_xml_output_vol_rebalance (gf_cli_defrag_type op, dict_t *dict, int op_ret,
int op_errno, char *op_errstr);
int
cli_xml_output_vol_remove_brick (gf_boolean_t status_op, dict_t *dict,
int op_ret, int op_errno, char *op_errstr);
int
cli_xml_output_vol_replace_brick (gf1_cli_replace_op op, dict_t *dict,
int op_ret, int op_errno, char *op_errstr);
int
cli_xml_output_vol_create (dict_t *dict, int op_ret, int op_errno,
char *op_errstr);
int
cli_xml_output_generic_volume (char *op, dict_t *dict, int op_ret, int op_errno,
char *op_errstr);
#endif /* __CLI_H__ */

12
xlators/cluster/afr/src/pump.c
View File

@ -942,6 +942,7 @@ pump_execute_status (call_frame_t *frame, xlator_t *this)
uint64_t number_files = 0;
char filename[PATH_MAX];
char summary[PATH_MAX+256];
char *dict_str = NULL;
int32_t op_ret = 0;
@ -970,12 +971,15 @@ pump_execute_status (call_frame_t *frame, xlator_t *this)
}
if (pump_priv->pump_finished) {
snprintf (dict_str, PATH_MAX + 256, "Number of files migrated = %"PRIu64" Migration complete ",
number_files);
snprintf (summary, PATH_MAX+256,
"no_of_files=%"PRIu64, number_files);
} else {
snprintf (dict_str, PATH_MAX + 256, "Number of files migrated = %"PRIu64" Current file= %s ",
number_files, filename);
snprintf (summary, PATH_MAX+256,
"no_of_files=%"PRIu64":current_file=%s",
number_files, filename);
}
snprintf (dict_str, PATH_MAX+256, "status=%d:%s",
(pump_priv->pump_finished)?1:0, summary);
dict = dict_new ();

89
xlators/mgmt/glusterd/src/glusterd-replace-brick.c
View File

@ -1113,11 +1113,17 @@ rb_send_cmd (glusterd_volinfo_t *volinfo,
glusterd_brickinfo_t *dst,
gf1_cli_replace_op op)
{
char start_value[8192] = {0,};
char status[8192] = {0,};
char *status_reply = NULL;
dict_t *ctx = NULL;
int ret = 0;
char start_value[8192] = {0,};
char status_str[8192] = {0,};
char *status_reply = NULL;
char *tmp = NULL;
char *save_ptr = NULL;
char filename[PATH_MAX] = {0,};
char *current_file = NULL;
uint64_t files = 0;
int status = 0;
dict_t *ctx = NULL;
int ret = 0;
GF_ASSERT (volinfo);
GF_ASSERT (src);
@ -1161,7 +1167,7 @@ rb_send_cmd (glusterd_volinfo_t *volinfo,
{
ret = rb_get_xattr_command (volinfo, src, dst,
RB_PUMP_CMD_STATUS,
status);
status_str);
if (ret)
goto out;
@ -1174,7 +1180,76 @@ rb_send_cmd (glusterd_volinfo_t *volinfo,
goto out;
}
status_reply = gf_strdup (status);
/* Split status reply into different parts */
tmp = strtok_r (status_str, ":", &save_ptr);
if (!tmp) {
ret = -1;
gf_log (THIS->name, GF_LOG_ERROR,
"Couldn't tokenize status string");
goto out;
}
sscanf (tmp, "status=%d", &status);
ret = dict_set_int32 (ctx, "status", status);
if (ret) {
gf_log (THIS->name, GF_LOG_ERROR, "Couldn't "
"set rb status in context");
goto out;
}
tmp = NULL;
tmp = strtok_r (NULL, ":", &save_ptr);
if (!tmp) {
ret = -1;
gf_log (THIS->name, GF_LOG_ERROR,
"Couldn't tokenize status string");
goto out;
}
sscanf (tmp, "no_of_files=%"SCNu64, &files);
ret = dict_set_uint64 (ctx, "files", files);
if (ret) {
gf_log (THIS->name, GF_LOG_ERROR, "Couldn't "
"set rb files in context");
goto out;
}
if (status == 0) {
tmp = NULL;
tmp = strtok_r (NULL, ":", &save_ptr);
if (!tmp) {
ret = -1;
gf_log (THIS->name, GF_LOG_ERROR,
"Couldn't tokenize status "
"string");
goto out;
}
sscanf (tmp, "current_file=%s", filename);
current_file = gf_strdup (filename);
ret = dict_set_dynstr (ctx, "current_file",
current_file);
if (ret) {
GF_FREE (current_file);
gf_log (THIS->name, GF_LOG_ERROR,
"Couldn't set rb current file "
"in context");
goto out;
}
}
if (status) {
ret = gf_asprintf (&status_reply,
"Number of files migrated = %"
PRIu64"\tMigration complete",
files);
} else {
ret = gf_asprintf (&status_reply,
"Number of files migrated = %"
PRIu64"\tCurrent file = %s",
files, filename);
}
if (ret == -1) {
gf_log (THIS->name, GF_LOG_ERROR,
"Failed to create status_reply string");
goto out;
}
ret = dict_set_dynstr (ctx, "status-reply",
status_reply);
if (ret) {