You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2017/12/04 19:59:24 UTC
hbase git commit: HBASE-19159 Backup should check permission for
snapshot copy in advance (Janos Gub)
Repository: hbase
Updated Branches:
refs/heads/master aafaba448 -> 4c567b3c1
HBASE-19159 Backup should check permission for snapshot copy in advance (Janos Gub)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4c567b3c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4c567b3c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4c567b3c
Branch: refs/heads/master
Commit: 4c567b3c12240f2990a545d4350ff97c2f6574e2
Parents: aafaba4
Author: tedyu <yu...@gmail.com>
Authored: Mon Dec 4 11:59:18 2017 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Mon Dec 4 11:59:18 2017 -0800
----------------------------------------------------------------------
.../hbase/backup/impl/BackupAdminImpl.java | 1 +
.../hbase/backup/TestBackupSmallTests.java | 53 ++++++++++++++++++++
2 files changed, 54 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/4c567b3c/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java
----------------------------------------------------------------------
diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java
index 8a60e67..0b01a98 100644
--- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java
+++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java
@@ -558,6 +558,7 @@ public class BackupAdminImpl implements BackupAdmin {
throw new IOException("Target backup directory " + targetTableBackupDir
+ " exists already.");
}
+ outputFs.mkdirs(targetTableBackupDirPath);
}
ArrayList<TableName> nonExistingTableList = null;
try (Admin admin = conn.getAdmin();) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/4c567b3c/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSmallTests.java
----------------------------------------------------------------------
diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSmallTests.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSmallTests.java
new file mode 100644
index 0000000..ae1248f
--- /dev/null
+++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSmallTests.java
@@ -0,0 +1,53 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hbase.backup;
+
+import java.io.IOException;
+
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
+import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(SmallTests.class)
+public class TestBackupSmallTests extends TestBackupBase {
+ private static final UserGroupInformation DIANA =
+ UserGroupInformation.createUserForTesting("diana", new String[] {});
+ private static final String PERMISSION_TEST_PATH = Path.SEPARATOR + "permissionUT";
+
+ @Test public void testBackupPathIsAccessible() throws Exception {
+ Path path = new Path(PERMISSION_TEST_PATH);
+ FileSystem fs = FileSystem.get(TEST_UTIL.getConnection().getConfiguration());
+ fs.mkdirs(path);
+ }
+
+ @Test(expected = IOException.class) public void testBackupPathIsNotAccessible() throws Exception {
+ Path path = new Path(PERMISSION_TEST_PATH);
+ FileSystem rootFs = FileSystem.get(TEST_UTIL.getConnection().getConfiguration());
+ rootFs.mkdirs(path.getParent());
+ rootFs.setPermission(path.getParent(), FsPermission.createImmutable((short) 000));
+ FileSystem fs =
+ DFSTestUtil.getFileSystemAs(DIANA, TEST_UTIL.getConnection().getConfiguration());
+ fs.mkdirs(path);
+ }
+}