From 9541796664103e69cc436598ff9c17cfd4e3c093 Mon Sep 17 00:00:00 2001
From: Csaba Henk <csaba@redhat.com>
Date: Thu, 14 May 2020 17:46:09 +0200
Subject: io-cache,quick-read: deprecate volume options with flawed semantics
 or naming

- performance.cache-size has a flawed semantics, as it's
  dispatched on two independent translators, io-cache
  and quick-read.
- performance.qr-cache-timeout has a confusing name, as
  other options affecting quick-read have an unabbreviated
  "quick-read-..." prefix in their names.

We keep these options with unchanged operation, but in the
help output we indicate their deprecation.

The following better alternatives are introduced:

- performance.io-cache-size to tune cache-size option of io-cache
- performance.quick-read-cache-size to tune cache-size option of
  quick-read
- performance.quick-read-cache-timeout as a preferred synonym for
  performance.qr-cache-timeout

Fixes: #952
Change-Id: Ibd04fb638de8cac450ba992ad8a415154f9f4281
Signed-off-by: Csaba Henk <csaba@redhat.com>
---
 tests/bugs/glusterd/brick-mux.t                             |  2 +-
 .../glusterd/validating-options-for-replicated-volume.t     | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'tests/bugs/glusterd')

diff --git a/tests/bugs/glusterd/brick-mux.t b/tests/bugs/glusterd/brick-mux.t
index eeaa3ebfea8..927940534c1 100644
--- a/tests/bugs/glusterd/brick-mux.t
+++ b/tests/bugs/glusterd/brick-mux.t
@@ -39,7 +39,7 @@ TEST glusterd
 EXPECT_WITHIN $PROCESS_UP_TIMEOUT 4 online_brick_count
 EXPECT 1 count_brick_processes
 
-TEST $CLI volume set $V1 performance.cache-size 32MB
+TEST $CLI volume set $V1 performance.io-cache-size 32MB
 TEST $CLI volume stop $V1
 TEST $CLI volume start $V1
 
diff --git a/tests/bugs/glusterd/validating-options-for-replicated-volume.t b/tests/bugs/glusterd/validating-options-for-replicated-volume.t
index ee231338ff1..ddc80b17870 100644
--- a/tests/bugs/glusterd/validating-options-for-replicated-volume.t
+++ b/tests/bugs/glusterd/validating-options-for-replicated-volume.t
@@ -61,10 +61,15 @@ TEST ! $CLI volume set $V0 background-self-heal-count "      "
 TEST   $CLI volume set $V0 background-self-heal-count 10
 EXPECT "10" volume_option $V0 cluster.background-self-heal-count
 
-TEST ! $CLI volume set $V0 cache-size ""
-TEST ! $CLI volume set $V0 cache-size "    "
-TEST   $CLI volume set $V0 cache-size 512MB
-EXPECT "512MB" volume_option $V0 performance.cache-size
+TEST ! $CLI volume set $V0 io-cache-size ""
+TEST ! $CLI volume set $V0 io-cache-size "    "
+TEST   $CLI volume set $V0 io-cache-size 64MB
+EXPECT "64MB" volume_option $V0 performance.io-cache-size
+
+TEST ! $CLI volume set $V0 quick-read-cache-size ""
+TEST ! $CLI volume set $V0 quick-read-cache-size "    "
+TEST   $CLI volume set $V0 quick-read-cache-size 512MB
+EXPECT "512MB" volume_option $V0 performance.quick-read-cache-size
 
 TEST ! $CLI volume set $V0 self-heal-daemon ""
 TEST ! $CLI volume set $V0 self-heal-daemon "    "
-- 
cgit