Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B86FD200BF4 for ; Fri, 23 Dec 2016 00:34:56 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B6E43160B37; Thu, 22 Dec 2016 23:34:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0E7AD160B26 for ; Fri, 23 Dec 2016 00:34:55 +0100 (CET) Received: (qmail 25201 invoked by uid 500); 22 Dec 2016 23:34:55 -0000 Mailing-List: contact commits-help@beam.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.apache.org Delivered-To: mailing list commits@beam.apache.org Received: (qmail 25192 invoked by uid 99); 22 Dec 2016 23:34:55 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Dec 2016 23:34:55 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id D96181812A2 for ; Thu, 22 Dec 2016 23:34:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.218 X-Spam-Level: X-Spam-Status: No, score=-6.218 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id t2p8-18MyTmz for ; Thu, 22 Dec 2016 23:34:54 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 4509D5F1C2 for ; Thu, 22 Dec 2016 23:34:53 +0000 (UTC) Received: (qmail 25161 invoked by uid 99); 22 Dec 2016 23:34:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Dec 2016 23:34:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5982FDFCF4; Thu, 22 Dec 2016 23:34:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dhalperi@apache.org To: commits@beam.incubator.apache.org Date: Thu, 22 Dec 2016 23:34:53 -0000 Message-Id: In-Reply-To: <5c7caf83130d4819b236dd327a997a7b@git.apache.org> References: <5c7caf83130d4819b236dd327a997a7b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] incubator-beam git commit: BEAM-1203 Fixed exception when creating zip entries during Apex YARN launch archived-at: Thu, 22 Dec 2016 23:34:56 -0000 BEAM-1203 Fixed exception when creating zip entries during Apex YARN launch Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/07a07280 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/07a07280 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/07a07280 Branch: refs/heads/python-sdk Commit: 07a07280f0adc0b83476665733306c49d05f93ad Parents: 99c49b0 Author: Pramod Immaneni Authored: Wed Dec 21 17:56:55 2016 -0800 Committer: Dan Halperin Committed: Thu Dec 22 15:34:41 2016 -0800 ---------------------------------------------------------------------- .../java/org/apache/beam/runners/apex/ApexYarnLauncher.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/07a07280/runners/apex/src/main/java/org/apache/beam/runners/apex/ApexYarnLauncher.java ---------------------------------------------------------------------- diff --git a/runners/apex/src/main/java/org/apache/beam/runners/apex/ApexYarnLauncher.java b/runners/apex/src/main/java/org/apache/beam/runners/apex/ApexYarnLauncher.java index 0ae4cc7..a2d88f4 100644 --- a/runners/apex/src/main/java/org/apache/beam/runners/apex/ApexYarnLauncher.java +++ b/runners/apex/src/main/java/org/apache/beam/runners/apex/ApexYarnLauncher.java @@ -260,8 +260,10 @@ public class ApexYarnLauncher { if (!relativePath.endsWith("/")) { relativePath += "/"; } - final Path dstDir = zipfs.getPath(relativePath); - Files.createDirectory(dstDir); + if (!relativePath.equals("META-INF/")) { + final Path dstDir = zipfs.getPath(relativePath); + Files.createDirectory(dstDir); + } } return super.preVisitDirectory(dir, attrs); }