diff options
author | Yaniv Kaul <ykaul@redhat.com> | 2019-03-19 16:45:06 +0200 |
---|---|---|
committer | Atin Mukherjee <amukherj@redhat.com> | 2019-03-25 05:34:50 +0000 |
commit | 4acf03d304e88ca3d10d3d7076208f1462228bbb (patch) | |
tree | e333bc06afa3bc253bc3c008e8878429f9fb1d33 /cli | |
parent | 1f94395c356748c0f51c76d5de3be5f6cf603547 (diff) |
Multiple files: remove HAVE_BD_XLATOR related code.
The BD translator was removed some time ago,
(in commit a907e468e724c32b9833ce59806fc215c7122d63).
This completes the work.
Compile-tested only!
updates: bz#1635688
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Change-Id: I999df52e479a72d3cc9523f22f9056de17eb559c
Diffstat (limited to 'cli')
-rw-r--r-- | cli/src/cli-cmd-volume.c | 3 | ||||
-rw-r--r-- | cli/src/cli-rpc-ops.c | 35 | ||||
-rw-r--r-- | cli/src/cli-xml-output.c | 45 |
3 files changed, 0 insertions, 83 deletions
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index 585865f5628..975536f9f69 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -3372,9 +3372,6 @@ struct cli_cmd volume_cmds[] = { "[replica <COUNT> [arbiter <COUNT>]] " "[disperse [<COUNT>]] [disperse-data <COUNT>] [redundancy <COUNT>] " "[transport <tcp|rdma|tcp,rdma>] <NEW-BRICK>" -#ifdef HAVE_BD_XLATOR - "?<vg_name>" -#endif "... [force]", cli_cmd_volume_create_cbk, diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index a80a23c6928..0c1205c40a0 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -656,9 +656,6 @@ print_brick_details(dict_t *dict, int volcount, int start_index, int end_index, int isArbiter = 0; int ret = -1; char *brick = NULL; -#ifdef HAVE_BD_XLATOR - char *caps = NULL; -#endif while (index <= end_index) { snprintf(key, 1024, "volume%d.brick%d", volcount, index); @@ -676,12 +673,6 @@ print_brick_details(dict_t *dict, int volcount, int start_index, int end_index, cli_out("Brick%d: %s (arbiter)", index, brick); else cli_out("Brick%d: %s", index, brick); -#ifdef HAVE_BD_XLATOR - snprintf(key, 1024, "volume%d.vg%d", volcount, index); - ret = dict_get_str(dict, key, &caps); - if (!ret) - cli_out("Brick%d VG: %s", index, caps); -#endif index++; } ret = 0; @@ -1022,32 +1013,6 @@ xml_output: cli_out("Status: %s", cli_vol_status_str[status]); cli_out("Snapshot Count: %d", snap_count); -#ifdef HAVE_BD_XLATOR - k = 0; - snprintf(key, sizeof(key), "volume%d.xlator%d", i, k); - ret = dict_get_str(dict, key, &caps); - if (ret) - goto next; - do { - j = 0; - cli_out("Xlator %d: %s", k + 1, caps); - do { - snprintf(key, sizeof(key), "volume%d.xlator%d.caps%d", i, k, - j++); - ret = dict_get_str(dict, key, &caps); - if (ret) - break; - cli_out("Capability %d: %s", j, caps); - } while (1); - - snprintf(key, sizeof(key), "volume%d.xlator%d", i, ++k); - ret = dict_get_str(dict, key, &caps); - if (ret) - break; - } while (1); - - next: -#endif gf_cli_print_number_of_bricks( type, brick_count, dist_count, stripe_count, replica_count, disperse_count, redundancy_count, arbiter_count); diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c index b417bb807ba..54458987d9a 100644 --- a/cli/src/cli-xml-output.c +++ b/cli/src/cli-xml-output.c @@ -2618,51 +2618,6 @@ cli_xml_output_vol_info(cli_local_t *local, dict_t *dict) local->writer, (xmlChar *)"transport", "%d", transport); XML_RET_CHECK_AND_GOTO(ret, out); -#ifdef HAVE_BD_XLATOR - /* <xlators> */ - ret = xmlTextWriterStartElement(local->writer, (xmlChar *)"xlators"); - XML_RET_CHECK_AND_GOTO(ret, out); - - for (k = 0;; k++) { - snprintf(key, sizeof(key), "volume%d.xlator%d", i, k); - ret = dict_get_str(dict, key, &caps); - if (ret) - break; - - /* <xlator> */ - ret = xmlTextWriterStartElement(local->writer, (xmlChar *)"xlator"); - XML_RET_CHECK_AND_GOTO(ret, out); - - ret = xmlTextWriterWriteFormatElement( - local->writer, (xmlChar *)"name", "%s", caps); - XML_RET_CHECK_AND_GOTO(ret, out); - - /* <capabilities> */ - ret = xmlTextWriterStartElement(local->writer, - (xmlChar *)"capabilities"); - XML_RET_CHECK_AND_GOTO(ret, out); - - j = 0; - for (j = 0;; j++) { - snprintf(key, sizeof(key), "volume%d.xlator%d.caps%d", i, k, j); - ret = dict_get_str(dict, key, &caps); - if (ret) - break; - ret = xmlTextWriterWriteFormatElement( - local->writer, (xmlChar *)"capability", "%s", caps); - XML_RET_CHECK_AND_GOTO(ret, out); - } - /* </capabilities> */ - ret = xmlTextWriterEndElement(local->writer); - XML_RET_CHECK_AND_GOTO(ret, out); - /* </xlator> */ - ret = xmlTextWriterEndElement(local->writer); - XML_RET_CHECK_AND_GOTO(ret, out); - } - ret = xmlTextWriterFullEndElement(local->writer); - XML_RET_CHECK_AND_GOTO(ret, out); - /* </xlators> */ -#endif j = 1; /* <bricks> */ |