Merge pull request #495 from MalloZup/no-mutex

Remove mutex before poolRefresh
dmacvicar · Dec 9, 2018 · d5e60df · d5e60df
2 parents 2ad0228 + 004f229
commit d5e60df
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 23 deletions.
diff --git a/libvirt/cloudinit_def.go b/libvirt/cloudinit_def.go
@@ -60,9 +60,6 @@ func (ci *defCloudInit) UploadIso(client *Client, iso string) (string, error) {
 	}
 	defer pool.Free()
 
-	client.poolMutexKV.Lock(ci.PoolName)
-	defer client.poolMutexKV.Unlock(ci.PoolName)
-
 	// Refresh the pool of the volume so that libvirt knows it is
 	// not longer in use.
 	waitForSuccess("Error refreshing pool for volume", func() error {

diff --git a/libvirt/config.go b/libvirt/config.go
@@ -1,9 +1,9 @@
 package libvirt
 
 import (
-	"github.com/hashicorp/terraform/helper/mutexkv"
-	libvirt "github.com/libvirt/libvirt-go"
 	"log"
+
+	libvirt "github.com/libvirt/libvirt-go"
 )
 
 // Config struct for the libvirt-provider
@@ -13,8 +13,7 @@ type Config struct {
 
 // Client libvirt
 type Client struct {
-	libvirt     *libvirt.Connect
-	poolMutexKV *mutexkv.MutexKV
+	libvirt *libvirt.Connect
 }
 
 // Client libvirt, generate libvirt client given URI
@@ -26,8 +25,7 @@ func (c *Config) Client() (*Client, error) {
 	log.Println("[INFO] Created libvirt client")
 
 	client := &Client{
-		libvirt:     libvirtClient,
-		poolMutexKV: mutexkv.NewMutexKV(),
+		libvirt: libvirtClient,
 	}
 
 	return client, nil

diff --git a/libvirt/coreos_ignition_def.go b/libvirt/coreos_ignition_def.go
@@ -38,9 +38,6 @@ func (ign *defIgnition) CreateAndUpload(client *Client) (string, error) {
 	}
 	defer pool.Free()
 
-	client.poolMutexKV.Lock(ign.PoolName)
-	defer client.poolMutexKV.Unlock(ign.PoolName)
-
 	// Refresh the pool of the volume so that libvirt knows it is
 	// not longer in use.
 	waitForSuccess("Error refreshing pool for volume", func() error {

diff --git a/libvirt/resource_libvirt_volume.go b/libvirt/resource_libvirt_volume.go
@@ -91,9 +91,6 @@ func resourceLibvirtVolumeCreate(d *schema.ResourceData, meta interface{}) error
 		poolName = d.Get("pool").(string)
 	}
 
-	client.poolMutexKV.Lock(poolName)
-	defer client.poolMutexKV.Unlock(poolName)
-
 	pool, err := client.libvirt.LookupStoragePoolByName(poolName)
 	if err != nil {
 		return fmt.Errorf("can't find storage pool '%s'", poolName)

diff --git a/libvirt/utils_volume.go b/libvirt/utils_volume.go
@@ -294,14 +294,6 @@ func removeVolume(client *Client, key string) error {
 	}
 	defer volPool.Free()
 
-	poolName, err := volPool.GetName()
-	if err != nil {
-		return fmt.Errorf("Error retrieving name of volume: %s", err)
-	}
-
-	client.poolMutexKV.Lock(poolName)
-	defer client.poolMutexKV.Unlock(poolName)
-
 	waitForSuccess("Error refreshing pool for volume", func() error {
 		return volPool.Refresh(0)
 	})