Commit 7384c96a authored by Klaus Aehlig's avatar Klaus Aehlig
Browse files

Merge branch 'stable-2.9' into stable-2.10



* stable-2.9
  Set exclusion tags correctly in requested instance
  Export extractExTags and updateExclTags
  Document spindles in the hbal man page
  Sample logrotate conf breaks permissions with split users
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarJose A. Lopes <jabolopes@google.com>
parents 06ab985d 93c6a885
......@@ -5,7 +5,6 @@
notifempty
compress
delaycompress
create 640 root root
sharedscripts
postrotate
@PKGLIBDIR@/daemon-util rotate-all-logs
......
......@@ -123,6 +123,11 @@ following components:
in 2-node clusters
- standard deviation of the ratio of virtual-to-physical cpus (for
primary instances of the node)
- standard deviation of the fraction of the available spindles
(in dedicated mode, spindles represent physical spindles; otherwise
this oversubscribable measure for IO load, and the oversubscription
factor is taken into account when computing the number of available
spindles)
- standard deviation of the dynamic load on the nodes, for cpus,
memory, disk and network
- standard deviation of the CPU load provided by MonD
......
......@@ -213,7 +213,7 @@ parseData now body = do
rname <- extrReq "name"
req_nodes <- extrReq "required_nodes"
inew <- parseBaseInstance rname request
let io = snd inew
let io = updateExclTags (extractExTags ctags) $ snd inew
return $ Allocate io req_nodes
| optype == C.iallocatorModeReloc ->
do
......@@ -248,7 +248,8 @@ parseData now body = do
rname <- extrFromReq r "name"
req_nodes <- extrFromReq r "required_nodes"
inew <- parseBaseInstance rname r
let io = snd inew
let io = updateExclTags (extractExTags ctags)
$ snd inew
return (io, req_nodes)) inst_reqs
return $ MultiAllocate prqs
| otherwise -> fail ("Invalid request type '" ++ optype ++ "'")
......
......@@ -37,6 +37,8 @@ module Ganeti.HTools.Loader
, lookupGroup
, eitherLive
, commonSuffix
, extractExTags
, updateExclTags
, RqType(..)
, Request(..)
, ClusterData(..)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment