From dev-return-50583-apmail-cloudstack-dev-archive=cloudstack.apache.org@cloudstack.apache.org Wed Jan 22 14:30:53 2014 Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3E86F10A3F for ; Wed, 22 Jan 2014 14:30:53 +0000 (UTC) Received: (qmail 3889 invoked by uid 500); 22 Jan 2014 14:30:52 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 3853 invoked by uid 500); 22 Jan 2014 14:30:51 -0000 Mailing-List: contact dev-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 dev@cloudstack.apache.org Received: (qmail 3845 invoked by uid 99); 22 Jan 2014 14:30:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jan 2014 14:30:51 +0000 X-ASF-Spam-Status: No, hits=-0.1 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_MED,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy includes SPF record at spf.trusted-forwarder.org) Received: from [74.125.149.19] (HELO na3sys009aog138.obsmtp.com) (74.125.149.19) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jan 2014 14:30:46 +0000 Received: from mail-vc0-f176.google.com ([209.85.220.176]) (using TLSv1) by na3sys009aob138.postini.com ([74.125.148.12]) with SMTP ID DSNKUt/WABV++sN5rIPv6nFVBkFDICPwrteJ@postini.com; Wed, 22 Jan 2014 06:30:25 PST Received: by mail-vc0-f176.google.com with SMTP id la4so251362vcb.21 for ; Wed, 22 Jan 2014 06:30:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=dTcW7xiCfU7/wrDK7+jr2ntEgn63B2FYCvZ/YwhiW3Y=; b=NiI6rHiQKtLQY/dbHYsPNx7bFlq8eGnOy4GXbb8Ct9JgxOWTDoMjd9nEh75yZrCtCg oU1JBANAFTLo4ufrR1LKv6laZtVWsy0kKEHSP+T/BIjnVs9jiVGmUx/7aGZWkx+0xNMi 8v3DdDoae/ghaMj2WhHVfduFV6HoMyBo8VRikzvCJl+eUrV/s0foQg+KjdequXwDk40H 0c3Dmxy2qLgaPbwi0swBhMCtkRgYJUGN0958hHLbI/XTO6QiMNjrddBN03GTFlSMEFP+ 7FDolSQm74F/NdyFrx7EatoUx9nW5zTIu9yALstZE1fV/VfP6V5bejDf7nteubnsiQGQ Lr/g== X-Gm-Message-State: ALoCoQlqHfHKHdu5+qb5kPqOka1qotiod1Nq71WTU/s2jzX7PnMte3vBpTNwUAlkK0RhohENelmoATEosSFODG21Rezccp7YGN8s650FmkiQtWpV+Mw7UIk6UKCXmuKkUDQLBVGewpzRNdOTx/zBFrUYzr0tFEdYs4Qu5vgGZq4UDHnJFZUmJRQ= X-Received: by 10.58.94.195 with SMTP id de3mr259925veb.39.1390401023799; Wed, 22 Jan 2014 06:30:23 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.58.94.195 with SMTP id de3mr259919veb.39.1390401023695; Wed, 22 Jan 2014 06:30:23 -0800 (PST) Received: by 10.58.200.131 with HTTP; Wed, 22 Jan 2014 06:30:23 -0800 (PST) In-Reply-To: References: <20131106190925.30022.53708@reviews.apache.org> Date: Wed, 22 Jan 2014 09:30:23 -0500 Message-ID: Subject: Re: Review Request 15280: CLOUDSTACK-5062: Deleting Load Balancing Rule fails when generating usage events are enabled From: David Grizzanti To: Daan Hoogland Cc: dev Content-Type: multipart/alternative; boundary=047d7ba96cf41ced9104f08ff7ac X-Virus-Checked: Checked by ClamAV on apache.org --047d7ba96cf41ced9104f08ff7ac Content-Type: text/plain; charset=ISO-8859-1 Hi Dan, Sorry, I missed this email when you sent it. I double checked 4.2 today and doesn't look like this was applied. Here is what I currently see on 4.2 in server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java: if (generateUsageEvent) { // Generate usage event right after all rules were marked for revoke UsageEventUtils.publishUsageEvent(EventTypes.EVENT_LOAD_BALANCER_DELETE, lb.getAccountId(), 0, lb.getId(), null, LoadBalancingRule.class.getName(), lb.getUuid()); } Whereas the diff was to: --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -1235,7 +1235,8 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements if (generateUsageEvent) { // Generate usage event right after all rules were marked for revoke - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_LOAD_BALANCER_DELETE, lb.getAccountId(), 0, lb.getId(), + Network network = _networkModel.getNetwork(lb.getNetworkId()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_LOAD_BALANCER_DELETE, lb.getAccountId(), network.getDataCenterId(), lb.getId(), null, LoadBalancingRule.class.getName(), lb.getUuid()); } Thanks On Thu, Nov 7, 2013 at 4:57 AM, Daan Hoogland wrote: > H David, > > I think I already applied this on 4.2. > > On Wed, Nov 6, 2013 at 8:09 PM, David Grizzanti > wrote: > > > > ----------------------------------------------------------- > > This is an automatically generated e-mail. To reply, visit: > > https://reviews.apache.org/r/15280/ > > ----------------------------------------------------------- > > > > Review request for cloudstack. > > > > > > Bugs: CLOUDSTACK-5062 > > https://issues.apache.org/jira/browse/CLOUDSTACK-5062 > > > > > > Repository: cloudstack-git > > > > > > Description > > ------- > > > > CLOUDSTACK-5062: Deleting Load Balancing Rule fails when generating > usage events are enabled > > > > Added logic so that a correct zoneID is passed when generating usage > events while deleting load balancing rules: > > - Added logic to > server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java to grab > zone id and pass to publishUsageEvent > > > > > > Diffs > > ----- > > > > server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java > be81a3e > > > > Diff: https://reviews.apache.org/r/15280/diff/ > > > > > > Testing > > ------- > > > > Testing only on 4.2 > > > > > > Thanks, > > > > David Grizzanti > > > > -- David Grizzanti Software Engineer Sungard Availability Services e: david.grizzanti@sungard.com w: 215.446.1431 c: 570.575.0315 --047d7ba96cf41ced9104f08ff7ac--