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 47EA511586 for ; Tue, 19 Aug 2014 15:15:23 +0000 (UTC) Received: (qmail 81294 invoked by uid 500); 19 Aug 2014 15:15:22 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 81244 invoked by uid 500); 19 Aug 2014 15:15:22 -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 81231 invoked by uid 99); 19 Aug 2014 15:15:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Aug 2014 15:15:22 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW X-Spam-Check-By: apache.org Received-SPF: unknown (nike.apache.org: error in processing during lookup of pdion@cloudops.com) Received: from [209.85.215.41] (HELO mail-la0-f41.google.com) (209.85.215.41) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Aug 2014 15:14:56 +0000 Received: by mail-la0-f41.google.com with SMTP id s18so6080630lam.0 for ; Tue, 19 Aug 2014 08:14:56 -0700 (PDT) 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:content-type; bh=TKDI6BzQKYtY6fE/2vucE9cSCym+CYSO/B7URP0Ksho=; b=OXVlhReMg1c9Q3XRdAaF3kmhWFsWp5a7CWjHZk6AO7D/vn+JIoZh2vbW0wHi9k6Uam J/rpiyExfVmCBtRZCmTjTwEYgjOpZ3ZEO0he7vzFUMx0h9pZR5GKu+LD+SyDdUO4ucUS CkcaZmWrXjNK6N5MlDvAAMaIuSB0XtiUjKQKQ6KLjZTQUUDBW55Uc0SW62nQ/LqGwKXX vKLGWXwXI9o7gb1Ce7WwVA2f3lk0QtkBWHlajX2LbACOHWMQPtokITt4TI1Oz7I+O+Bp 0MpwvWUYbXpJr4x3skg6fmcSiMD6XMXwh5jYGKi73ay7Nf7uyX6XYccIM2Y3NSsgx6x2 Fi5g== X-Gm-Message-State: ALoCoQlh91IotPaFM/+tkULJMfGAx5v5KmVvA4aFWwgcJ92VF6pmeM+byEk3mPgUAdcECl8v4RN3 MIME-Version: 1.0 X-Received: by 10.112.204.164 with SMTP id kz4mr34839882lbc.15.1408461296027; Tue, 19 Aug 2014 08:14:56 -0700 (PDT) Received: by 10.114.109.8 with HTTP; Tue, 19 Aug 2014 08:14:55 -0700 (PDT) In-Reply-To: References: Date: Tue, 19 Aug 2014 11:14:55 -0400 Message-ID: Subject: Re: [acs441][acs450] hotfix merge request From: Pierre-Luc Dion To: "dev@cloudstack.apache.org" Content-Type: multipart/alternative; boundary=001a11c3bfaa3adfce0500fcf3f3 X-Virus-Checked: Checked by ClamAV on apache.org --001a11c3bfaa3adfce0500fcf3f3 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Daan, The one you are looking at is only removing end of line spaces. the commit 29c12bb78c37bf8c7ae4c2fd6f528974fc44e707 is the real fix. I've tested it and it fixe the current 4.4.0 issue while using Swift as SS. It is a cut and paste of a previous commit of yours for S3. Thanks! Pierre-Luc On Tue, Aug 19, 2014 at 10:37 AM, Daan Hoogland wrote: > Pierre-Luc, > > What is this supposed to do? I see no change in the logic in your commit: > > commit 62d9843e0ce9e9c2418258697e583dd9de4a68d0 > Author: Pierre-Luc Dion > Date: Thu Aug 14 13:07:32 2014 -0400 > > NfsSecondaryStorageResource.java:remove empty spaces > > diff --git > > a/services/secondary-storage/server/src/org/apache/cloudstack/storage/res= ource/NfsSecondaryStorageResource.java > b/services/secondary-storage/server/src/org/ > index f095403..f9a06f1 100755 > --- > > a/services/secondary-storage/server/src/org/apache/cloudstack/storage/res= ource/NfsSecondaryStorageResource.java > +++ > > b/services/secondary-storage/server/src/org/apache/cloudstack/storage/res= ource/NfsSecondaryStorageResource.java > @@ -329,7 +329,7 @@ public class NfsSecondaryStorageResource extends > ServerResourceBase implements S > s_logger.error(errMsg); > return new CopyCmdAnswer(errMsg); > } > - } > + } > > File destFile =3D SwiftUtil.getObject(swiftTO, > downloadDirectory, srcData.getPath()); > return postProcessing(destFile, downloadPath, destPath, > srcData, destData); > > > On Sat, Aug 16, 2014 at 4:55 PM, Pierre-Luc Dion > wrote: > > > Hi, > > > > Please merge hotfix/4.4-7343 into 4.4 branch. master branch is also > > affected so potentially 4.5 so can this be merge into those branch as > well > > ? > > > > https://issues.apache.org/jira/browse/CLOUDSTACK-7343 > > > > > > It as been tested with 4.4.1 and seams to resolve unworkable swift as > > secondary storage. This fix is a cut and past from S3 same behavior [1]= . > > > > > > > > Thanks ! > > > > [1] > > > > > https://git-wip-us.apache.org/repos/asf?p=3Dcloudstack.git;a=3Dblobdiff;f= =3Dservices/secondary-storage/server/src/org/apache/cloudstack/storage/reso= urce/NfsSecondaryStorageResource.java;h=3D78f4bf19a9192f1df581c1c0ddb90f249= 1a93cc9;hp=3D6927f028cf23db81c86c8e5d0059e3a3c3f37a81;hb=3D6b8b7b82f41c415f= 1e0d1ed715e14f3664e39e22;hpb=3Df7dd1720cb6217d4425e9a92268f6b716e88a18c > > > > > > > > *Pierre-Luc DION* > > Architecte de Solution Cloud | Cloud Solutions Architect > > t 855.652.5683 > > > > *CloudOps* Votre partenaire infonuagique* | *Cloud Solutions Experts > > 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6 > > w cloudops.com *|* tw @CloudOps_ > > > > > > -- > Daan > --001a11c3bfaa3adfce0500fcf3f3--