[ALLUXIO-3290] Journal state refactor (#7774)

* [ALLUXIO-3290] Journal state refactor (#7749) * Journal state refactor * Cleanups * Cleanup for inode persisting lock * Fix issue with checking for persistence state IN_PROGRESS * Fix concurrency * Address Genes first round of review comments * Fix test * Add todo for changing TtlBucketList ownership * Address Genes second round of comments * Delete one file at a time and fix setting non-exteded acl mask * Fix handling for extended acl masks * Fatal error if applyAndJournal fails (#7767) * [SMALLFIX] Add backwards compatibility test (#7765) * Add backwards compatibility test * Add profile for skipping slow tests * Use excludesFile to exclude slow tests by default * Test improvements * Move journal generation to src/ and generate/test as root * Fix checkstyle * Re-organize and fix style * Fix findbugs * Update javadoc and add missing imports * Add script for generating journals, and fix findbugs * Fix test exclusion * Sort dependencies alphabetically * Use more descriptive method names in Clients.java * Leave a directory mounted in Mount op * Simplify async persist op * Fix exclusion * Fix issue with excluding from submodules * change profile to runAllTests * [SMALLFIX] Add additional tests (#7772) * Add additional tests * Fix checkstyle * [SMALLFIX] Add test for removing extended acl masks (#7773) * Add test for removing extended acl masks * Fix checkstyle
Alluxio · Aug 17, 2018 · 1de584b · 1de584b
1 parent 2c540de
commit 1de584b
Show file tree

Hide file tree

Showing 119 changed files with 9,234 additions and 2,037 deletions.
diff --git a/assembly/client/pom.xml b/assembly/client/pom.xml
@@ -25,9 +25,7 @@
   <properties>
     <!-- The following paths need to be defined here as well as in the parent pom so that mvn can -->
     <!-- run properly from sub-project directories -->
-    <license.header.path>${project.parent.parent.basedir}/build/license/</license.header.path>
+    <build.path>${project.parent.parent.basedir}/build</build.path>
-    <checkstyle.path>${project.parent.parent.basedir}/build/checkstyle/</checkstyle.path>
-    <findbugs.path>${project.parent.parent.basedir}/build/findbugs/</findbugs.path>
     <failIfNoTests>false</failIfNoTests>
   </properties>
 

diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -30,9 +30,7 @@
   <properties>
     <!-- The following paths need to be defined here as well as in the parent pom so that mvn can -->
     <!-- run properly from sub-project directories -->
-    <license.header.path>${project.parent.basedir}/build/license/</license.header.path>
+    <build.path>${project.parent.basedir}/build</build.path>
-    <checkstyle.path>${project.parent.basedir}/build/checkstyle/</checkstyle.path>
-    <findbugs.path>${project.parent.basedir}/build/findbugs/</findbugs.path>
     <failIfNoTests>false</failIfNoTests>
   </properties>
 </project>
diff --git a/assembly/server/pom.xml b/assembly/server/pom.xml
@@ -25,9 +25,7 @@
   <properties>
     <!-- The following paths need to be defined here as well as in the parent pom so that mvn can -->
     <!-- run properly from sub-project directories -->
-    <license.header.path>${project.parent.parent.basedir}/build/license/</license.header.path>
+    <build.path>${project.parent.parent.basedir}/build</build.path>
-    <checkstyle.path>${project.parent.parent.basedir}/build/checkstyle/</checkstyle.path>
-    <findbugs.path>${project.parent.parent.basedir}/build/findbugs/</findbugs.path>
     <failIfNoTests>false</failIfNoTests>
   </properties>
 

diff --git a/build/surefire/no-excludes b/build/surefire/no-excludes
@@ -0,0 +1 @@
+# No files are excluded
diff --git a/build/surefire/slow-tests b/build/surefire/slow-tests
@@ -0,0 +1 @@
+**/BackwardsCompatibilityIntegrationTest
diff --git a/core/client/fs/pom.xml b/core/client/fs/pom.xml
@@ -25,9 +25,7 @@
   <properties>
     <!-- The following paths need to be defined here as well as in the parent pom so that mvn can -->
     <!-- run properly from sub-project directories -->
-    <license.header.path>${project.parent.parent.parent.basedir}/build/license/</license.header.path>
+    <build.path>${project.parent.parent.parent.basedir}/build</build.path>
-    <checkstyle.path>${project.parent.parent.parent.basedir}/build/checkstyle/</checkstyle.path>
-    <findbugs.path>${project.parent.parent.parent.basedir}/build/findbugs/</findbugs.path>
     <failIfNoTests>false</failIfNoTests>
   </properties>
 

diff --git a/core/client/fs/src/main/java/alluxio/client/file/BaseFileSystem.java b/core/client/fs/src/main/java/alluxio/client/file/BaseFileSystem.java
@@ -394,6 +394,12 @@ public void rename(AlluxioURI src, AlluxioURI dst, RenameOptions options)
     }
   }
 
+  @Override
+  public void setAcl(AlluxioURI path, SetAclAction action, List<AclEntry> entries)
+      throws FileDoesNotExistException, IOException, AlluxioException {
+    setAcl(path, action, entries, SetAclOptions.defaults());
+  }
+
   @Override
   public void setAcl(AlluxioURI path, SetAclAction action, List<AclEntry> entries,
       SetAclOptions options) throws FileDoesNotExistException, IOException, AlluxioException {

diff --git a/core/client/fs/src/main/java/alluxio/client/file/FileSystem.java b/core/client/fs/src/main/java/alluxio/client/file/FileSystem.java
@@ -333,6 +333,18 @@ void rename(AlluxioURI src, AlluxioURI dst)
   void rename(AlluxioURI src, AlluxioURI dst, RenameOptions options)
       throws FileDoesNotExistException, IOException, AlluxioException;
 
+  /**
+   * Convenience method for {@link #setAcl(AlluxioURI, SetAclAction, List, SetAclOptions)} with
+   * default options.
+   *
+   * @param path the path to set the ACL for
+   * @param action the set action to perform
+   * @param entries the ACL entries
+   * @throws FileDoesNotExistException if the given file does not exist
+   */
+  void setAcl(AlluxioURI path, SetAclAction action, List<AclEntry> entries)
+      throws FileDoesNotExistException, IOException, AlluxioException;
+
   /**
    * Sets the ACL for a path.
    *

diff --git a/core/client/hdfs/pom.xml b/core/client/hdfs/pom.xml
@@ -25,9 +25,7 @@
   <properties>
     <!-- The following paths need to be defined here as well as in the parent pom so that mvn can -->
     <!-- run properly from sub-project directories -->
-    <license.header.path>${project.parent.parent.parent.basedir}/build/license/</license.header.path>
+    <build.path>${project.parent.parent.parent.basedir}/build</build.path>
-    <checkstyle.path>${project.parent.parent.parent.basedir}/build/checkstyle/</checkstyle.path>
-    <findbugs.path>${project.parent.parent.parent.basedir}/build/findbugs/</findbugs.path>
     <failIfNoTests>false</failIfNoTests>
   </properties>
 

diff --git a/core/client/pom.xml b/core/client/pom.xml
@@ -31,9 +31,7 @@
   <properties>
     <!-- These need to be defined here as well as in the parent pom so that mvn can run
          properly from sub-project directories -->
-    <license.header.path>${project.parent.parent.basedir}/build/license/</license.header.path>
+    <build.path>${project.parent.parent.basedir}/build</build.path>
-    <checkstyle.path>${project.parent.parent.basedir}/build/checkstyle/</checkstyle.path>
-    <findbugs.path>${project.parent.parent.basedir}/build/findbugs/</findbugs.path>
   </properties>
 
 </project>
diff --git a/core/client/runtime/pom.xml b/core/client/runtime/pom.xml
@@ -25,9 +25,7 @@
   <properties>
     <!-- The following paths need to be defined here as well as in the parent pom so that mvn can -->
     <!-- run properly from sub-project directories -->
-    <license.header.path>${project.parent.parent.parent.basedir}/build/license/</license.header.path>
+    <build.path>${project.parent.parent.parent.basedir}/build</build.path>
-    <checkstyle.path>${project.parent.parent.parent.basedir}/build/checkstyle/</checkstyle.path>
-    <findbugs.path>${project.parent.parent.parent.basedir}/build/findbugs/</findbugs.path>
     <failIfNoTests>false</failIfNoTests>
     <!-- The shading prefix should match the artifact ID, replacing '-' with '.' -->
     <shading.prefix>alluxio.core.client.runtime</shading.prefix>

diff --git a/core/common/pom.xml b/core/common/pom.xml
@@ -25,9 +25,7 @@
   <properties>
     <!-- The following paths need to be defined here as well as in the parent pom so that mvn can -->
     <!-- run properly from sub-project directories -->
-    <license.header.path>${project.parent.parent.basedir}/build/license/</license.header.path>
+    <build.path>${project.parent.parent.basedir}/build</build.path>
-    <checkstyle.path>${project.parent.parent.basedir}/build/checkstyle/</checkstyle.path>
-    <findbugs.path>${project.parent.parent.basedir}/build/findbugs/</findbugs.path>
     <failIfNoTests>false</failIfNoTests>
   </properties>
 

diff --git a/core/common/src/main/java/alluxio/security/authorization/AccessControlList.java b/core/common/src/main/java/alluxio/security/authorization/AccessControlList.java
@@ -169,7 +169,7 @@ public boolean hasExtended() {
    *
    * @param entry the entry to be removed
    */
-  public void removeEntry(AclEntry entry) throws IOException {
+  public void removeEntry(AclEntry entry) {
     switch (entry.getType()) {
       case NAMED_USER:  // fall through
       case NAMED_GROUP: // fall through

diff --git a/core/common/src/main/java/alluxio/security/authorization/DefaultAccessControlList.java b/core/common/src/main/java/alluxio/security/authorization/DefaultAccessControlList.java
@@ -16,7 +16,6 @@
 
 import com.google.common.base.Objects;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -101,7 +100,7 @@ public Pair<AccessControlList, DefaultAccessControlList> generateChildDirACL() {
    * @param entry the entry to be removed
    */
   @Override
-  public void removeEntry(AclEntry entry) throws IOException {
+  public void removeEntry(AclEntry entry) {
     switch (entry.getType()) {
       case NAMED_USER:
       case NAMED_GROUP:

diff --git a/core/common/src/main/java/alluxio/security/authorization/ExtendedACLEntries.java b/core/common/src/main/java/alluxio/security/authorization/ExtendedACLEntries.java
@@ -16,7 +16,6 @@
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -97,7 +96,7 @@ public boolean hasExtended() {
    *
    * @param entry the entry to be removed
    */
-  public void removeEntry(AclEntry entry) throws IOException {
+  public void removeEntry(AclEntry entry) {
     switch (entry.getType()) {
       case NAMED_USER:
         mNamedUserActions.remove(entry.getSubject());
@@ -107,8 +106,7 @@ public void removeEntry(AclEntry entry) throws IOException {
         return;
       case MASK:
         if (hasExtended()) {
-          // cannot remove the mask if it is extended.
+          throw new IllegalStateException(
-          throw new IOException(
               "Deleting the mask for extended ACLs is not allowed. entry: " + entry);
         } else {
           mMaskActions = new AclActions();

diff --git a/core/common/src/main/java/alluxio/wire/SetAclAction.java b/core/common/src/main/java/alluxio/wire/SetAclAction.java
@@ -19,7 +19,6 @@
 
 /**
  * Represents the possible actions for setting ACL.
- *
  */
 @PublicApi
 @ThreadSafe

diff --git a/core/pom.xml b/core/pom.xml
@@ -32,8 +32,6 @@
   <properties>
     <!-- These need to be defined here as well as in the parent pom so that mvn can run
          properly from sub-project directories -->
-    <license.header.path>${project.parent.basedir}/build/license/</license.header.path>
+    <build.path>${project.parent.basedir}/build</build.path>
-    <checkstyle.path>${project.parent.basedir}/build/checkstyle/</checkstyle.path>
-    <findbugs.path>${project.parent.basedir}/build/findbugs/</findbugs.path>
   </properties>
 </project>
diff --git a/core/protobuf/pom.xml b/core/protobuf/pom.xml
@@ -25,9 +25,7 @@
   <properties>
     <!-- The following paths need to be defined here as well as in the parent pom so that mvn can -->
     <!-- run properly from sub-project directories -->
-    <license.header.path>${project.parent.parent.basedir}/build/license/</license.header.path>
+    <build.path>${project.parent.parent.basedir}/build</build.path>
-    <checkstyle.path>${project.parent.parent.basedir}/build/checkstyle/</checkstyle.path>
-    <findbugs.path>${project.parent.parent.basedir}/build/findbugs/</findbugs.path>
     <failIfNoTests>false</failIfNoTests>
     <!-- The shading prefix should match the artifact ID, replacing '-' with '.' -->
     <shading.prefix>alluxio.core.protobuf</shading.prefix>