Commit 00976304 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Merge branch 'devel-2.5'



* devel-2.5:
  rpc: Disable HTTP client pool and reduce memory consumption
  Preserve bridge MTU in KVM ifup script
  hail: Fix result for node evacuation
  Fix assertion error on unclean master shutdown
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents 727274dd 5b0ac1a5
......@@ -105,7 +105,7 @@ data EvacSolution = EvacSolution
{ esMoved :: [(Idx, Gdx, [Ndx])] -- ^ Instances moved successfully
, esFailed :: [(Idx, String)] -- ^ Instances which were not
-- relocated
, esOpCodes :: [[[OpCodes.OpCode]]] -- ^ List of lists of jobs
, esOpCodes :: [[OpCodes.OpCode]] -- ^ List of jobs
}
-- | Allocation results, as used in 'iterateAlloc' and 'tieredAlloc'.
......@@ -1057,7 +1057,7 @@ updateEvacSolution (nl, il, es) idx (Bad msg) =
(nl, il, es { esFailed = (idx, msg):esFailed es})
updateEvacSolution (_, _, es) idx (Ok (nl, il, opcodes)) =
(nl, il, es { esMoved = new_elem:esMoved es
, esOpCodes = [opcodes]:esOpCodes es })
, esOpCodes = opcodes:esOpCodes es })
where inst = Container.find idx il
new_elem = (idx,
instancePriGroup nl inst,
......
......@@ -446,7 +446,7 @@ class _RpcProcessor:
assert procedure in _TIMEOUTS, "RPC call not declared in the timeouts table"
if not http_pool:
http_pool = _thread_local.GetHttpClientPool()
http_pool = http.client.HttpClientPool(_ConfigRpcCurl)
if read_timeout is None:
read_timeout = _TIMEOUTS[procedure]
......
......@@ -36,6 +36,8 @@ fi
ip link set $INTERFACE up
if [ "$MODE" = "bridged" ]; then
ip link set $INTERFACE mtu $(</sys/class/net/${BRIDGE}/mtu)
# Connect the interface to the bridge
brctl addif $BRIDGE $INTERFACE
else
......
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