Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: 'az redis update' operation for RDB/AOF enabled redis caches #11502

Merged
merged 5 commits into from
Jan 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/azure-cli/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ Release History
* Fix `vm create` failure in Azure Stack profile.
* vm monitor metrics tail/list-definitions: support query metric and list definitions for a vm.

**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