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 212A51049F for ; Tue, 6 Jan 2015 15:33:15 +0000 (UTC) Received: (qmail 83342 invoked by uid 500); 6 Jan 2015 15:33:16 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 83297 invoked by uid 500); 6 Jan 2015 15:33:16 -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 83278 invoked by uid 99); 6 Jan 2015 15:33:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jan 2015 15:33:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D28429215AA; Tue, 6 Jan 2015 15:33:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sateesh@apache.org To: commits@cloudstack.apache.org Date: Tue, 06 Jan 2015 15:33:15 -0000 Message-Id: <389c2a5cdd1f4d088dc4eab71e0c28f6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4 Repository: cloudstack Updated Branches: refs/heads/vmware-disk-controllers c7b23d0a1 -> e8a54f471 CLOUDSTACK-8134. Worker VMs don't have MS id set in vCenter annotation 'cloud.vm.workertag'. Correctly register node info for a newly created VMware context. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/13bdc1ce Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/13bdc1ce Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/13bdc1ce Branch: refs/heads/vmware-disk-controllers Commit: 13bdc1cef4ee0fae2f263777317c170302c49689 Parents: c7b23d0 Author: Likitha Shetty Authored: Tue Dec 30 11:48:06 2014 +0530 Committer: Likitha Shetty Committed: Tue Dec 30 11:52:56 2014 +0530 ---------------------------------------------------------------------- .../VmwareSecondaryStorageResourceHandler.java | 23 +++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13bdc1ce/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java index e67fed6..8a27799 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java @@ -209,23 +209,20 @@ public class VmwareSecondaryStorageResourceHandler implements SecondaryStorageRe _resource.ensureOutgoingRuleForAddress(vCenterAddress); VmwareContext context = currentContext.get(); - if (context != null) { - if(!context.validate()) { - invalidateServiceContext(context); - context = null; - } else { - context.registerStockObject("serviceconsole", cmd.getContextParam("serviceconsole")); - context.registerStockObject("manageportgroup", cmd.getContextParam("manageportgroup")); - context.registerStockObject("noderuninfo", cmd.getContextParam("noderuninfo")); - } + if (context != null && !context.validate()) { + invalidateServiceContext(context); + context = null; } - if(context == null) { - s_logger.info("Open new VmwareContext. vCenter: " + vCenterAddress + ", user: " + username + ", password: " + - StringUtils.getMaskedPasswordForDisplay(password)); + if (context == null) { + s_logger.info("Open new VmwareContext. vCenter: " + vCenterAddress + ", user: " + username + ", password: " + StringUtils.getMaskedPasswordForDisplay(password)); VmwareSecondaryStorageContextFactory.setVcenterSessionTimeout(vCenterSessionTimeout); context = VmwareSecondaryStorageContextFactory.getContext(vCenterAddress, username, password); } - + if (context != null) { + context.registerStockObject("serviceconsole", cmd.getContextParam("serviceconsole")); + context.registerStockObject("manageportgroup", cmd.getContextParam("manageportgroup")); + context.registerStockObject("noderuninfo", cmd.getContextParam("noderuninfo")); + } currentContext.set(context); return context; } catch (Exception e) {