Merge lp:~use/nova/shared-storage into lp:~hudson-openstack/nova/trunk

[USE Team]

The current openstack+glance+xenserver environment is not (HBA) shared storage friendly. We can get around this for Linux by (mis-)labelling the HBA LUN local-storage. Unfortunately this does not work for Windows images as they are uploaded in VHD format and XenServer expects them to be VDIs.

This adds a parameter 'staging_path', to the upload_vhd xenapi call which causes the VHD to be loaded into an NFS share that has been labelled 'other-config:i18n-key=scratchnfs_storage', and uses the internal VDI.copy to transfer it to the HBA LUN labelled as local-storage.

This functionality leaves everything else the same, unless there is a share with the scratchnfs_storage label.

[Christopher MacGown (0x44)]

LGTM, but you need to add yourself to AUTHORS.

review: Needs Fixing

[lp:~use/nova/shared-storage]

1493. By USE Team on 2011-08-29

Added myself to Authors file

1494. By USE Team on 2011-08-30

Removed Infospace Copyright

Unmerged revisions

1494. By USE Team on 2011-08-30

Removed Infospace Copyright

1493. By USE Team on 2011-08-29

Added myself to Authors file

1492. By USE Team on 2011-08-25

Cleaned up variable names

1491. By USE Team on 2011-08-24

Provide option to load Windows VHD into a shared storage LUN for a XenServer cluster.

=== modified file 'Authors'
--- Authors	2011-08-26 02:18:46 +0000
+++ Authors	2011-08-29 15:11:24 +0000
@@ -59,6 +59,7 @@
 Joshua McKenty <[e-mail]>
 Justin Santa Barbara <[e-mail]>
 Justin Shepherd <[e-mail]>
+Jeff Williams <[e-mail]>
 Kei Masumoto <[e-mail]>
 masumoto<[e-mail]>
 Ken Pepple <[e-mail]>

=== modified file 'nova/virt/xenapi/vm_utils.py'
--- nova/virt/xenapi/vm_utils.py	2011-08-23 05:17:51 +0000
+++ nova/virt/xenapi/vm_utils.py	2011-08-29 15:11:24 +0000
@@ -2,6 +2,7 @@
 
 # Copyright (c) 2010 Citrix Systems, Inc.
 # Copyright 2011 Piston Cloud Computing, Inc.
+# Copyright (c) 2011 Infospace, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -372,6 +373,18 @@
         return os.path.join(FLAGS.xenapi_sr_base_path, sr_uuid)
 
     @classmethod
+    def get_staging_path(cls, session):
+        """Return the path to our storage repository
+
+        This is used when we're dealing with VHDs directly, either by taking
+        snapshots or by restoring an image in the DISK_VHD format.
+        """
+        sr_ref = safe_find_scratchnfs_sr(session)
+        sr_rec = session.get_xenapi().SR.get_record(sr_ref)
+        sr_uuid = sr_rec["uuid"]
+        return os.path.join(FLAGS.xenapi_sr_base_path, sr_uuid)
+
+    @classmethod
     def upload_image(cls, context, session, instance, vdi_uuids, image_id):
         """ Requests that the Glance plugin bundle the specified VDIs and
         push them into Glance using the specified human-friendly name.
@@ -454,6 +467,7 @@
                   'glance_port': glance_port,
                   'uuid_stack': uuid_stack,
                   'sr_path': cls.get_sr_path(session),
+                  'staging_path': cls.get_staging_path(session),
                   'auth_token': getattr(context, 'auth_token', None)}
 
         kwargs = {'params': pickle.dumps(params)}
@@ -950,6 +964,34 @@
     return None
 
 
+def safe_find_scratchnfs_sr(session):
+    """Same as find_sr except raises a NotFound exception if SR cannot be
+    determined
+    """
+    sr_ref = find_scratchnfs_sr(session)
+    if sr_ref is None:
+	sr_ref = find_sr(session)
+    if sr_ref is None:
+        raise exception.StorageRepositoryNotFound()
+    return sr_ref
+
+
+def find_scratchnfs_sr(session):
+    """Return the storage repository to hold VM images"""
+    host = session.get_xenapi_host()
+    sr_refs = session.get_xenapi().SR.get_all()
+    for sr_ref in sr_refs:
+        sr_rec = session.get_xenapi().SR.get_record(sr_ref)
+        if not ('i18n-key' in sr_rec['other_config'] and
+                sr_rec['other_config']['i18n-key'] == 'scratchnfs-storage'):
+            continue
+        for pbd_ref in sr_rec['PBDs']:
+            pbd_rec = session.get_xenapi().PBD.get_record(pbd_ref)
+            if pbd_rec['host'] == host:
+                return sr_ref
+    return None
+
+
 def safe_find_iso_sr(session):
     """Same as find_iso_sr except raises a NotFound exception if SR cannot be
     determined

=== modified file 'plugins/xenserver/xenapi/etc/xapi.d/plugins/glance'
--- plugins/xenserver/xenapi/etc/xapi.d/plugins/glance	2011-08-05 00:12:19 +0000
+++ plugins/xenserver/xenapi/etc/xapi.d/plugins/glance	2011-08-29 15:11:24 +0000
@@ -3,6 +3,7 @@
 # Copyright (c) 2010 Citrix Systems, Inc.
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
+# Copyright (c) 2011 Infospace, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -96,7 +97,7 @@
     conn.close()
 
 
-def _import_vhds(sr_path, staging_path, uuid_stack):
+def _import_vhds(session, sr_path, staging_sr_path, staging_path, uuid_stack):
     """Import the VHDs found in the staging path.
 
     We cannot extract VHDs directly into the SR since they don't yet have
@@ -158,6 +159,35 @@
         os.rename(orig_path, new_path)
         return new_path
 
+    def move_into_lvmsr(orig_path):
+	"""
+	This will move a VHD from a local or NFS SR labeled with scratchnfs-storage to a shared
+	HBA LUN, using the built in VDI.copy functionality.
+	"""
+
+	""" Move from our tar extraction tmp directory, into the SR root directory """
+	vdi_file = os.path.basename(orig_path)
+	vdi_uuid = os.path.splitext(vdi_file)[0]
+        new_path = os.path.join(staging_sr_path, vdi_file)
+	os.rename(orig_path, new_path)
+
+	""" Force rescan to find new VHD """
+	vhd_sr_uuid = os.path.basename(staging_sr_path)
+	sr_ref = session.xenapi.SR.get_by_uuid(vhd_sr_uuid)
+	session.xenapi.SR.scan(sr_ref)
+
+	""" Convert VHD on scratchnfs to VDI on shared LUN """
+	dest_sr_uuid = os.path.basename(sr_path)
+	dest_sr_ref = session.xenapi.SR.get_by_uuid(dest_sr_uuid)
+	src_vdi_ref = session.xenapi.VDI.get_by_uuid(vdi_uuid)
+	dest_vdi_ref = session.xenapi.VDI.copy(src_vdi_ref, dest_sr_ref)	
+
+	""" Cleanup """
+	os.remove(new_path);
+	session.xenapi.SR.scan(sr_ref)
+
+	return session.xenapi.VDI.get_uuid(dest_vdi_ref)
+
     def assert_vhd_not_hidden(path):
         """
         This is a sanity check on the image; if a snap.vhd isn't
@@ -214,10 +244,12 @@
         paths_to_move.append(snap_info[0])
         # We return this snap as the VDI instead of image.vhd
         vdi_return_list.append(dict(vdi_type="os", vdi_uuid=snap_info[1]))
+
     else:
-        assert_vhd_not_hidden(image_info[0])
-        # If there's no snap, we return the image.vhd UUID
-        vdi_return_list.append(dict(vdi_type="os", vdi_uuid=image_info[1]))
+	if sr_path == staging_sr_path:
+            assert_vhd_not_hidden(image_info[0])
+            # If there's no snap, we return the image.vhd UUID
+            vdi_return_list.append(dict(vdi_type="os", vdi_uuid=image_info[1]))
 
     swap_info = prepare_if_exists(staging_path, 'swap.vhd')
     if swap_info:
@@ -226,7 +258,10 @@
         vdi_return_list.append(dict(vdi_type="swap", vdi_uuid=swap_info[1]))
 
     for path in paths_to_move:
-        move_into_sr(path)
+	if sr_path != staging_sr_path:
+	    vdi_return_list.append(dict(vdi_type="os", vdi_uuid=move_into_lvmsr(path)))
+	else:
+	    move_into_sr(path)
 
     return vdi_return_list
 
@@ -392,15 +427,20 @@
     glance_port = params["glance_port"]
     uuid_stack = params["uuid_stack"]
     sr_path = params["sr_path"]
+    staging_sr_path = params["staging_path"]
     auth_token = params["auth_token"]
 
-    staging_path = _make_staging_area(sr_path)
+    if staging_sr_path == sr_path:
+        staging_path = _make_staging_area(sr_path)
+    else:
+	staging_path = _make_staging_area(staging_sr_path)
+
     try:
         _download_tarball(sr_path, staging_path, image_id, glance_host,
                           glance_port, auth_token)
         # Right now, it's easier to return a single string via XenAPI,
         # so we'll json encode the list of VHDs.
-        return json.dumps(_import_vhds(sr_path, staging_path, uuid_stack))
+        return json.dumps(_import_vhds(session, sr_path, staging_sr_path, staging_path, uuid_stack))
     finally:
         _cleanup_staging_area(staging_path)