From 48eebe8e7acb2c79d94b3463899138615988f032 Mon Sep 17 00:00:00 2001
From: Abhinandan Prateek <aprateek@cloud.com>
Date: Wed, 20 Apr 2011 16:37:12 +0530
Subject: [PATCH] bug 9503: race condition in taking ownership of a Host when a
 Management server is restarted

status 9503: resolved fixed
---
 .../src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java  | 2 +-
 server/src/com/cloud/storage/StorageManagerImpl.java            | 2 +-
 .../src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java   | 2 +-
 server/src/com/cloud/storage/upload/UploadMonitorImpl.java      | 2 +-
 server/src/com/cloud/vm/VirtualMachineManagerImpl.java          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index 1187e7559c2..d70bda6f865 100644
--- a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -91,7 +91,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
 	}
 	
 	private void runDirectAgentScanTimerTask() {
-		GlobalLock scanLock = GlobalLock.getInternLock(this.getClass().getName());
+		GlobalLock scanLock = GlobalLock.getInternLock("clustermgr.scan");
 		try {
 			if(scanLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION)) {
 				try {
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 72500233241..80bf7678351 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1804,7 +1804,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
 
     @Override
     public void cleanupStorage(boolean recurring) {
-        GlobalLock scanLock = GlobalLock.getInternLock(this.getClass().getName());
+        GlobalLock scanLock = GlobalLock.getInternLock("storagemgr.cleanup");
 
         try {
             if (scanLock.lock(3)) {
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
index a1d205462c8..e8e6e2d81c9 100644
--- a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
@@ -108,7 +108,7 @@ public class SnapshotSchedulerImpl implements SnapshotScheduler {
         // We don't maintain the time. The timer task does.
         _currentTimestamp = currentTimestamp;
         
-        GlobalLock scanLock = GlobalLock.getInternLock(this.getClass().getName());
+        GlobalLock scanLock = GlobalLock.getInternLock("snapshot.poll");
         try {
             if(scanLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION)) {
                 try {
diff --git a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
index b02aec8bf33..5593e6cfc2b 100755
--- a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
+++ b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
@@ -405,7 +405,7 @@ public class UploadMonitorImpl implements UploadMonitor {
             try {
                 s_logger.info("Extract Monitor Garbage Collection Thread is running.");
 
-                GlobalLock scanLock = GlobalLock.getInternLock(this.getClass().getName());
+                GlobalLock scanLock = GlobalLock.getInternLock("uploadmonitor.storageGC");
                 try {
                     if (scanLock.lock(3)) {
                         try {
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 5304b5b5ee1..916311110e0 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1124,7 +1124,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
 
     
     protected void cancelWorkItems(long nodeId) {
-        GlobalLock scanLock = GlobalLock.getInternLock(this.getClass().getName());
+        GlobalLock scanLock = GlobalLock.getInternLock("vmmgr.cancel.workitem");
 
         try {
             if (scanLock.lock(3)) {