Revision 06fb92cf src/Ganeti/Query/Node.hs
b/src/Ganeti/Query/Node.hs | ||
---|---|---|
64 | 64 |
"Available disk space in volume group") |
65 | 65 |
, ("dtotal", "DTotal", QFTUnit, "vg_size", |
66 | 66 |
"Total disk space in volume group used for instance disk allocation") |
67 |
, ("spfree", "SpFree", QFTNumber, "spindles_free", |
|
68 |
"Available spindles in volume group (exclusive storage only)") |
|
69 |
, ("sptotal", "SpTotal", QFTNumber, "spindles_total", |
|
70 |
"Total spindles in volume group (exclusive storage only)") |
|
67 | 71 |
, ("mfree", "MFree", QFTUnit, "memory_free", |
68 | 72 |
"Memory available for instance allocations") |
69 | 73 |
, ("mnode", "MNode", QFTUnit, "memory_dom0", |
... | ... | |
87 | 91 |
getMaybeJsonHead (rpcResNodeInfoVgInfo res) vgInfoVgFree |
88 | 92 |
nodeLiveFieldExtract "dtotal" res = |
89 | 93 |
getMaybeJsonHead (rpcResNodeInfoVgInfo res) vgInfoVgSize |
94 |
nodeLiveFieldExtract "spfree" res = |
|
95 |
getMaybeJsonElem (rpcResNodeInfoVgInfo res) 1 vgInfoVgFree |
|
96 |
nodeLiveFieldExtract "sptotal" res = |
|
97 |
getMaybeJsonElem (rpcResNodeInfoVgInfo res) 1 vgInfoVgSize |
|
90 | 98 |
nodeLiveFieldExtract "mfree" res = |
91 | 99 |
jsonHead (rpcResNodeInfoHvInfo res) hvInfoMemoryFree |
92 | 100 |
nodeLiveFieldExtract "mnode" res = |
... | ... | |
226 | 234 |
collectLiveData True cfg nodes = do |
227 | 235 |
let vgs = maybeToList . clusterVolumeGroupName $ configCluster cfg |
228 | 236 |
-- FIXME: This currently sets every storage unit to LVM |
229 |
storage_units = zip (repeat T.StorageLvmVg) vgs |
|
237 |
storage_units = zip (repeat T.StorageLvmVg) vgs ++ |
|
238 |
zip (repeat T.StorageLvmPv) vgs |
|
230 | 239 |
hvs = [getDefaultHypervisor cfg] |
231 | 240 |
step n (bn, gn, em) = |
232 | 241 |
let ndp' = getNodeNdParams cfg n |
Also available in: Unified diff