Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9CF9F10D39 for ; Mon, 1 Jul 2013 21:24:51 +0000 (UTC) Received: (qmail 15795 invoked by uid 500); 1 Jul 2013 21:24:46 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 15551 invoked by uid 500); 1 Jul 2013 21:24:46 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 14951 invoked by uid 99); 1 Jul 2013 21:24:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jul 2013 21:24:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8BC7245C98; Mon, 1 Jul 2013 21:24:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ahuang@apache.org To: commits@cloudstack.apache.org Date: Mon, 01 Jul 2013 21:25:03 -0000 Message-Id: In-Reply-To: <8285f97d386c4bcca721e4a6dbd1e8d9@git.apache.org> References: <8285f97d386c4bcca721e4a6dbd1e8d9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/50] [abbrv] git commit: updated refs/heads/vmsync to f737019 Don't report back resource state to ResourceManagerImpl on adding sec. storage no need to report back to resourceManager since the sc. storage is no longer a directly connected host. Signed-off-by: Prasanna Santhanam Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0dc5b0d2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0dc5b0d2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0dc5b0d2 Branch: refs/heads/vmsync Commit: 0dc5b0d29af13786626e43907894877fdbc708f9 Parents: f1134da Author: Prasanna Santhanam Authored: Wed Jun 26 19:03:24 2013 +0530 Committer: Prasanna Santhanam Committed: Sat Jun 29 13:53:41 2013 +0530 ---------------------------------------------------------------------- .../agent/manager/MockAgentManagerImpl.java | 42 ++++++++------------ .../agent/manager/MockStorageManagerImpl.java | 6 +-- 2 files changed, 18 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0dc5b0d2/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java index 8542de3..69efc83 100755 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java @@ -16,24 +16,6 @@ // under the License. package com.cloud.agent.manager; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.regex.PatternSyntaxException; - -import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; - -import org.apache.log4j.Logger; - import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckHealthCommand; @@ -45,7 +27,6 @@ import com.cloud.agent.api.HostStatsEntry; import com.cloud.agent.api.MaintainAnswer; import com.cloud.agent.api.PingTestCommand; import com.cloud.dc.dao.HostPodDao; -import com.cloud.host.Host; import com.cloud.resource.AgentResourceBase; import com.cloud.resource.AgentRoutingResource; import com.cloud.resource.AgentStorageResource; @@ -62,8 +43,24 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.regex.PatternSyntaxException; + @Component @Local(value = { MockAgentManager.class }) public class MockAgentManagerImpl extends ManagerBase implements MockAgentManager { @@ -195,9 +192,6 @@ public class MockAgentManagerImpl extends ManagerBase implements MockAgentManage random = SecureRandom.getInstance("SHA1PRNG"); _executor = new ThreadPoolExecutor(1, 5, 1, TimeUnit.DAYS, new LinkedBlockingQueue(), new NamedThreadFactory("Simulator-Agent-Mgr")); - // ComponentLocator locator = ComponentLocator.getCurrentLocator(); - // _simulatorMgr = (SimulatorManager) - // locator.getComponent(SimulatorManager.Name); } catch (NoSuchAlgorithmException e) { s_logger.debug("Failed to initialize random:" + e.toString()); return false; @@ -330,10 +324,6 @@ public class MockAgentManagerImpl extends ManagerBase implements MockAgentManage details.put("guid", this.guid); storageResource.configure("secondaryStorage", params); storageResource.start(); - // on the simulator the ssvm is as good as a direct - // agent - _resourceMgr.addHost(mockHost.getDataCenterId(), storageResource, Host.Type.SecondaryStorageVM, - details); _resources.put(this.guid, storageResource); } catch (ConfigurationException e) { s_logger.debug("Failed to load secondary storage resource: " + e.toString()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0dc5b0d2/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java index bc5aa58..c81f079 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java @@ -889,13 +889,12 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa @Override public void preinstallTemplates(String url, long zoneId) { MockSecStorageVO storage = null; - Transaction txn = Transaction.open(Transaction.SIMULATOR_DB); try { storage = _mockSecStorageDao.findByUrl(url); } catch (Exception ex) { throw new CloudRuntimeException("Unable to find sec storage at " + url, ex); } finally { - txn = Transaction.open(Transaction.CLOUD_DB); + Transaction txn = Transaction.open(Transaction.CLOUD_DB); txn.close(); } if (storage == null) { @@ -916,7 +915,7 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa storage.setCapacity(DEFAULT_HOST_STORAGE_SIZE); storage.setMountPoint(dir); - txn = Transaction.open(Transaction.SIMULATOR_DB); + Transaction txn = Transaction.open(Transaction.SIMULATOR_DB); try { txn.start(); storage = _mockSecStorageDao.persist(storage); @@ -974,7 +973,6 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa txn.close(); } } - } @Override