create: Drop host storage timer

It's kind of needy to be doing a pool.refresh every 3 seconds, and really
I'm fine with telling people they have to close and reopen the wizard to
get up2date host size reporting.
This commit is contained in:
Cole Robinson 2013-07-07 19:00:57 -04:00
parent 7a2caee6e1
commit 0ee5ddbf54
3 changed files with 4 additions and 38 deletions

View File

@ -80,9 +80,6 @@ class vmmAddHardware(vmmGObjectUI):
self.storage_browser = None
# Host space polling
self.host_storage_timer = None
self._dev = None
self.builder.connect_signals({
@ -175,7 +172,6 @@ class vmmAddHardware(vmmGObjectUI):
def close(self, ignore1=None, ignore2=None):
logging.debug("Closing addhw")
self.topwin.hide()
self.remove_timers()
if self.storage_browser:
self.storage_browser.close()
@ -190,14 +186,6 @@ class vmmAddHardware(vmmGObjectUI):
self.storage_browser.cleanup()
self.storage_browser = None
def remove_timers(self):
try:
if self.host_storage_timer:
self.remove_gobject_timeout(self.host_storage_timer)
self.host_storage_timer = None
except:
pass
def is_visible(self):
return self.topwin.get_visible()
@ -433,11 +421,8 @@ class vmmAddHardware(vmmGObjectUI):
# Storage init
label_widget = self.widget("phys-hd-label")
label_widget.set_markup("")
if not self.host_storage_timer:
self.host_storage_timer = self.timeout_add(3 * 1000,
uihelpers.host_space_tick,
self.conn,
label_widget)
uihelpers.update_host_space(self.conn, label_widget)
self.widget("config-storage-create").set_active(True)
self.widget("config-storage-size").set_value(8)
self.widget("config-storage-entry").set_text("")

View File

@ -96,9 +96,6 @@ class vmmCreate(vmmGObjectUI):
# Whether there was an error at dialog startup
self.have_startup_error = False
# Host space polling
self.host_storage_timer = None
# 'Configure before install' window
self.config_window = None
self.config_window_signals = []
@ -161,7 +158,6 @@ class vmmCreate(vmmGObjectUI):
def close(self, ignore1=None, ignore2=None):
logging.debug("Closing new vm wizard")
self.topwin.hide()
self.remove_timers()
if self.config_window:
self.config_window.close()
@ -186,14 +182,6 @@ class vmmCreate(vmmGObjectUI):
self.storage_browser.cleanup()
self.storage_browser = None
def remove_timers(self):
try:
if self.host_storage_timer:
self.remove_gobject_timeout(self.host_storage_timer)
self.host_storage_timer = None
except:
pass
def remove_conn(self):
if not self.conn:
return
@ -397,11 +385,7 @@ class vmmCreate(vmmGObjectUI):
# Storage
label_widget = self.widget("phys-hd-label")
label_widget.set_markup("")
if not self.host_storage_timer:
self.host_storage_timer = self.timeout_add(3 * 1000,
uihelpers.host_space_tick,
self.conn,
label_widget)
uihelpers.update_host_space(self.conn, label_widget)
self.widget("enable-storage").set_active(True)
self.widget("config-storage-create").set_active(True)
self.widget("config-storage-size").set_value(8)

View File

@ -101,12 +101,11 @@ def host_disk_space(conn):
return float(avail / 1024.0 / 1024.0 / 1024.0)
def host_space_tick(conn, widget):
def update_host_space(conn, widget):
try:
max_storage = host_disk_space(conn)
except:
logging.exception("Error determining host disk space")
return 0
def pretty_storage(size):
return "%.1f Gb" % float(size)
@ -116,8 +115,6 @@ def host_space_tick(conn, widget):
hd_label = ("<span color='#484848'>%s</span>" % hd_label)
widget.set_markup(hd_label)
return 1
def check_default_pool_active(topwin, conn):
default_pool = util.get_default_pool(conn)