From 368e8f71a1fe35a854fbd6f19da3a23e5b5ee563 Mon Sep 17 00:00:00 2001 From: Jerry Cai Date: Thu, 30 Oct 2014 10:24:06 +0800 Subject: [PATCH] Merge the get_available_resource() and get_host_stat() For better report the host status, I would like to merge the code for get_host_stats() and get_available_resource(). As most of them are similar, merge together to easily manage the code. Change-Id: I1900da06576d2f066c6154306f77f7c721e64cdf Closes-bug: 1387089 --- common-powervc/etc/powervc.conf | 3 + common-powervc/powervc/common/config.py | 3 +- .../nova/driver/virt/powervc/driver.py | 71 +++++++++---------- 3 files changed, 39 insertions(+), 38 deletions(-) diff --git a/common-powervc/etc/powervc.conf b/common-powervc/etc/powervc.conf index 1b73fca..7c8eca0 100644 --- a/common-powervc/etc/powervc.conf +++ b/common-powervc/etc/powervc.conf @@ -186,3 +186,6 @@ volume_max_try_times = 12 # Minimum delay interval and initial delay seconds for long run tasks. longrun_loop_interval = 7 longrun_initial_delay = 10 + +# The cap value for PowerVC host disk size to avoid overflow on local os.' +max_host_disk_size = 2097152 diff --git a/common-powervc/powervc/common/config.py b/common-powervc/powervc/common/config.py index ab29609..5a78e1a 100644 --- a/common-powervc/powervc/common/config.py +++ b/common-powervc/powervc/common/config.py @@ -129,7 +129,8 @@ FILE_OPTIONS = { cfg.StrOpt('staging_project_name', default=constants.DEFAULT_STAGING_PROJECT_NAME), cfg.StrOpt('staging_user', - default=constants.DEFAULT_STAGING_USER_NAME)] + default=constants.DEFAULT_STAGING_USER_NAME), + cfg.IntOpt('max_host_disk_size', default=2907152)] } for section in FILE_OPTIONS: diff --git a/nova-powervc/powervc/nova/driver/virt/powervc/driver.py b/nova-powervc/powervc/nova/driver/virt/powervc/driver.py index 6251d11..f369230 100644 --- a/nova-powervc/powervc/nova/driver/virt/powervc/driver.py +++ b/nova-powervc/powervc/nova/driver/virt/powervc/driver.py @@ -655,6 +655,19 @@ class PowerVCDriver(driver.ComputeDriver): """Restore the specified instance.""" raise NotImplementedError() + def get_available_nodes(self, refresh=False): + """Returns nodenames of all nodes managed by the compute service. + + This method is for multi compute-nodes support. If a driver supports + multi compute-nodes, this method returns a list of nodenames managed + by the service. Otherwise, this method should return + [hypervisor_hostname]. + """ + stats = self.get_host_stats(refresh=refresh) + if not isinstance(stats, list): + stats = [stats] + return [s['hypervisor_hostname'] for s in stats] + def get_available_resource(self, nodename): """Retrieve resource information. @@ -666,33 +679,7 @@ class PowerVCDriver(driver.ComputeDriver): a driver that manages only one node can safely ignore this :returns: Dictionary describing resources """ - hypervisor = self.get_hypervisor_by_hostname(self.hostname) - if hypervisor is None: - return None - info = hypervisor._info - - local_gb = info["local_gb"] - if int(local_gb) == 0: - local_gb = info["local_gb_used"] - - vcpus = int(float(info["vcpus"]) - float(info["proc_units_reserved"])) - memory_mb = int(info["memory_mb"]) - int(info["memory_mb_reserved"]) - - dic = {'vcpus': vcpus, - 'vcpus_used': info["vcpus_used"], - 'memory_mb': memory_mb, - 'memory_mb_used': info["memory_mb_used"], - 'local_gb': local_gb, - 'local_gb_used': info["local_gb_used"], - 'disk_available_least': info["disk_available_least"], - 'hypervisor_hostname': info["hypervisor_hostname"], - 'hypervisor_type': info["hypervisor_type"], - 'hypervisor_version': info["hypervisor_version"], - 'cpu_info': info["cpu_info"], - 'supported_instances': jsonutils.dumps( - constants.POWERVC_SUPPORTED_INSTANCES) - } - return dic + return self._update_status() def _get_cpu_info(self): """Get cpuinfo information. @@ -1302,31 +1289,41 @@ class PowerVCDriver(driver.ComputeDriver): """Retrieve status info from PowerVC.""" LOG.debug(_("Updating host stats")) hypervisor = self.get_hypervisor_by_hostname(self.hostname) + if hypervisor is None: + return None info = hypervisor._info local_gb = info["local_gb"] if 0 == int(local_gb): local_gb = info["local_gb_used"] + # avoid value too large to damage the hosting os + m_size = CONF.powervc.max_host_disk_size + local_gb = m_size if local_gb > m_size else local_gb + disk_available_least = info["disk_available_least"] + disk_available_least = m_size if disk_available_least > m_size else\ + disk_available_least vcpus = int(float(info["vcpus"]) - float(info["proc_units_reserved"])) memory_mb = int(info["memory_mb"]) - int(info["memory_mb_reserved"]) - # The value of the property 'free_disk_gb' is invalid, - # set is as '21474835' + used_memory = info.get("memory_mb_used") or\ + (memory_mb - int(info.get("free_ram_mb"))) data = {'vcpus': vcpus, 'vcpus_used': info["vcpus_used"], - 'host_memory_total': memory_mb, - 'host_memory_free': info["free_ram_mb"], - 'disk_total': local_gb, - 'disk_used': info["local_gb_used"], - 'disk_available': 21474835, - 'disk_available_least': info["disk_available_least"], + 'memory_mb': memory_mb, + 'memory_mb_used': used_memory, + 'local_gb': local_gb, + 'local_gb_used': info["local_gb_used"], + 'disk_available_least': disk_available_least, 'hypervisor_hostname': info["hypervisor_hostname"], 'hypervisor_type': info["hypervisor_type"], 'hypervisor_version': info["hypervisor_version"], - 'supported_instances': constants.POWERVC_SUPPORTED_INSTANCES, - 'cpu_info': info["cpu_info"]} + 'cpu_info': info["cpu_info"], + 'supported_instances': jsonutils.dumps( + constants.POWERVC_SUPPORTED_INSTANCES)} + self._stats = data + return data def _get_pvc_image_uuid(self, image_meta): """