-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Show parent snapshot (along with the chain size) for incremental snapshots #12468
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
base: 4.22
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -155,6 +155,14 @@ public class SnapshotResponse extends BaseResponseWithTagInformation implements | |||||
| @Param(description = "download progress of a snapshot", since = "4.19.0") | ||||||
| private Map<String, String> downloadDetails; | ||||||
|
|
||||||
| @SerializedName("parent") | ||||||
| @Param(description = "The parent ID of the Snapshot", since = "4.22.1") | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| private String parent; | ||||||
|
|
||||||
| @SerializedName("parentname") | ||||||
| @Param(description = "The parent name of the Snapshot", since = "4.22.1") | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| private String parentName; | ||||||
sureshanaparti marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
|
||||||
| public SnapshotResponse() { | ||||||
| tags = new LinkedHashSet<ResourceTagResponse>(); | ||||||
| } | ||||||
|
|
@@ -313,4 +321,12 @@ public void setDatastoreType(String datastoreType) { | |||||
| public void setDownloadDetails(Map<String, String> downloadDetails) { | ||||||
| this.downloadDetails = downloadDetails; | ||||||
| } | ||||||
|
|
||||||
| public void setParent(String parent) { | ||||||
| this.parent = parent; | ||||||
| } | ||||||
|
|
||||||
| public void setParentName(String parentName) { | ||||||
| this.parentName = parentName; | ||||||
| } | ||||||
| } | ||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4799,6 +4799,7 @@ public Map<String, Object> listCapabilities(final ListCapabilitiesCmd cmd) { | |
| final long diskOffMinSize = VolumeOrchestrationService.CustomDiskOfferingMinSize.value(); | ||
| final long diskOffMaxSize = VolumeOrchestrationService.CustomDiskOfferingMaxSize.value(); | ||
| final boolean KVMSnapshotEnabled = SnapshotManager.KVMSnapshotEnabled.value(); | ||
| final boolean SnapshotShowChainSize = SnapshotManager.snapshotShowChainSize.value(); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not really aware of why the |
||
|
|
||
| final boolean userPublicTemplateEnabled = TemplateManager.AllowPublicUserTemplates.valueIn(caller.getId()); | ||
|
|
||
|
|
@@ -4839,6 +4840,7 @@ public Map<String, Object> listCapabilities(final ListCapabilitiesCmd cmd) { | |
| capabilities.put("customDiskOffMaxSize", diskOffMaxSize); | ||
| capabilities.put("regionSecondaryEnabled", regionSecondaryEnabled); | ||
| capabilities.put("KVMSnapshotEnabled", KVMSnapshotEnabled); | ||
| capabilities.put("SnapshotShowChainSize", SnapshotShowChainSize); | ||
| capabilities.put("allowUserViewDestroyedVM", allowUserViewDestroyedVM); | ||
| capabilities.put("allowUserExpungeRecoverVM", allowUserExpungeRecoverVM); | ||
| capabilities.put("allowUserExpungeRecoverVolume", allowUserExpungeRecoverVolume); | ||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -312,6 +312,9 @@ export default { | |||||
| resourceType: 'Snapshot', | ||||||
| columns: () => { | ||||||
| var fields = ['name', 'state', 'volumename', 'intervaltype', 'physicalsize', 'created'] | ||||||
| if (store.getters.features.snapshotshowchainsize) { | ||||||
| fields.splice(fields.indexOf('created'), 0, 'chainsize', 'parentname') | ||||||
| } | ||||||
| if (['Admin', 'DomainAdmin'].includes(store.getters.userInfo.roletype)) { | ||||||
| fields.push('account') | ||||||
| if (store.getters.listAllProjects) { | ||||||
|
|
@@ -324,7 +327,13 @@ export default { | |||||
| fields.push('zonename') | ||||||
| return fields | ||||||
| }, | ||||||
| details: ['name', 'id', 'volumename', 'volumetype', 'snapshottype', 'intervaltype', 'physicalsize', 'virtualsize', 'chainsize', 'account', 'domain', 'created'], | ||||||
| details: () => { | ||||||
| var fields = ['name', 'id', 'volumename', 'volumetype', 'snapshottype', 'intervaltype', 'physicalsize', 'virtualsize', 'account', 'domain', 'created'] | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| if (store.getters.features.snapshotshowchainsize) { | ||||||
| fields.splice(fields.indexOf('account'), 0, 'chainsize', 'parentname') | ||||||
| } | ||||||
|
Comment on lines
+332
to
+334
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It would be great to display for the |
||||||
| return fields | ||||||
| }, | ||||||
| tabs: [ | ||||||
| { | ||||||
| name: 'details', | ||||||
|
|
||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
By chain size, I believe that the end users can infer that it refers to the number of snapshots in the chain