Revision 2060348b Ganeti/HTools/Loader.hs

b/Ganeti/HTools/Loader.hs
100 100 
         -> [(Ndx, Node.Node)]
101 101 
fixNodes accu (idx, inst) =
102 102 
    let
103 
        pdx = Instance.pnode inst
104 
        sdx = Instance.snode inst
103 
        pdx = Instance.pNode inst
104 
        sdx = Instance.sNode inst
105 105 
        pold = fromJust $ lookup pdx accu
106 106 
        pnew = Node.setPri pold idx
107 107 
        pnew' = Node.addCpus pnew (Instance.vcpus inst)
......
156 156 
    Container.mapAccum
157 157 
        (\ msgs node ->
158 158 
             let nname = Node.name node
159 
                 nilst = map (flip Container.find il) (Node.plist node)
159 
                 nilst = map (flip Container.find il) (Node.pList node)
160 160 
                 dilst = filter (not . Instance.running) nilst
161 161 
                 adj_mem = sum . map Instance.mem $ dilst
162 
                 delta_mem = truncate (Node.t_mem node)
163 
                             - Node.n_mem node
164 
                             - Node.f_mem node
162 
                 delta_mem = truncate (Node.tMem node)
163 
                             - Node.nMem node
164 
                             - Node.fMem node
165 165 
                             - nodeImem node il
166 166 
                             + adj_mem
167 
                 delta_dsk = truncate (Node.t_dsk node)
168 
                             - Node.f_dsk node
167 
                 delta_dsk = truncate (Node.tDsk node)
168 
                             - Node.fDsk node
169 169 
                             - nodeIdsk node il
170 170 
                 newn = Node.setFmem (Node.setXmem node delta_mem)
171 
                        (Node.f_mem node - adj_mem)
171 
                        (Node.fMem node - adj_mem)
172 172 
                 umsg1 = [printf "node %s is missing %d MB ram \
173 173 
                                 \and %d GB disk"
174 174 
                                 nname delta_mem (delta_dsk `div` 1024) |
......
181 181 
nodeImem node il =
182 182 
    let rfind = flip Container.find il
183 183 
    in sum . map (Instance.mem . rfind)
184 
           $ Node.plist node
184 
           $ Node.pList node
185 185 

  		





  186
  186
  
    
-- | Compute the amount of disk used by instances on a node (either primary


  		





  187
  187
  
    
-- or secondary).


  		





  ......




  189
  189
  
    
nodeIdsk node il =


  		





  190
  190
  
    
    let rfind = flip Container.find il


  		





  191
  191
  
    
    in sum . map (Instance.dsk . rfind)


  		





  192
  
  
    
           $ Node.plist node ++ Node.slist node


  		





  
  192
  
    
           $ Node.pList node ++ Node.sList node


  		












Also available in:
  Unified diff