From: Eric Harney <eharney@redhat.com>
Date: Fri, 10 Jan 2014 19:20:41 +0000 (-0500)
Subject: GlusterFS: Synchronize additional operations
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=06999f6;p=openstack-build%2Fcinder-build.git

GlusterFS: Synchronize additional operations

create_cloned_volume() and copy_volume_to_image() should also be
locked against other driver operations to prevent collisions
from concurrent updates of snapshot metadata or volume file data.

Closes-Bug: #1267983

Change-Id: Idd6158bfbe4dc049c33fa58b40d3d570fc244d01
---

diff --git a/cinder/volume/drivers/glusterfs.py b/cinder/volume/drivers/glusterfs.py
index a7d276211..71ac852a0 100644
--- a/cinder/volume/drivers/glusterfs.py
+++ b/cinder/volume/drivers/glusterfs.py
@@ -154,6 +154,7 @@ class GlusterfsDriver(nfs.RemoteFsDriver):
 
         return snap_info['active']
 
+    @utils.synchronized('glusterfs', external=False)
     def create_cloned_volume(self, volume, src_vref):
         """Creates a clone of the specified volume."""
 
@@ -902,6 +903,7 @@ class GlusterfsDriver(nfs.RemoteFsDriver):
         """Disallow connection from connector."""
         pass
 
+    @utils.synchronized('glusterfs', external=False)
     def copy_volume_to_image(self, context, volume, image_service, image_meta):
         """Copy the volume to the specified image."""