You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/02/25 10:05:55 UTC
git commit: updated refs/heads/4.3 to 9c0ed73
Repository: cloudstack
Updated Branches:
refs/heads/4.3 ad29ce934 -> 9c0ed73b8
CLOUDSTACK-8282: startSystemVM should override consoleproxy.start setting
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit b462a56f27b21455b70415ea03663af5cd62647e)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
server/src/com/cloud/consoleproxy/ConsoleProxyManager.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9c0ed73b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9c0ed73b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9c0ed73b
Branch: refs/heads/4.3
Commit: 9c0ed73b8ecb6e1913188b0a88730a7c34f89755
Parents: ad29ce9
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Feb 25 14:21:11 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Feb 25 14:35:49 2015 +0530
----------------------------------------------------------------------
.../cloud/consoleproxy/AgentBasedConsoleProxyManager.java | 2 +-
server/src/com/cloud/consoleproxy/ConsoleProxyManager.java | 2 +-
.../src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 8 ++++----
server/src/com/cloud/server/ManagementServerImpl.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c0ed73b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
index e12def0..d8aab13 100755
--- a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
+++ b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
@@ -179,7 +179,7 @@ public class AgentBasedConsoleProxyManager extends ManagerBase implements Consol
@Override
- public ConsoleProxyVO startProxy(long proxyVmId) {
+ public ConsoleProxyVO startProxy(long proxyVmId, boolean ignoreRestartSetting) {
return null;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c0ed73b/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java
index 4b57d5f..bf5a328 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java
@@ -37,7 +37,7 @@ public interface ConsoleProxyManager extends Manager, ConsoleProxyService {
public ConsoleProxyManagementState getManagementState();
public void resumeLastManagementState();
- public ConsoleProxyVO startProxy(long proxyVmId);
+ public ConsoleProxyVO startProxy(long proxyVmId, boolean ignoreRestartSetting);
public boolean stopProxy(long proxyVmId);
public boolean rebootProxy(long proxyVmId);
public boolean destroyProxy(long proxyVmId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c0ed73b/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 fa5d682..fd7fe4f 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -539,7 +539,7 @@ VirtualMachineGuru, SystemVmLoadScanHandler<Long>, ResourceStateAdapter {
}
@Override
- public ConsoleProxyVO startProxy(long proxyVmId) {
+ public ConsoleProxyVO startProxy(long proxyVmId, boolean ignoreRestartSetting) {
try {
ConsoleProxyVO proxy = _consoleProxyDao.findById(proxyVmId);
if (proxy.getState() == VirtualMachine.State.Running) {
@@ -547,7 +547,7 @@ VirtualMachineGuru, SystemVmLoadScanHandler<Long>, ResourceStateAdapter {
}
String restart = _configDao.getValue(Config.ConsoleProxyRestart.key());
- if (restart != null && restart.equalsIgnoreCase("false")) {
+ if (!ignoreRestartSetting && restart != null && restart.equalsIgnoreCase("false")) {
return null;
}
@@ -938,7 +938,7 @@ VirtualMachineGuru, SystemVmLoadScanHandler<Long>, ResourceStateAdapter {
if (proxy != null) {
long proxyVmId = proxy.getId();
- proxy = startProxy(proxyVmId);
+ proxy = startProxy(proxyVmId, false);
if (proxy != null) {
if (s_logger.isInfoEnabled()) {
@@ -1152,7 +1152,7 @@ VirtualMachineGuru, SystemVmLoadScanHandler<Long>, ResourceStateAdapter {
return false;
}
} else {
- return startProxy(proxyVmId) != null;
+ return startProxy(proxyVmId, false) != null;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c0ed73b/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 011c8b8..25d96b4 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -2150,7 +2150,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
}
private ConsoleProxyVO startConsoleProxy(long instanceId) {
- return _consoleProxyMgr.startProxy(instanceId);
+ return _consoleProxyMgr.startProxy(instanceId, true);
}
private ConsoleProxyVO stopConsoleProxy(VMInstanceVO systemVm, boolean isForced) throws ResourceUnavailableException, OperationTimedoutException,