From commits-return-84911-archive-asf-public=cust-asf.ponee.io@hbase.apache.org Thu Apr 11 18:39:06 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id CBC0C180784 for ; Thu, 11 Apr 2019 20:39:05 +0200 (CEST) Received: (qmail 16253 invoked by uid 500); 11 Apr 2019 18:39:04 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 16105 invoked by uid 99); 11 Apr 2019 18:39:04 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Apr 2019 18:39:04 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 7D287814B7; Thu, 11 Apr 2019 18:39:04 +0000 (UTC) Date: Thu, 11 Apr 2019 18:39:06 +0000 To: "commits@hbase.apache.org" Subject: [hbase] branch master updated: HBASE-22194 Snapshot unittests fail on Windows due to invalid file path uri MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155500794429.6335.15087582047323035333@gitbox.apache.org> From: sershe@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: hbase X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: fc6e3fc9d7781efec6cd142d135a1b339081aa24 X-Git-Newrev: 2c8b813810dfc4a1dbdc84b5d071bfb457ff3f95 X-Git-Rev: 2c8b813810dfc4a1dbdc84b5d071bfb457ff3f95 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. sershe pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hbase.git The following commit(s) were added to refs/heads/master by this push: new 2c8b813 HBASE-22194 Snapshot unittests fail on Windows due to invalid file path uri 2c8b813 is described below commit 2c8b813810dfc4a1dbdc84b5d071bfb457ff3f95 Author: Bahram Chechrazy AuthorDate: Thu Apr 11 11:33:52 2019 -0700 HBASE-22194 Snapshot unittests fail on Windows due to invalid file path uri Signed-off-by: Sergey Shelukhin --- .../hbase/snapshot/TestExportSnapshotWithTemporaryDirectory.java | 2 +- .../hadoop/hbase/client/TestSnapshotDFSTemporaryDirectory.java | 6 +++--- .../apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotWithTemporaryDirectory.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotWithTemporaryDirectory.java index fca5358..ce1ddca 100644 --- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotWithTemporaryDirectory.java +++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotWithTemporaryDirectory.java @@ -55,6 +55,6 @@ public class TestExportSnapshotWithTemporaryDirectory extends TestExportSnapshot public static void setUpBaseConf(Configuration conf) { TestExportSnapshot.setUpBaseConf(conf); - conf.set(SnapshotDescriptionUtils.SNAPSHOT_WORKING_DIR, "file://" + TEMP_DIR + "/.tmpdir/"); + conf.set(SnapshotDescriptionUtils.SNAPSHOT_WORKING_DIR, "file://" + new Path(TEMP_DIR, ".tmpdir").toUri()); } } \ No newline at end of file diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotDFSTemporaryDirectory.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotDFSTemporaryDirectory.java index aff05e5..b4cef33 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotDFSTemporaryDirectory.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotDFSTemporaryDirectory.java @@ -72,8 +72,8 @@ public class TestSnapshotDFSTemporaryDirectory conf.set(HConstants.HBASE_REGION_SPLIT_POLICY_KEY, ConstantSizeRegionSplitPolicy.class.getName()); - conf.set(SnapshotDescriptionUtils.SNAPSHOT_WORKING_DIR, UTIL.getDefaultRootDirPath().toString() - + Path.SEPARATOR + UUID.randomUUID().toString() + Path.SEPARATOR + ".tmpdir" - + Path.SEPARATOR); + String snapshotPath = UTIL.getDefaultRootDirPath().toString() + Path.SEPARATOR + + UUID.randomUUID().toString() + Path.SEPARATOR + ".tmpdir" + Path.SEPARATOR; + conf.set(SnapshotDescriptionUtils.SNAPSHOT_WORKING_DIR, "file://" + new Path(snapshotPath).toUri()); } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.java index 0f7cff1..a8561d0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.java @@ -121,7 +121,7 @@ public class TestSnapshotTemporaryDirectory { conf.setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true); conf.set(HConstants.HBASE_REGION_SPLIT_POLICY_KEY, ConstantSizeRegionSplitPolicy.class.getName()); - conf.set(SnapshotDescriptionUtils.SNAPSHOT_WORKING_DIR, "file://" + TEMP_DIR + "/.tmpdir/"); + conf.set(SnapshotDescriptionUtils.SNAPSHOT_WORKING_DIR, "file://" + new Path(TEMP_DIR, ".tmpDir").toUri()); } @Before public void setup() throws Exception {