From 3d03a18aed1a688d79693d4d3487dde0fd2f683e Mon Sep 17 00:00:00 2001 From: Meghraj Chandra kanth Date: Fri, 6 Dec 2019 14:42:40 -0800 Subject: [PATCH 1/3] Fixing "az redis update" to work on caches with RDB/AOF enabled. --- .../azure/cli/command_modules/redis/custom.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/redis/custom.py b/src/azure-cli/azure/cli/command_modules/redis/custom.py index f87ab1c9f47..8cda5f78862 100644 --- a/src/azure-cli/azure/cli/command_modules/redis/custom.py +++ b/src/azure-cli/azure/cli/command_modules/redis/custom.py @@ -37,12 +37,18 @@ def cli_redis_update(cmd, instance, sku=None, vm_size=None): # avoid setting memory configs for basic sku if instance.sku.name == 'Basic': - if 'maxmemory-reserved' in instance.redis_configuration: - instance.redis_configuration.pop('maxmemory-reserved') - if 'maxfragmentationmemory-reserved' in instance.redis_configuration: - instance.redis_configuration.pop('maxfragmentationmemory-reserved') - if 'maxmemory-delta' in instance.redis_configuration: - instance.redis_configuration.pop('maxmemory-delta') + memory_configs = ['maxmemory-reserved', 'maxfragmentationmemory-reserved', 'maxmemory-delta'] + for memory_config in memory_configs: + if memory_config in instance.redis_configuration: + instance.redis_configuration.pop(memory_config) + + # trim RDB and AOF connection strings + rdb_aof_connection_strings = ['rdb-storage-connection-string', + 'aof-storage-connection-string-0', + 'aof-storage-connection-string-1'] + for connection_string in rdb_aof_connection_strings: + if connection_string in instance.redis_configuration: + instance.redis_configuration.pop(connection_string) # pylint: disable=too-many-function-args update_params = RedisUpdateParameters( From 2721a1a42b8508768c0fd855c699577ddc36c16c Mon Sep 17 00:00:00 2001 From: Meghraj Chandra kanth Date: Fri, 6 Dec 2019 14:50:18 -0800 Subject: [PATCH 2/3] Updated HISTORY.rst --- src/azure-cli/HISTORY.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst index 7d133b53fd1..788444dc33d 100644 --- a/src/azure-cli/HISTORY.rst +++ b/src/azure-cli/HISTORY.rst @@ -117,6 +117,7 @@ Release History **Redis** +* Fixing `az redis update` operation to work for caches with RDB/AOF enabled * Fix #2902: Avoid setting memory configs while updating Basic SKU cache **Reservations** From c0ce18f17166453d3027269dca59c80e20f2afd8 Mon Sep 17 00:00:00 2001 From: Meghraj Chandra kanth Date: Thu, 12 Dec 2019 20:13:47 -0800 Subject: [PATCH 3/3] fixing release notes --- src/azure-cli/HISTORY.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst index 788444dc33d..cc5bedea72e 100644 --- a/src/azure-cli/HISTORY.rst +++ b/src/azure-cli/HISTORY.rst @@ -24,6 +24,10 @@ Release History * Add back edge builds for pip install * Add Ubuntu eoan package +**Redis** + +* Fixing `az redis update` operation to work for caches with RDB/AOF enabled + **Storage** * GA Release Large File Shares property for storage account create and update command @@ -117,7 +121,6 @@ Release History **Redis** -* Fixing `az redis update` operation to work for caches with RDB/AOF enabled * Fix #2902: Avoid setting memory configs while updating Basic SKU cache **Reservations**