Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 2E7441799E for ; Mon, 29 Jun 2015 20:51:39 +0000 (UTC) Received: (qmail 17106 invoked by uid 500); 29 Jun 2015 20:51:39 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 17045 invoked by uid 500); 29 Jun 2015 20:51:38 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 17036 invoked by uid 99); 29 Jun 2015 20:51:38 -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; Mon, 29 Jun 2015 20:51:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CEE4BE35E9; Mon, 29 Jun 2015 20:51:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cnauroth@apache.org To: common-commits@hadoop.apache.org Date: Mon, 29 Jun 2015 20:51:38 -0000 Message-Id: <3e081146db9645f9b59ae50ea0e3c4a6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] hadoop git commit: HADOOP-12089. StorageException complaining " no lease ID" when updating FolderLastModifiedTime in WASB. Contributed by Duo Xu. Repository: hadoop Updated Branches: refs/heads/branch-2 0100995c5 -> 399df10c5 refs/heads/trunk 62e583c7d -> 460e98f7b HADOOP-12089. StorageException complaining " no lease ID" when updating FolderLastModifiedTime in WASB. Contributed by Duo Xu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/460e98f7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/460e98f7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/460e98f7 Branch: refs/heads/trunk Commit: 460e98f7b3ec84f3c5afcb2aad4f4e7031d16e3a Parents: 62e583c Author: cnauroth Authored: Mon Jun 29 13:48:02 2015 -0700 Committer: cnauroth Committed: Mon Jun 29 13:48:02 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/460e98f7/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 9008ead..a9b44e3 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -893,6 +893,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12119. hadoop fs -expunge does not work for federated namespace (J.Andreina via vinayakumarb) + HADOOP-12089. StorageException complaining " no lease ID" when updating + FolderLastModifiedTime in WASB. (Duo Xu via cnauroth) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/460e98f7/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java index 623645a..a567b33 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java @@ -1500,7 +1500,7 @@ public class NativeAzureFileSystem extends FileSystem { createPermissionStatus(FsPermission.getDefault())); } else { if (!skipParentFolderLastModifidedTimeUpdate) { - store.updateFolderLastModifiedTime(parentKey, null); + updateParentFolderLastModifiedTime(key); } } } @@ -1561,9 +1561,8 @@ public class NativeAzureFileSystem extends FileSystem { // Update parent directory last modified time Path parent = absolutePath.getParent(); if (parent != null && parent.getParent() != null) { // not root - String parentKey = pathToKey(parent); if (!skipParentFolderLastModifidedTimeUpdate) { - store.updateFolderLastModifiedTime(parentKey, null); + updateParentFolderLastModifiedTime(key); } } instrumentation.directoryDeleted();