Bug 8966 - Oracle VM (OVM) support

frank-zhang · frank-zhang · commit c6fba0fd42b4 · 2011-08-05T17:46:29.000-07:00
OCFS2 support -- prepare OCFS2 nodes
diff --git a/api/src/com/cloud/storage/Storage.java b/api/src/com/cloud/storage/Storage.java
@@ -96,7 +96,8 @@ public static enum StoragePoolType {
         LVM(false),    // XenServer local LVM SR
         SharedMountPoint(true),
         VMFS(true),		// VMware VMFS storage
-        PreSetup(true);  // for XenServer, Storage Pool is set up by customers. 
+        PreSetup(true),  // for XenServer, Storage Pool is set up by customers. 
+        OCFS2(true);
         
         
         boolean shared;
diff --git a/core/src/com/cloud/agent/Listener.java b/core/src/com/cloud/agent/Listener.java
@@ -89,7 +89,7 @@ public interface Listener {
      * @param state the current state of the agent.
      */
     boolean processDisconnect(long agentId, Status state);
-    
+        
     /**
      * If this Listener is passed to the send() method, this method
      * is called by AgentManager after processing an answer
diff --git a/server/src/com/cloud/capacity/ComputeCapacityListener.java b/server/src/com/cloud/capacity/ComputeCapacityListener.java
diff --git a/server/src/com/cloud/capacity/StorageCapacityListener.java b/server/src/com/cloud/capacity/StorageCapacityListener.java
diff --git a/server/src/com/cloud/cluster/ClusterAsyncExectuionListener.java b/server/src/com/cloud/cluster/ClusterAsyncExectuionListener.java
@@ -76,6 +76,5 @@ public boolean processTimeout(long agentId, long seq) {
     public int getTimeout() {
     	return -1;
     }
-    
 }
 
diff --git a/server/src/com/cloud/configuration/DefaultComponentLibrary.java b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
@@ -105,6 +105,7 @@
 import com.cloud.network.vpn.RemoteAccessVpnManagerImpl;
 import com.cloud.offerings.dao.NetworkOfferingDaoImpl;
 import com.cloud.service.dao.ServiceOfferingDaoImpl;
+import com.cloud.storage.OCFS2ManagerImpl;
 import com.cloud.storage.StorageManagerImpl;
 import com.cloud.storage.dao.DiskOfferingDaoImpl;
 import com.cloud.storage.dao.GuestOSCategoryDaoImpl;
@@ -319,6 +320,7 @@ protected void populateManagers() {
         addManager("VirtualMachineManager", ClusteredVirtualMachineManagerImpl.class);
         addManager("HypervisorGuruManager", HypervisorGuruManagerImpl.class);
         addManager("ClusterFenceManager", ClusterFenceManagerImpl.class);
+        addManager("OCFS2Manager", OCFS2ManagerImpl.class);
         
         ComponentInfo<? extends Manager> info = addManager("ConsoleProxyManager", ConsoleProxyManagerImpl.class);
         info.addParameter("consoleproxy.sslEnabled", "true");
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyListener.java b/server/src/com/cloud/consoleproxy/ConsoleProxyListener.java
diff --git a/server/src/com/cloud/dc/ClusterDetailsDaoImpl.java b/server/src/com/cloud/dc/ClusterDetailsDaoImpl.java
@@ -53,6 +53,7 @@ public ClusterDetailsVO findDetail(long clusterId, String name) {
         
         return findOneIncludingRemovedBy(sc);
     }
+    
 
     @Override
     public Map<String, String> findDetails(long clusterId) {
diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -575,6 +575,5 @@ public boolean processDisconnect(long agentId, Status state) {
     @Override
     public boolean processTimeout(long agentId, long seq) {
         return false;
-    }
-    
+    }    
 }
diff --git a/server/src/com/cloud/network/SshKeysDistriMonitor.java b/server/src/com/cloud/network/SshKeysDistriMonitor.java
diff --git a/server/src/com/cloud/network/ovs/OvsListener.java b/server/src/com/cloud/network/ovs/OvsListener.java
@@ -181,5 +181,4 @@ public int getTimeout() {
 	public boolean processTimeout(long agentId, long seq) {
 		return true;
 	}
-
 }
diff --git a/server/src/com/cloud/network/ovs/OvsTunnelListener.java b/server/src/com/cloud/network/ovs/OvsTunnelListener.java
@@ -130,5 +130,4 @@ public boolean processTimeout(long agentId, long seq) {
 		// TODO Auto-generated method stub
 		return true;
 	}
-
 }
diff --git a/server/src/com/cloud/network/security/SecurityGroupListener.java b/server/src/com/cloud/network/security/SecurityGroupListener.java
@@ -152,5 +152,4 @@ public boolean processDisconnect(long agentId, Status state) {
 	public boolean processTimeout(long agentId, long seq) {
 		return true;
 	}
-
 }
diff --git a/server/src/com/cloud/storage/LocalStoragePoolListener.java b/server/src/com/cloud/storage/LocalStoragePoolListener.java
@@ -134,5 +134,4 @@ public boolean processDisconnect(long agentId, Status state) {
     public boolean processTimeout(long agentId, long seq) {
         return false;
     }
-
 }
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -279,6 +279,9 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
     protected StoragePoolWorkDao _storagePoolWorkDao;
     @Inject
     protected HypervisorGuruManager _hvGuruMgr;
+    
+    @Inject
+    protected OCFS2Manager _ocfs2Mgr;
 
     @Inject(adapter = StoragePoolAllocator.class)
     protected Adapters<StoragePoolAllocator> _storagePoolAllocators;
@@ -1109,6 +1112,9 @@ public StoragePoolVO createPool(CreateStoragePoolCmd cmd) throws ResourceInUseEx
             pool = new StoragePoolVO(StoragePoolType.ISO, storageHost, port, hostPath);
         } else if (scheme.equalsIgnoreCase("vmfs")) {
             pool = new StoragePoolVO(StoragePoolType.VMFS, "VMFS datastore: " + hostPath, 0, hostPath);
+        } else if (scheme.equalsIgnoreCase("ocfs2")) {
+            port = 7777;
+            pool = new StoragePoolVO(StoragePoolType.OCFS2, "clustered", port, hostPath);
         } else {
             s_logger.warn("Unable to figure out the scheme for URI: " + uri);
             throw new IllegalArgumentException("Unable to figure out the scheme for URI: " + uri);
@@ -1156,6 +1162,12 @@ public StoragePoolVO createPool(CreateStoragePoolCmd cmd) throws ResourceInUseEx
         pool.setStatus(StoragePoolStatus.Up);
         pool = _storagePoolDao.persist(pool, details);
 
+        if (pool.getPoolType() == StoragePoolType.OCFS2 && !_ocfs2Mgr.prepareNodes(allHosts, pool, cmd.getFullUrlParams())) {
+            s_logger.warn("Can not create storage pool " + pool + " on cluster " + clusterId);
+            _storagePoolDao.expunge(pool.getId());
+            return null;
+        }
+            
         boolean success = false;
         for (HostVO h : allHosts) {
             success = createStoragePool(h.getId(), pool);
@@ -1348,7 +1360,7 @@ public boolean createStoragePool(long hostId, StoragePoolVO pool) {
         s_logger.debug("creating pool " + pool.getName() + " on  host " + hostId);
         if (pool.getPoolType() != StoragePoolType.NetworkFilesystem && pool.getPoolType() != StoragePoolType.Filesystem && pool.getPoolType() != StoragePoolType.IscsiLUN
                 && pool.getPoolType() != StoragePoolType.Iscsi && pool.getPoolType() != StoragePoolType.VMFS && pool.getPoolType() != StoragePoolType.SharedMountPoint
-                && pool.getPoolType() != StoragePoolType.PreSetup) {
+                && pool.getPoolType() != StoragePoolType.PreSetup && pool.getPoolType() != StoragePoolType.OCFS2) {
             s_logger.warn(" Doesn't support storage pool type " + pool.getPoolType());
             return false;
         }
diff --git a/server/src/com/cloud/storage/download/DownloadListener.java b/server/src/com/cloud/storage/download/DownloadListener.java
diff --git a/server/src/com/cloud/storage/listener/StoragePoolMonitor.java b/server/src/com/cloud/storage/listener/StoragePoolMonitor.java
@@ -32,14 +32,18 @@
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.storage.OCFS2Manager;
 import com.cloud.storage.StorageManagerImpl;
 import com.cloud.storage.StoragePoolVO;
+import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.storage.dao.StoragePoolDao;
+import com.cloud.utils.component.Inject;
 
 public class StoragePoolMonitor implements Listener {
     private static final Logger s_logger = Logger.getLogger(StoragePoolMonitor.class);
 	private final StorageManagerImpl _storageManager;
 	private final StoragePoolDao _poolDao;
+	@Inject OCFS2Manager _ocfs2Mgr;
 	
     public StoragePoolMonitor(StorageManagerImpl mgr, StoragePoolDao poolDao) {
     	this._storageManager = mgr;
@@ -73,6 +77,11 @@ public void processConnect(HostVO host, StartupCommand cmd) throws ConnectionExc
     			    if (!pool.getPoolType().isShared()) {
     			        continue;
     			    }
+    			    
+    			    if (pool.getPoolType() == StoragePoolType.OCFS2 && !_ocfs2Mgr.prepareNodes(pool.getClusterId())) {
+    			        throw new ConnectionException(true, "Unable to prepare OCFS2 nodes for pool " + pool.getId());
+    			    }
+    			    
     				Long hostId = host.getId();
     				s_logger.debug("Host " + hostId + " connected, sending down storage pool information ...");
     				try {
diff --git a/server/src/com/cloud/storage/listener/StorageSyncListener.java b/server/src/com/cloud/storage/listener/StorageSyncListener.java
@@ -79,6 +79,5 @@ public boolean processTimeout(long agentId, long seq) {
     @Override
     public int getTimeout() {
     	return -1;
-    }
-    
+    }    
 }
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageListener.java b/server/src/com/cloud/storage/secondary/SecondaryStorageListener.java
diff --git a/server/src/com/cloud/storage/upload/UploadListener.java b/server/src/com/cloud/storage/upload/UploadListener.java
@@ -446,5 +446,4 @@ public void scheduleImmediateStatusCheck(RequestType request) {
 	public void setCurrState(Status uploadState) {
 		this.currState = getState(currState.toString());		
 	}
-	
 }

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,5 @@ public boolean processTimeout(long agentId, long seq) {`
`76`	`76`	`public int getTimeout() {`
`77`	`77`	`return -1;`
`78`	`78`	`}`
`79`		`-`
`80`	`79`	`}`
`81`	`80`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ public ClusterDetailsVO findDetail(long clusterId, String name) {`
`53`	`53`
`54`	`54`	`return findOneIncludingRemovedBy(sc);`
`55`	`55`	`}`
	`56`	`+`
`56`	`57`
`57`	`58`	`@Override`
`58`	`59`	`public Map<String, String> findDetails(long clusterId) {`
Original file line number	Diff line number	Diff line change
`@@ -575,6 +575,5 @@ public boolean processDisconnect(long agentId, Status state) {`
`575`	`575`	`@Override`
`576`	`576`	`public boolean processTimeout(long agentId, long seq) {`
`577`	`577`	`return false;`
`578`		`- }`
`579`		`-`
	`578`	`+ }`
`580`	`579`	`}`