Skip to content

Commit

Permalink
Fix: 'az redis update' operation for RDB/AOF enabled redis caches (#1…
Browse files Browse the repository at this point in the history
…1502)

* Fixing "az redis update" to work on caches with RDB/AOF enabled.
  • Loading branch information
MECHANDR authored and jsntcy committed Jan 14, 2020
1 parent 9629542 commit d735dbf
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
4 changes: 4 additions & 0 deletions src/azure-cli/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ Release History

* Fix #11712: `az ad app/sp show` does not return exit code 3 when the application or service principal does not exist

**Redis**

* Fixing `az redis update` operation to work for caches with RDB/AOF enabled

**Storage**

* `az storage account create`: Remove preview flag for --enable-hierarchical-namespace parameter
Expand Down
18 changes: 12 additions & 6 deletions src/azure-cli/azure/cli/command_modules/redis/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

# Trim zonal-configuration
if 'zonal-configuration' in instance.redis_configuration:
Expand Down

0 comments on commit d735dbf

Please sign in to comment.