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 5E0011783B for ; Wed, 18 Mar 2015 18:08:52 +0000 (UTC) Received: (qmail 77398 invoked by uid 500); 18 Mar 2015 18:08:52 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 77332 invoked by uid 500); 18 Mar 2015 18:08:52 -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 77323 invoked by uid 99); 18 Mar 2015 18:08: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; Wed, 18 Mar 2015 18:08:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CC85FE1876; Wed, 18 Mar 2015 18:08:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wheat9@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-7953. NN Web UI fails to navigate to paths that contain #. Contributed by kanaka kumar avvaru. Date: Wed, 18 Mar 2015 18:08:51 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2.7 54e63c52c -> 5293ae031 HDFS-7953. NN Web UI fails to navigate to paths that contain #. Contributed by kanaka kumar avvaru. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5293ae03 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5293ae03 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5293ae03 Branch: refs/heads/branch-2.7 Commit: 5293ae03118af75b55cbd33159ea3d8d84d680da Parents: 54e63c5 Author: Haohui Mai Authored: Wed Mar 18 11:08:08 2015 -0700 Committer: Haohui Mai Committed: Wed Mar 18 11:08:49 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop-hdfs/src/main/webapps/hdfs/explorer.js | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5293ae03/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 5c486b0..6cdc21b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -852,6 +852,9 @@ Release 2.7.0 - UNRELEASED HDFS-7946. TestDataNodeVolumeFailureReporting NPE on Windows. (Xiaoyu Yao via Arpit Agarwal) + HDFS-7953. NN Web UI fails to navigate to paths that contain #. + (kanaka kumar avvaru via wheat9) + BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS HDFS-7720. Quota by Storage Type API, tools and ClientNameNode http://git-wip-us.apache.org/repos/asf/hadoop/blob/5293ae03/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js index 0a53dcd..131b2aa 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js @@ -78,6 +78,12 @@ return data.RemoteException !== undefined ? data.RemoteException.message : ""; } + function encode_path(abs_path) { + abs_path = encodeURIComponent(abs_path); + var re = /%2F/g; + return abs_path.replace(re, '/'); + } + function view_file_details(path, abs_path) { function show_block_info(blocks) { var menus = $('#file-info-blockinfo-list'); @@ -102,12 +108,6 @@ menus.change(); } - function encode_path(abs_path) { - abs_path = encodeURIComponent(abs_path); - var re = /%2F/g; - return abs_path.replace(re, '/'); - } - abs_path = encode_path(abs_path); var url = '/webhdfs/v1' + abs_path + '?op=GET_BLOCK_LOCATIONS'; $.get(url).done(function(data) { @@ -149,7 +149,7 @@ return chunk.write('' + new Date(Number(value)).toLocaleString()); } }; - var url = '/webhdfs/v1' + dir + '?op=LISTSTATUS'; + var url = '/webhdfs/v1' + encode_path(dir) + '?op=LISTSTATUS'; $.get(url, function(data) { var d = get_response(data, "FileStatuses"); if (d === null) {