SENTRY-1429, SENTRY-1454: fix flaky TestHDFSIntegration, refactor this huge test class, improve its cleanUp and setUp for temp HDFS dirs; divide test class into smoke test class and p2 test class; in post commit run, we will only run smoke tests. (Anne Yu, reviewed by Sravya Tirukkovalur and Hao Hao) SENTRY-1454:Fix intermittent time out issue for TestHDFSIntegration (Anne Yu, reviewed by Sravya Tirukkovalur) SENTRY-1456: SENTRY-1454 follow up: Commit message and rat check failure. (Anne Yu, reviewed by Sravya Tirukkovalur). Using project.version instead of version (Colm O hEigeartaigh) # Please enter the commit message for your changes. Lines starting
Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/7ff19b55 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/7ff19b55 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/7ff19b55 Branch: refs/heads/sentry-ha-redesign Commit: 7ff19b555a43a32ca372a670acaa58a196d069f6 Parents: f88f82a Author: Alexander Kolbasov <[email protected]> Authored: Mon Mar 13 01:25:13 2017 -0700 Committer: Alexander Kolbasov <[email protected]> Committed: Mon Mar 13 01:25:13 2017 -0700 ---------------------------------------------------------------------- pom.xml | 1 + sentry-provider/sentry-provider-db/pom.xml | 2 +- .../tests/e2e/hdfs/TestHDFSIntegration.java | 2 +- .../tests/e2e/hdfs/TestHDFSIntegration.java | 2102 ------------------ .../e2e/hdfs/TestHDFSIntegrationAdvanced.java | 793 +++++++ .../tests/e2e/hdfs/TestHDFSIntegrationBase.java | 779 +++++++ .../e2e/hdfs/TestHDFSIntegrationEnd2End.java | 549 +++++ .../e2e/hdfs/TestHDFSIntegrationWithHA.java | 6 +- 8 files changed, 2127 insertions(+), 2107 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/7ff19b55/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c75b68c..a52e5ac 100644 --- a/pom.xml +++ b/pom.xml @@ -975,6 +975,7 @@ limitations under the License. </systemPropertyVariables> <excludes combine.children="append"> <exclude>%regex[org.apache.sentry.tests.e2e.dbprovider.*.class]</exclude> + <exclude>%regex[org.apache.sentry.tests.e2e.hdfs.TestHDFS.*.class]</exclude> </excludes> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/sentry/blob/7ff19b55/sentry-provider/sentry-provider-db/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/pom.xml b/sentry-provider/sentry-provider-db/pom.xml index a0ab56e..14ad6a2 100644 --- a/sentry-provider/sentry-provider-db/pom.xml +++ b/sentry-provider/sentry-provider-db/pom.xml @@ -268,7 +268,7 @@ limitations under the License. <replacements> <replacement> <token>%PROJECT_VERSION%</token> - <value>${version}</value> + <value>${project.version}</value> </replacement> </replacements> </configuration> http://git-wip-us.apache.org/repos/asf/sentry/blob/7ff19b55/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegration.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegration.java b/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegration.java index 5dab641..5e8b2fa 100644 --- a/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegration.java +++ b/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegration.java @@ -1009,7 +1009,7 @@ public class TestHDFSIntegration { miniDFS.getFileSystem().mkdirs(tmpHDFSDir); } - miniDFS.getFileSystem().setPermission(tmpHDFSDir, FsPermission.valueOf("drwxrwx---")); + miniDFS.getFileSystem().setPermission(tmpHDFSDir, FsPermission.valueOf("drwxrwx--x")); Path partitionDir = new Path("/tmp/external/p1"); if (!miniDFS.getFileSystem().exists(partitionDir)) { miniDFS.getFileSystem().mkdirs(partitionDir);
