You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/09/18 03:16:28 UTC
[1/2] git commit: updated refs/heads/master to 674af6e
Repository: cloudstack
Updated Branches:
refs/heads/master f1f61e13e -> 674af6e47
added hypervisor capacity for XS 6.5.0
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/674af6e4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/674af6e4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/674af6e4
Branch: refs/heads/master
Commit: 674af6e47313fa18c18536a2daed90d13b9a9a59
Parents: e5a91e4
Author: Anthony Xu <an...@citrix.com>
Authored: Wed Sep 17 18:14:31 2014 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Wed Sep 17 18:15:41 2014 -0700
----------------------------------------------------------------------
setup/db/db/schema-441to450.sql | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/674af6e4/setup/db/db/schema-441to450.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-441to450.sql b/setup/db/db/schema-441to450.sql
index ecc8a38..39ac88c 100644
--- a/setup/db/db/schema-441to450.sql
+++ b/setup/db/db/schema-441to450.sql
@@ -736,3 +736,6 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervis
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0', 'Other install media', 202, utc_timestamp(), 0);
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0', 'Other install media', 203, utc_timestamp(), 0);
+
+INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, storage_motion_supported) VALUES (UUID(), 'XenServer', '6.5.0', 100, 1, 13, 1);
+
[2/2] git commit: updated refs/heads/master to 674af6e
Posted by an...@apache.org.
in tagCommand, AsyncJobExecutionContext doesn't need to be created if it doesn't exist
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e5a91e40
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e5a91e40
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e5a91e40
Branch: refs/heads/master
Commit: e5a91e40dda8e8ecf02efbd8bf1c9f5c14f2b257
Parents: f1f61e1
Author: Anthony Xu <an...@citrix.com>
Authored: Wed Sep 17 17:55:56 2014 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Wed Sep 17 18:15:41 2014 -0700
----------------------------------------------------------------------
.../src/com/cloud/agent/manager/AgentManagerImpl.java | 2 +-
.../cloudstack/framework/jobs/AsyncJobExecutionContext.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5a91e40/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 2d5eb2b..9e8e026 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -380,7 +380,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
}
private static void tagCommand(Command cmd) {
- AsyncJobExecutionContext context = AsyncJobExecutionContext.getCurrentExecutionContext();
+ AsyncJobExecutionContext context = AsyncJobExecutionContext.getCurrent();
if (context != null && context.getJob() != null) {
AsyncJob job = context.getJob();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5a91e40/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java
index 86c6542..5575ab3 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java
@@ -182,6 +182,11 @@ public class AsyncJobExecutionContext {
return context;
}
+ // return currentExecutionContext without create it
+ public static AsyncJobExecutionContext getCurrent() {
+ return s_currentExectionContext.get();
+ }
+
public static AsyncJobExecutionContext registerPseudoExecutionContext(long accountId, long userId) {
AsyncJobExecutionContext context = s_currentExectionContext.get();
if (context == null) {