Skip to content

Commit ce7bc69

Browse files
committed
update delete section, images
1 parent b67d195 commit ce7bc69

File tree

5 files changed

+34
-20
lines changed

5 files changed

+34
-20
lines changed
21.7 KB
Loading
30.4 KB
Loading

articles/storage/blobs/soft-delete-overview.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: tamram
77

88
ms.service: storage
99
ms.topic: conceptual
10-
ms.date: 04/02/2020
10+
ms.date: 04/30/2020
1111
ms.author: tamram
1212
ms.subservice: blobs
1313
---
@@ -22,13 +22,11 @@ If there is a possibility that your data may accidentally be modified or deleted
2222

2323
## About soft delete
2424

25-
When soft delete is enabled, you can recover objects after they have been deleted, within the specified data retention period. This protection extends to blob data that is erased as the result of an overwrite.
25+
When soft delete is enabled on a storage account, you can recover objects after they have been deleted, within the specified data retention period. This protection extends to blob data that is erased as the result of an overwrite.
2626

27-
If a blob, version, or snapshot is deleted while soft delete is enabled, that object transitions to a soft deleted state instead of being permanently erased. After the specified retention period has expired, the object is permanently deleted.
27+
If data in an existing blob or snapshot is deleted while soft delete is enabled but blob versioning (preview) is not enabled, then a soft deleted snapshot is generated to save the state of the overwritten data. After the specified retention period has expired, the object is permanently deleted.
2828

29-
If data in an existing blob is modified while soft delete is enabled but blob versioning (preview) is not enabled, then a soft deleted snapshot is generated to save the state of the overwritten data.
30-
31-
If blob versioning and soft delete are both enabled, then modifying or deleting a blob creates a new historical version instead of a soft-deleted snapshot. This historical version is not in the soft-deleted state, so it is not subject to the retention period for soft-deleted data and is not deleted permanently when the retention period elapses. For more information about using blob versioning and soft delete together, see [Blob versioning and soft delete](versioning-overview.md#blob-versioning-and-soft-delete).
29+
If blob versioning and soft delete are both enabled on the storage account, then deleting a blob creates a new version instead of a soft-deleted snapshot. The new version is not soft-deleted and is not removed when the soft-delete retention period expires. Soft-deleted versions of a blob can be restored within the retention period by calling the [Undelete Blob](/rest/api/storageservices/undelete-blob) operation. The blob can subsequently be restored from one of its versions by calling the [Copy Blob](/rest/api/storageservices/copy-blob) operation. For more information about using blob versioning and soft delete together, see [Blob versioning and soft delete](versioning-overview.md#blob-versioning-and-soft-delete).
3230

3331
Soft deleted objects are invisible unless explicitly listed.
3432

@@ -54,7 +52,7 @@ If you disable soft delete, you can continue to access and recover soft deleted
5452

5553
Soft delete preserves your data in many cases where objects are deleted or overwritten.
5654

57-
When a blob is overwritten using **Put Blob**, **Put Block**, **Put Block List**, or **Copy Blob** a version or snapshot of the blob's state prior to the write operation is automatically generated. This object is invisible unless soft deleted objects are explicitly listed. See the [Recovery](#recovery) section to learn how to list soft deleted objects.
55+
When a blob is overwritten using **Put Blob**, **Put Block List**, or **Copy Blob**, a version or snapshot of the blob's state prior to the write operation is automatically generated. This object is invisible unless soft-deleted objects are explicitly listed. See the [Recovery](#recovery) section to learn how to list soft deleted objects.
5856

5957
![](media/soft-delete-overview/storage-blob-soft-delete-overwrite.png)
6058

@@ -186,7 +184,7 @@ Yes, but you must call Undelete on the blob first.
186184

187185
### Is soft delete available for virtual machine disks?
188186

189-
Soft delete is available for both premium and standard unmanaged disks, which are page blobs under the covers. Soft delete will only help you recover data deleted by **Delete Blob**, **Put Blob**, **Put Block List**, **Put Block** and **Copy Blob** operations. Data overwritten by a call to **Put Page** is not recoverable.
187+
Soft delete is available for both premium and standard unmanaged disks, which are page blobs under the covers. Soft delete will only help you recover data deleted by **Delete Blob**, **Put Blob**, **Put Block List**, and **Copy Blob** operations. Data overwritten by a call to **Put Page** is not recoverable.
190188

191189
An Azure virtual machine writes to an unmanaged disk using calls to **Put Page**, so using soft delete to undo writes to an unmanaged disk from an Azure VM is not a supported scenario.
192190

articles/storage/blobs/versioning-manage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ services: storage
66
author: tamram
77

88
ms.service: storage
9-
ms.topic: conceptual
10-
ms.date: 04/21/2020
9+
ms.topic: how-to
10+
ms.date: 04/30/2020
1111
ms.author: tamram
1212
ms.subservice: blobs
1313
---

articles/storage/blobs/versioning-overview.md

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: tamram
77

88
ms.service: storage
99
ms.topic: conceptual
10-
ms.date: 04/21/2020
10+
ms.date: 04/30/2020
1111
ms.author: tamram
1212
ms.subservice: blobs
1313
---
@@ -113,17 +113,33 @@ The following diagram shows how modifying a blob after versioning is disabled cr
113113

114114
## Blob versioning and soft delete
115115

116-
Blob versioning and blob soft delete work together to provide you with optimal data protection. For more information about blob soft delete, see [Soft delete for Azure Storage blobs](storage-blob-soft-delete.md).
116+
Blob versioning and blob soft delete work together to provide you with optimal data protection. When you enable soft delete, you specify how long Azure Storage should retain a soft-deleted blob. Any soft-deleted blob version remains in the system and can be undeleted within the soft delete retention period. For more information about blob soft delete, see [Soft delete for Azure Storage blobs](storage-blob-soft-delete.md).
117117

118-
When you enable soft delete, you specify the retention period for soft-deleted data. Any deleted blob version remains in the system and can be undeleted within the soft delete retention period.
118+
### Deleting a blob or version
119119

120-
When both blob versioning and blob soft delete are enabled, modifying or deleting a blob creates a new version instead of a soft-deleted snapshot. This version is not in the soft-deleted state, so it is not subject to the retention period for soft-deleted data and is not deleted permanently when the retention period elapses.
120+
Soft delete offers additional protection for deleting blob versions. If both versioning and soft delete are enabled on the storage account, then when you delete a blob, Azure Storage creates a new version to save the state of the blob immediately prior to deletion and deletes the current version. The new version is not soft-deleted and is not removed when the soft-delete retention period expires.
121121

122-
To remove a version, explicitly delete it using the version ID. When a version is deleted while soft delete is enabled, that version becomes a soft-deleted version. Soft-deleted versions are permanently deleted after the soft delete retention period has expired. The following image shows how a version is deleted when soft delete is enabled.
122+
When you delete a previous version of the blob, the version is soft-deleted. The soft-deleted version is retained throughout the retention period specified in the soft delete settings for the storage account and is permanently deleted when the soft delete retention period expires.
123+
124+
To remove a previous version of a blob, explicitly delete it by specifying the version ID.
125+
126+
The following diagram shows what happens when you delete a blob or a blob version.
123127

124128
:::image type="content" source="media/versioning-overview/soft-delete-historical-version.png" alt-text="Diagram showing deletion of a version with soft delete enabled":::
125129

126-
You can restore a soft-deleted blob version by calling the [Undelete Blob](/rest/api/storageservices/undelete-blob) operation during the soft delete retention period. Once the retention period has elapsed, the blob version is permanently deleted.
130+
If both versioning and soft delete are enabled on a storage account, then no soft-deleted snapshot is created when a blob or blob version is modified or deleted.
131+
132+
### Restoring a soft-deleted version
133+
134+
You can restore a soft-deleted blob version by calling the [Undelete Blob](/rest/api/storageservices/undelete-blob) operation on the version while the soft delete retention period is in effect. The **Undelete Blob** operation restores all soft-deleted versions of the blob.
135+
136+
Restoring soft-deleted versions with the **Undelete Blob** operation does not promote any version to be the current version. To restore the current version, first restore all soft-deleted versions, and then use the [Copy Blob](/rest/api/storageservices/copy-blob) operation to copy a previous version to restore the blob.
137+
138+
The following diagram shows how to restore soft-deleted blob versions with the **Undelete Blob** operation, and how to restore the current version of the blob with the **Copy Blob** operation.
139+
140+
:::image type="content" source="media/versioning-overview/undelete-version.png" alt-text="Diagram showing how to restore soft-deleted versions":::
141+
142+
After the soft-delete retention period has elapsed, any soft-deleted blob versions are permanently deleted.
127143

128144
## Blob versioning and blob snapshots
129145

@@ -140,8 +156,6 @@ When you take a snapshot of a versioned blob, a new version is created at the sa
140156

141157
The following diagram shows what happens when you take a snapshot of a versioned blob. In the diagram, blob versions and snapshots with version ID 2 and 3 contain identical data.
142158

143-
???need to discuss this image with Yuan - it's confusing - which version is the snapshot associated with? can we change the snapshot ID?
144-
145159
:::image type="content" source="media/versioning-overview/snapshot-versioned-blob.png" alt-text="Diagram showing snapshots of a versioned blob ":::
146160

147161
## Authorize operations on blob versions
@@ -175,8 +189,10 @@ The following table shows the permission required on a SAS to delete a blob vers
175189

176190
Blob versioning is available in preview in the following regions:
177191

178-
- West US 2
179-
- West Central US
192+
- France South
193+
- France Central
194+
- Canada East
195+
- Canada Central
180196

181197
The preview is intended for non-production use only.
182198

0 commit comments

Comments
 (0)