You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/08/09 08:59:41 UTC
git commit: updated refs/heads/4.2 to dacc4e1
Updated Branches:
refs/heads/4.2 653e2e54a -> dacc4e1a4
CLOUDSTACK-2729: increase waiting timeout for global file lock to 300 seconds
(cherry picked from commit 6d86af85baa57bb20ec9642cbd1cd82c002dcfef)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dacc4e1a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dacc4e1a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dacc4e1a
Branch: refs/heads/4.2
Commit: dacc4e1a4f7dc3763f16acc2cddd936fdc2fbd42
Parents: 653e2e5
Author: Wei Zhou <w....@leaseweb.com>
Authored: Fri Aug 9 08:58:46 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Fri Aug 9 08:59:34 2013 +0200
----------------------------------------------------------------------
.../com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dacc4e1a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index 8993094..8147e58 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -73,6 +73,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
private String _mountPoint = "/mnt";
private String _manageSnapshotPath;
private String _lockfile = "KVMFILELOCK" + File.separator + ".lock";
+ private static final int ACQUIRE_GLOBAL_FILELOCK_TIMEOUT_FOR_KVM = 300; // 300 seconds
private String rbdTemplateSnapName = "cloudstack-base-snap";
private int rbdFeatures = (1<<0); /* Feature 1<<0 means layering in RBD format 2 */
@@ -1175,7 +1176,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
}
String lockFile = spd.getTargetPath() + File.separator + _lockfile;
s_logger.debug("Attempting to lock pool " + pool.getName() + " with file " + lockFile);
- if (lock(lockFile, 30)) {
+ if (lock(lockFile, ACQUIRE_GLOBAL_FILELOCK_TIMEOUT_FOR_KVM)) {
try {
pool.refresh(0);
} finally {
@@ -1195,7 +1196,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
}
String lockFile = pool.getLocalPath() + File.separator + _lockfile;
s_logger.debug("Attempting to lock pool " + pool.getName() + " with file " + lockFile);
- if (lock(lockFile, 30)) {
+ if (lock(lockFile, ACQUIRE_GLOBAL_FILELOCK_TIMEOUT_FOR_KVM)) {
try {
vol.delete(0);
} finally {