summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2014-01-23 12:12:07 +0100
committerVijay Bellur <vbellur@redhat.com>2014-01-24 01:27:12 -0800
commit460ed4184801d5346c58cc32a34704910345a184 (patch)
treee7fa58559e8d1ac41a4e6222d88adc3d4389cbdc /xlators/mgmt
parent057e292380cc763ddd4a737d84f406406eaf6d36 (diff)
features/compress: rename "compress" option to "network.compression"
Prevent mistaking the "compress" options for storage (at rest) compression. The cdc-xlator is implemented to support compressing of network traffic (READ and WRITE FOPs). URL: http://www.gluster.org/community/documentation/index.php/Features/On-Wire_Compression_+_Decompression Change-Id: I9fedf4106dcb226d135ab92e4b533aff284881d7 BUG: 1053670 CC: Venky Shankar <vshankar@redhat.com> CC: Prashanth Pai <ppai@redhat.com> Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/6765 Reviewed-by: Prashanth Pai <ppai@redhat.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/mgmt')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c8
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c27
2 files changed, 20 insertions, 15 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 0a67463..8d7e098 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -1657,13 +1657,13 @@ server_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
}
/* Check for compress volume option, and add it to the graph on server side */
- if (dict_get_str_boolean (set_dict, "features.compress", 0)) {
+ if (dict_get_str_boolean (set_dict, "network.compression", 0)) {
xl = volgen_graph_add (graph, "features/cdc", volname);
if (!xl) {
ret = -1;
goto out;
}
- ret = dict_set_str (set_dict, "compress.mode", "server");
+ ret = dict_set_str (set_dict, "network.compression.mode", "server");
if (ret)
goto out;
}
@@ -2531,13 +2531,13 @@ client_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
goto out;
/* Check for compress volume option, and add it to the graph on client side */
- if (dict_get_str_boolean (set_dict, "features.compress", 0)) {
+ if (dict_get_str_boolean (set_dict, "network.compression", 0)) {
xl = volgen_graph_add (graph, "features/cdc", volname);
if (!xl) {
ret = -1;
goto out;
}
- ret = dict_set_str (set_dict, "compress.mode", "client");
+ ret = dict_set_str (set_dict, "network.compression.mode", "client");
if (ret)
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index b198956..e7aa1cd 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1010,47 +1010,52 @@ struct volopt_map_entry glusterd_volopt_map[] = {
#ifdef HAVE_LIB_Z
/* Compressor-decompressor xlator options
- * defaults used from xlator/feature/compress/src/cdc.h
+ * defaults used from xlator/features/compress/src/cdc.h
*/
- { .key = "features.compress",
+ { .key = "network.compression",
.voltype = "features/cdc",
- .option = "!compress",
.value = "off",
.type = NO_DOC,
.op_version = 2,
- .description = "enable/disable compression translator"
+ .description = "enable/disable network compression translator"
},
- { .key = "compress.mode",
+ { .key = "network.compression.mode",
.voltype = "features/cdc",
+ .option = "mode",
.type = NO_DOC,
.op_version = 2
},
- { .key = "compress.window-size",
+ { .key = "network.compression.window-size",
.voltype = "features/cdc",
+ .option = "window-size",
.type = NO_DOC,
.op_version = 2
},
- { .key = "compress.mem-level",
+ { .key = "network.compression.mem-level",
.voltype = "features/cdc",
+ .option = "mem-level",
.type = NO_DOC,
.op_version = 2
},
- { .key = "compress.min-size",
+ { .key = "network.compression.min-size",
.voltype = "features/cdc",
+ .option = "min-size",
.type = NO_DOC,
.op_version = 2
},
- { .key = "compress.compression-level",
+ { .key = "network.compression.compression-level",
.voltype = "features/cdc",
+ .option = "compression-level",
.type = NO_DOC,
.op_version = 2
},
- { .key = "compress.debug",
+ { .key = "network.compression.debug",
.voltype = "features/cdc",
+ .option = "debug",
.type = NO_DOC,
.op_version = 2
},
- #endif
+#endif
/* Quota xlator options */
{ .key = VKEY_FEATURES_LIMIT_USAGE,