flasharray: fall back to array capacity when pod has no quota #13050
+31
−3
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -453,18 +453,46 @@ public void disconnect() { | |||||||
| @Override | ||||||||
| public ProviderVolumeStorageStats getManagedStorageStats() { | ||||||||
| FlashArrayPod pod = getVolumeNamespace(this.pod); | ||||||||
| if (pod == null) { | ||||||||
| return null; | ||||||||
| } | ||||||||
| Long capacityBytes = pod.getQuotaLimit(); | ||||||||
| if (capacityBytes == null || capacityBytes == 0) { | ||||||||
| // Pod has no explicit quota set; report the array total physical | ||||||||
| // capacity so the CloudStack allocator has a real ceiling to plan | ||||||||
| // against rather than bailing out with a zero-capacity pool. | ||||||||
| capacityBytes = getArrayTotalCapacity(); | ||||||||
| } | ||||||||
| if (capacityBytes == null || capacityBytes == 0) { | ||||||||
| return null; | ||||||||
| } | ||||||||
| Long usedBytes = pod.getFootprint(); | ||||||||
| if (usedBytes == null) { | ||||||||
| usedBytes = 0L; | ||||||||
| } | ||||||||
| ProviderVolumeStorageStats stats = new ProviderVolumeStorageStats(); | ||||||||
| stats.setCapacityInBytes(capacityBytes); | ||||||||
| stats.setActualUsedInBytes(usedBytes); | ||||||||
| return stats; | ||||||||
| } | ||||||||
|
|
||||||||
| private Long getArrayTotalCapacity() { | ||||||||
| try { | ||||||||
| FlashArrayList<Map<String, Object>> list = GET("/arrays?space=true", | ||||||||
| new TypeReference<FlashArrayList<Map<String, Object>>>() { | ||||||||
| }); | ||||||||
| if (list != null && list.getItems() != null && !list.getItems().isEmpty()) { | ||||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
|
||||||||
| Object cap = list.getItems().get(0).get("capacity"); | ||||||||
| if (cap instanceof Number) { | ||||||||
| return ((Number) cap).longValue(); | ||||||||
| } | ||||||||
| } | ||||||||
| } catch (Exception e) { | ||||||||
| logger.warn("Could not retrieve array total capacity", e); | ||||||||
|
There was a problem hiding this comment. The warning log in
Suggested change
|
||||||||
| } | ||||||||
| return null; | ||||||||
| } | ||||||||
|
|
||||||||
| @Override | ||||||||
| public ProviderVolumeStats getVolumeStats(ProviderAdapterContext context, ProviderAdapterDataObject dataObject) { | ||||||||
| ProviderVolume vol = getVolume(dataObject.getExternalName()); | ||||||||
|
|
||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Calling
GET("/arrays?space=true")insidegetManagedStorageStats()can add a second REST request on every storage-stats refresh whenever a pod has no quota. SinceFlashArrayAdapterFactoryconstructs a new adapter per call, this likely won’t be amortized/cached and could create avoidable API load. Consider memoizing the array capacity (e.g., static cache keyed by URL with a TTL) or persisting the discovered capacity into CloudStack pool details so subsequent stats calls don’t need to re-query/arrayseach time.