equal
deleted
inserted
replaced
|
1 In-house patch to change the compute node resource tracking for the |
|
2 'solariszones' driver, as we don't locally allocate space for root on the |
|
3 compute node and instead provision it through Cinder. |
|
4 |
|
5 This patch is not suitable for upstream. |
|
6 |
|
7 --- nova-13.1.0/nova/compute/resource_tracker.py 2016-06-14 08:45:49.000000000 -0700 |
|
8 +++ nova-13.1.0/nova/compute/resource_tracker.py.new 2016-10-18 10:14:56.580870836 -0700 |
|
9 @@ -714,7 +714,10 @@ |
|
10 mem_usage += overhead['memory_mb'] |
|
11 |
|
12 self.compute_node.memory_mb_used += sign * mem_usage |
|
13 - self.compute_node.local_gb_used += sign * usage.get('root_gb', 0) |
|
14 + # The Solaris Zones driver does not have root locally assigned in Nova, |
|
15 + # root zvols are provisioned from Cinder, so don't track them here. |
|
16 + if usage.get('vm_mode') != 'solariszones': |
|
17 + self.compute_node.local_gb_used += sign * usage.get('root_gb', 0) |
|
18 self.compute_node.local_gb_used += sign * usage.get('ephemeral_gb', 0) |
|
19 self.compute_node.vcpus_used += sign * usage.get('vcpus', 0) |