ewilliams28/pve-purestorage-plugin
1
0
Fork 0
mirror of https://github.com/kolesa-team/pve-purestorage-plugin.git synced 2026-08-12 21:53:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93 from brngates98/issue84

Browse Source 
Refactor pod capacity retrieval and space calculations
This commit is contained in:
Timur Kumakbayev
2026-05-04 01:58:30 +05:00
committed by GitHub
parent d6b0035d5e f7d06166fc
commit 40eb92df32
1 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PureStoragePlugin.pm
+43 -18
View File
@@ -1700,48 +1700,73 @@ sub status {
my $total;
my $used;
# If using pod with quota, get pod-specific capacity
# Pod-backed stores: GET pods (not pods/space) — pods/space omits quota_limit and any
# capacity ceiling, which produced invalid total/free for REST consumers on current FA APIs.
if ( defined $scfg->{ podname } && $scfg->{ podname } ne '' ) {
my $podname = $scfg->{ podname };
$logger->( P_VERB, "Getting pod quota for pod: $podname", $scfg );
$logger->( P_VERB, "Getting pod capacity for pod: $podname", $scfg );
my $action = {
name => 'get pod space',
type => 'pods/space',
name => 'get pod',
type => 'pods',
method => 'GET',
params => { names => $podname }
};
my $response = purestorage_api_call( $scfg, $action, 0, $storeid );
my $pod = $response->{ items }->[0];
if ( $pod ) {
$fatal->( "Pod \"$podname\" not found", $scfg ) unless $pod;
# Use quota_limit if set and non-zero, otherwise fall back to array capacity
# quota_limit = 0 or undef means unlimited (no quota)
my $quota = $pod->{ quota_limit };
$total = ( defined( $quota ) && $quota > 0 ) ? $quota : $pod->{ capacity };
$used = $pod->{ space }->{ total_physical };
my $space = $pod->{ space } // {};
my $quota = $pod->{ quota_limit };
my $quota_str = defined( $quota ) ? ( $quota > 0 ? $quota : 'unlimited' ) : 'not set';
$logger->( P_VERB, "Pod quota_limit: $quota_str", $scfg );
if ( defined( $quota ) && $quota > 0 ) {
$total = $quota;
# Pod quotas are logical (provisioned) limits on Purity 6.4+.
# Prefer total_used over deprecated total_physical on pod space (FA REST 2.x).
$used = $space->{ used_provisioned } // $space->{ total_used } // $space->{ total_physical } // 0;
} else {
$fatal->( "Pod \"$podname\" not found", $scfg );
my $arr_response = purestorage_api_call( $scfg, { name => 'get array space', type => 'arrays/space', method => 'GET' }, 0, $storeid );
my $array = $arr_response->{ items }->[0];
$fatal->( 'PureStorage API :: No array space data', $scfg ) unless $array;
unless ( defined $array->{ capacity } ) {
$logger->( P_WARN, 'arrays/space response missing capacity; reporting total as 0', $scfg );
}
$total = $array->{ capacity } // 0;
# Same scope as non-pod status: capacity and usage both from arrays/space (array-wide).
my $arr_space = $array->{ space } // {};
$used = $arr_space->{ total_used } // $arr_space->{ total_physical } // 0;
}
my $quota_str = defined( $quota ) ? ( $quota > 0 ? $quota : 'unlimited' ) : 'not set';
$logger->( P_VERB, "Pod quota_limit: $quota_str", $scfg );
} else {
# Get array-wide capacity
my $response = purestorage_api_call( $scfg, { name => 'get array space', type => 'arrays/space', method => 'GET' }, 0, $storeid );
my $array = $response->{ items }->[0];
$total = $array->{ capacity };
unless ( defined $array->{ capacity } ) {
$logger->( P_WARN, 'arrays/space response missing capacity; reporting total as 0', $scfg );
}
# total_physical - physically used space on the array (after deduplication and compression)
# total_used - logically used space (before deduplication and compression)
$used = $array->{ space }->{ total_physical };
$total = $array->{ capacity } // 0;
# Prefer total_used (FA REST 2.x); total_physical deprecated for same metric on newer arrays.
my $arr_space = $array->{ space } // {};
$used = $arr_space->{ total_used } // $arr_space->{ total_physical } // 0;
}
# Calculate free space
$total //= 0;
$used //= 0;
$used = $total if $used > $total;
# Calculate free space (clamp so REST/UI integrations never see negative free)
my $free = $total - $used;
$free = 0 if $free < 0;
# Mark storage as active
my $active = 1;