From 66645ec478247320d6b4adabd6a2cf9658a14568 Mon Sep 17 00:00:00 2001 From: frank Date: Thu, 10 Nov 2011 17:05:11 -0800 Subject: [PATCH] Bug 11933 - Unable to add Primary Storage (OCFS2) to a OVM Cluster Don't allow character beyond [A-Z0-9] in OCFS2 cluster name it is not allowed by OCFS2 configure script reviewed-by: edison --- ovm/scripts/vm/hypervisor/ovm/OvmOCFS2Module.py | 6 ++++-- ovm/scripts/vm/hypervisor/ovm/OvmStoragePoolModule.py | 3 ++- server/src/com/cloud/storage/OCFS2ManagerImpl.java | 6 +----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ovm/scripts/vm/hypervisor/ovm/OvmOCFS2Module.py b/ovm/scripts/vm/hypervisor/ovm/OvmOCFS2Module.py index ea2edd801da..9de46c9acf5 100755 --- a/ovm/scripts/vm/hypervisor/ovm/OvmOCFS2Module.py +++ b/ovm/scripts/vm/hypervisor/ovm/OvmOCFS2Module.py @@ -40,11 +40,13 @@ class OvmOCFS2(OvmObject): for line in res.split('\n'): if not 'Checking O2CB cluster' in line: continue return not 'Offline' in line + + def _load(self): + cmd = ['service o2cb load'] + doCmd(cmd) def _start(self, cluster): #blank line are answer by clicking enter - cmd = ['service o2cb load'] - doCmd(cmd) config=''' y o2cb diff --git a/ovm/scripts/vm/hypervisor/ovm/OvmStoragePoolModule.py b/ovm/scripts/vm/hypervisor/ovm/OvmStoragePoolModule.py index ea6f8e08ddd..06cf38054ee 100755 --- a/ovm/scripts/vm/hypervisor/ovm/OvmStoragePoolModule.py +++ b/ovm/scripts/vm/hypervisor/ovm/OvmStoragePoolModule.py @@ -247,10 +247,11 @@ class OvmStoragePool(OvmObject): def addNodes(nodes, clusterName): ocfs2 = OvmOCFS2() + ocfs2._load() isOnline = ocfs2._isClusterOnline(clusterName) if not isOnline: ocfs2._prepareConf(clusterName) - + for n in nodes: ocfs2._addNode(n['name'], n['number'], n['ip_address'], 7777, clusterName, isOnline) diff --git a/server/src/com/cloud/storage/OCFS2ManagerImpl.java b/server/src/com/cloud/storage/OCFS2ManagerImpl.java index 82ad8623d6c..4220c30714f 100755 --- a/server/src/com/cloud/storage/OCFS2ManagerImpl.java +++ b/server/src/com/cloud/storage/OCFS2ManagerImpl.java @@ -108,11 +108,7 @@ public class OCFS2ManagerImpl implements OCFS2Manager, ResourceListener { throw new CloudRuntimeException("Cannot get cluster for id " + clusterId); } - String clusterName = cluster.getName(); - if (clusterName == null) { - clusterName = "cluster" + cluster.getId(); - } - + String clusterName = "OvmCluster" + cluster.getId(); return clusterName; }