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 51B5017529 for ; Wed, 22 Oct 2014 00:26:13 +0000 (UTC) Received: (qmail 2080 invoked by uid 500); 22 Oct 2014 00:26:13 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 2052 invoked by uid 500); 22 Oct 2014 00:26:13 -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 2042 invoked by uid 99); 22 Oct 2014 00:26:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Oct 2014 00:26:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8AC9C93E877; Wed, 22 Oct 2014 00:26:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anthonyxu@apache.org To: commits@cloudstack.apache.org Date: Wed, 22 Oct 2014 00:26:12 -0000 Message-Id: <6aecb791c5374e2b8f029fe505e88fe9@git.apache.org> In-Reply-To: <77fff09f0ae6413dadb8be38945d0fd3@git.apache.org> References: <77fff09f0ae6413dadb8be38945d0fd3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/4.5 to 0141b37 CLOUDSTACK-7761: Revert "when system VM ping times out, stop system VM" This reverts commit ee23be1942001ab732cfb3ad50fa24163cb88a48. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0141b377 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0141b377 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0141b377 Branch: refs/heads/4.5 Commit: 0141b37784805b1a55bc450affa282897889e9b9 Parents: 8b83417 Author: Anthony Xu Authored: Tue Oct 21 17:11:44 2014 -0700 Committer: Anthony Xu Committed: Tue Oct 21 17:21:17 2014 -0700 ---------------------------------------------------------------------- .../com/cloud/agent/manager/AgentManagerImpl.java | 4 ++-- .../cloud/consoleproxy/ConsoleProxyManagerImpl.java | 1 - .../storage/secondary/SecondaryStorageListener.java | 1 - .../storage/secondary/SecondaryStorageVmManager.java | 3 --- .../SecondaryStorageManagerImpl.java | 15 --------------- 5 files changed, 2 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0141b377/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java index 31ef8be..c6664d9 100755 --- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -775,7 +775,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl } if (s_logger.isDebugEnabled()) { - s_logger.debug("The next status of agent " + hostId + " is " + nextStatus + ", current status is " + currentStatus); + s_logger.debug("The next status of agent " + hostId + "is " + nextStatus + ", current status is " + currentStatus); } } } @@ -1513,7 +1513,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl || host.getType() == Host.Type.SecondaryStorageCmdExecutor)) { s_logger.warn("Disconnect agent for CPVM/SSVM due to physical connection close. host: " + host.getId()); - disconnectWithoutInvestigation(agentId, Event.PingTimeout); + disconnectWithoutInvestigation(agentId, Event.ShutdownRequested); } else { status_logger.debug("Ping timeout for host " + agentId + ", do invstigation"); disconnectWithInvestigation(agentId, Event.PingTimeout); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0141b377/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 825af39..14d782a 100755 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -324,7 +324,6 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy final ConsoleProxyVO proxy = _consoleProxyDao.findById(proxyVmId); if (proxy != null) { - stopProxy(proxyVmId); // Disable this feature for now, as it conflicts // with // the case of allowing user to reboot console proxy http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0141b377/server/src/com/cloud/storage/secondary/SecondaryStorageListener.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageListener.java b/server/src/com/cloud/storage/secondary/SecondaryStorageListener.java index 81a4240..43613e7 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageListener.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageListener.java @@ -88,7 +88,6 @@ public class SecondaryStorageListener implements Listener { @Override public boolean processDisconnect(long agentId, Status state) { - _ssVmMgr.onAgentDisconnect(agentId, state); return true; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0141b377/server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java b/server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java index f2f5aa0..3b32c85 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java @@ -21,7 +21,6 @@ import java.util.List; import com.cloud.agent.api.Command; import com.cloud.agent.api.StartupCommand; import com.cloud.host.HostVO; -import com.cloud.host.Status; import com.cloud.utils.Pair; import com.cloud.utils.component.Manager; import com.cloud.vm.SecondaryStorageVmVO; @@ -46,8 +45,6 @@ public interface SecondaryStorageVmManager extends Manager { public void onAgentConnect(Long dcId, StartupCommand cmd); - public void onAgentDisconnect(long agentId, Status state); - public boolean generateFirewallConfiguration(Long agentId); public boolean generateVMSetupCommand(Long hostId); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0141b377/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java index 045c622..86d94df 100755 --- a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java +++ b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java @@ -79,7 +79,6 @@ import com.cloud.exception.StorageUnavailableException; import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.Status; -import com.cloud.host.Host.Type; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.info.RunningHostCountInfo; @@ -1004,20 +1003,6 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar public void onAgentConnect(Long dcId, StartupCommand cmd) { } - @Override - public void onAgentDisconnect(long agentId, Status state) { - HostVO host = _hostDao.findById(agentId); - if (host == null || !Type.SecondaryStorageVM.equals(host.getType())) { - return; - } - if (state == Status.Alert || state == Status.Disconnected) { - SecondaryStorageVmVO ssvm = getSSVMfromHost(host); - if ( ssvm != null ) { - stopSecStorageVm(ssvm.getId()); - } - } - } - private String getAllocLockName() { // to improve security, it may be better to return a unique mashed // name(for example MD5 hashed)