Skip to content

Commit c35e7f1

Browse files
authored
[Backup] az backup protection backup-now: Fix bug for SQL/HANA backup retention (#23281)
1 parent fe7e4c8 commit c35e7f1

38 files changed

+37318
-48673
lines changed

src/azure-cli/azure/cli/command_modules/backup/custom_wl.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -462,12 +462,13 @@ def backup_now(cmd, client, resource_group_name, vault_name, item, retain_until,
462462

463463
message = "For SAPHANA and SQL workload, retain-until parameter value will be overridden by the underlying policy"
464464

465-
if (retain_until is not None and backup_type != 'CopyOnlyFull'):
466-
logger.warning(message)
467-
retain_until = datetime.now(timezone.utc) + timedelta(days=30)
468-
469465
if retain_until is None:
470466
retain_until = datetime.now(timezone.utc) + timedelta(days=30)
467+
if backup_type == 'Full':
468+
retain_until = datetime.now(timezone.utc) + timedelta(days=45)
469+
if backup_type in ['Differential', 'Log']:
470+
retain_until = datetime.now(timezone.utc) + timedelta(days=30)
471+
logger.warning(message)
471472

472473
container_uri = cust_help.get_protection_container_uri_from_id(item.id)
473474
item_uri = cust_help.get_protected_item_uri_from_id(item.id)

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_afs_backup_container.yaml

Lines changed: 630 additions & 868 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_afs_backup_item.yaml

Lines changed: 698 additions & 945 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_afs_backup_policy.yaml

Lines changed: 373 additions & 563 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_afs_backup_protection.yaml

Lines changed: 460 additions & 557 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_afs_backup_restore.yaml

Lines changed: 1095 additions & 1226 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_afs_backup_rp.yaml

Lines changed: 682 additions & 653 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_afs_backup_scenario.yaml

Lines changed: 469 additions & 723 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_afs_unregister_container.yaml

Lines changed: 457 additions & 443 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_archive.yaml

Lines changed: 1825 additions & 1928 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)