You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/12/13 13:37:34 UTC
git commit: updated refs/heads/master to 1cc68ae
Updated Branches:
refs/heads/master b54ac9a63 -> 1cc68ae6c
The python module perfmon is not installed by default on XenServer, so be carefull about importing it without checks
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1cc68ae6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1cc68ae6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1cc68ae6
Branch: refs/heads/master
Commit: 1cc68ae6c6e94c7d491cc7f0da6c93ac3037a26e
Parents: b54ac9a
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Dec 13 13:36:22 2013 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Dec 13 13:36:22 2013 +0100
----------------------------------------------------------------------
scripts/vm/hypervisor/xenserver/vmopspremium | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1cc68ae6/scripts/vm/hypervisor/xenserver/vmopspremium
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmopspremium b/scripts/vm/hypervisor/xenserver/vmopspremium
index 143aa92..06b0a51 100755
--- a/scripts/vm/hypervisor/xenserver/vmopspremium
+++ b/scripts/vm/hypervisor/xenserver/vmopspremium
@@ -28,7 +28,6 @@ if os.path.exists("/usr/lib/xcp/sm"):
sys.path.extend(["/usr/lib/xcp/sm/", "/usr/local/sbin/", "/sbin/"])
import util
import socket
-import perfmon
import cloudstack_pluginlib as lib
import logging
@@ -149,8 +148,12 @@ def heartbeat(session, args):
@echo
def asmonitor(session, args):
- result = perfmon.get_vm_group_perfmon(args)
- return result
+ try:
+ perfmod = __import__("perfmon")
+ result = perfmod.get_vm_group_perfmon(args)
+ return result
+ except:
+ return 'fail'
if __name__ == "__main__":
XenAPIPlugin.dispatch({"forceShutdownVM":forceShutdownVM, "upgrade_snapshot":upgrade_snapshot, "create_privatetemplate_from_snapshot":create_privatetemplate_from_snapshot, "copy_vhd_to_secondarystorage":copy_vhd_to_secondarystorage, "copy_vhd_from_secondarystorage":copy_vhd_from_secondarystorage, "setup_heartbeat_sr":setup_heartbeat_sr, "setup_heartbeat_file":setup_heartbeat_file, "check_heartbeat":check_heartbeat, "heartbeat": heartbeat, "asmonitor": asmonitor})