summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2012-03-12 21:49:11 +0000
committerAlex Meade <alex.meade@rackspace.com>2012-03-12 21:50:15 +0000
commit00592cfa0b90c66682be2bc31428277c35a35c48 (patch)
treea69a2bce587397d9970bee77ef16f7ef83cecccf /plugins
parente18996253ccde16aaf65866d85d05372b75b3a1f (diff)
downloadnova-00592cfa0b90c66682be2bc31428277c35a35c48.tar.gz
nova-00592cfa0b90c66682be2bc31428277c35a35c48.tar.xz
nova-00592cfa0b90c66682be2bc31428277c35a35c48.zip
Use cPickle and not just pickle.
Fixes bug 953423 cPickle is up to 1000 times faster than pickle. We should use it instead. Change-Id: I1facbdcf60d88c9fba56687abf75524498d2502e
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/xenserver/xenapi/etc/xapi.d/plugins/glance2
-rwxr-xr-xplugins/xenserver/xenapi/etc/xapi.d/plugins/migration2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
index 95fe54524..0020ad5bd 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -21,6 +21,7 @@
# XenAPI plugin for managing glance images
#
+import cPickle as pickle
import httplib
try:
import json
@@ -30,7 +31,6 @@ except ImportError:
import md5
import os
import os.path
-import pickle
import shlex
import shutil
import subprocess
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
index c9e350259..1e1fe0f5e 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
@@ -19,9 +19,9 @@
XenAPI Plugin for transfering data between host nodes
"""
+import cPickle as pickle
import os
import os.path
-import pickle
import shlex
import shutil
import subprocess