Revision 262a08a2 Ganeti/HTools/Loader.hs
b/Ganeti/HTools/Loader.hs | ||
---|---|---|
81 | 81 |
mergeData :: (Node.AssocList, |
82 | 82 |
Instance.AssocList) -- ^ Data from either Text.loadData |
83 | 83 |
-- or Rapi.loadData |
84 |
-> Result (NodeList, InstanceList, String)
|
|
84 |
-> Result (Node.List, Instance.List, String)
|
|
85 | 85 |
mergeData (nl, il) = do |
86 | 86 |
let |
87 | 87 |
nl2 = fixNodes nl il |
... | ... | |
92 | 92 |
inst_names = map Instance.name $ Container.elems il3 |
93 | 93 |
common_suffix = longestDomain (node_names ++ inst_names) |
94 | 94 |
csl = length common_suffix |
95 |
snl = Container.map (\n -> setName n (stripSuffix csl $ name n)) nl3 |
|
96 |
sil = Container.map (\i -> setName i (stripSuffix csl $ name i)) il3 |
|
95 |
snl = Container.map (\n -> setName n (stripSuffix csl $ nameOf n)) nl3
|
|
96 |
sil = Container.map (\i -> setName i (stripSuffix csl $ nameOf i)) il3
|
|
97 | 97 |
return (snl, sil, common_suffix) |
98 | 98 |
|
99 | 99 |
-- | Check cluster data for consistency |
100 |
checkData :: NodeList -> InstanceList
|
|
101 |
-> ([String], NodeList) |
|
100 |
checkData :: Node.List -> Instance.List
|
|
101 |
-> ([String], Node.List)
|
|
102 | 102 |
checkData nl il = |
103 | 103 |
Container.mapAccum |
104 | 104 |
(\ msgs node -> |
... | ... | |
125 | 125 |
) [] nl |
126 | 126 |
|
127 | 127 |
-- | Compute the amount of memory used by primary instances on a node. |
128 |
nodeImem :: Node.Node -> InstanceList -> Int |
|
128 |
nodeImem :: Node.Node -> Instance.List -> Int
|
|
129 | 129 |
nodeImem node il = |
130 | 130 |
let rfind = flip Container.find $ il |
131 | 131 |
in sum . map Instance.mem . |
... | ... | |
133 | 133 |
|
134 | 134 |
-- | Compute the amount of disk used by instances on a node (either primary |
135 | 135 |
-- or secondary). |
136 |
nodeIdsk :: Node.Node -> InstanceList -> Int |
|
136 |
nodeIdsk :: Node.Node -> Instance.List -> Int
|
|
137 | 137 |
nodeIdsk node il = |
138 | 138 |
let rfind = flip Container.find $ il |
139 | 139 |
in sum . map Instance.dsk . |
Also available in: Unified diff