Replacing client-side SetAttributeOptions with server-side version an…

…d renaming SetStateEntry to SetAttributeEntry.

core/server/src/main/java/tachyon/master/MasterSource.java

@@ -89,8 +89,8 @@ public class MasterSource implements Source {
           mMetricRegistry.counter(MetricRegistry.name("MountOps"));
   private final Counter mRenamePathOps =
       mMetricRegistry.counter(MetricRegistry.name("RenamePathOps"));
-  private final Counter mSetStateOps =
-          mMetricRegistry.counter(MetricRegistry.name("SetStateOps"));
+  private final Counter mSetAttributeOps =
+          mMetricRegistry.counter(MetricRegistry.name("SetAttributeOps"));
   private final Counter mUnmountOps =
       mMetricRegistry.counter(MetricRegistry.name("UnmountOps"));
 
@@ -403,12 +403,12 @@ public void incRenamePathOps(long n) {
   }
 
   /**
-   * Increments the counter of set state RPCs.
+   * Increments the counter of set attribute RPCs.
    *
    * @param n the increment
    */
-  public void incSetStateOps(long n) {
-    mSetStateOps.inc(n);
+  public void incSetAttributeOps(long n) {
+    mSetAttributeOps.inc(n);
   }
 
   /**

core/server/src/main/java/tachyon/master/file/FileSystemMaster.java

@@ -42,7 +42,6 @@
 
 import tachyon.Constants;
 import tachyon.TachyonURI;
-import tachyon.client.file.options.SetAttributeOptions;
 import tachyon.collections.Pair;
 import tachyon.collections.PrefixList;
 import tachyon.conf.TachyonConf;
@@ -78,6 +77,7 @@
 import tachyon.master.file.options.CreateDirectoryOptions;
 import tachyon.master.file.options.CreateFileOptions;
 import tachyon.master.file.options.SetAclOptions;
+import tachyon.master.file.options.SetAttributeOptions;
 import tachyon.master.journal.Journal;
 import tachyon.master.journal.JournalOutputStream;
 import tachyon.master.journal.JournalProtoUtils;
@@ -94,7 +94,7 @@
 import tachyon.proto.journal.File.ReinitializeFileEntry;
 import tachyon.proto.journal.File.RenameEntry;
 import tachyon.proto.journal.File.SetAclEntry;
-import tachyon.proto.journal.File.SetStateEntry;
+import tachyon.proto.journal.File.SetAttributeEntry;
 import tachyon.proto.journal.Journal.JournalEntry;
 import tachyon.security.User;
 import tachyon.security.authentication.PlainSaslServer;
@@ -248,9 +248,9 @@ public void processJournalEntry(JournalEntry entry) throws IOException {
       } catch (FileAlreadyCompletedException e) {
         throw new RuntimeException(e);
       }
-    } else if (innerEntry instanceof SetStateEntry) {
+    } else if (innerEntry instanceof SetAttributeEntry) {
       try {
-        setStateFromEntry((SetStateEntry) innerEntry);
+        setAttributeFromEntry((SetAttributeEntry) innerEntry);
       } catch (FileDoesNotExistException e) {
         throw new RuntimeException(e);
       }
@@ -1705,34 +1705,34 @@ public void resetFile(long fileId)
   }
 
   /**
-   * Sets the file state.
+   * Sets the file attribute.
    *
-   * @param path the path to set state
+   * @param path the path to set attribute for
    * @param options attributes to be set, see {@link SetAttributeOptions}
    * @throws FileDoesNotExistException if the file does not exist
    * @throws AccessControlException if permission checking fails
    * @throws InvalidPathException if the given path is invalid
    */
-  public void setState(TachyonURI path, SetAttributeOptions options)
+  public void setAttribute(TachyonURI path, SetAttributeOptions options)
       throws FileDoesNotExistException, AccessControlException, InvalidPathException {
-    MasterContext.getMasterSource().incSetStateOps(1);
+    MasterContext.getMasterSource().incSetAttributeOps(1);
     synchronized (mInodeTree) {
       checkPermission(FileSystemAction.WRITE, path, false);
       long fileId = mInodeTree.getInodeByPath(path).getId();
       long opTimeMs = System.currentTimeMillis();
-      setStateInternal(fileId, opTimeMs, options);
-      SetStateEntry.Builder setState =
-          SetStateEntry.newBuilder().setId(fileId).setOpTimeMs(opTimeMs);
-      if (options.hasPinned()) {
-        setState.setPinned(options.getPinned());
+      setAttributeInternal(fileId, opTimeMs, options);
+      SetAttributeEntry.Builder builder =
+          SetAttributeEntry.newBuilder().setId(fileId).setOpTimeMs(opTimeMs);
+      if (options.getPinned() != null) {
+        builder.setPinned(options.getPinned());
       }
-      if (options.hasTtl()) {
-        setState.setTtl(options.getTtl());
+      if (options.getTtl() != null) {
+        builder.setTtl(options.getTtl());
       }
-      if (options.hasPersisted()) {
-        setState.setPersisted(options.getPersisted());
+      if (options.getPersisted() != null) {
+        builder.setPersisted(options.getPersisted());
       }
-      writeJournalEntry(JournalEntry.newBuilder().setSetState(setState).build());
+      writeJournalEntry(JournalEntry.newBuilder().setSetAttribute(builder).build());
       flushJournal();
     }
   }
@@ -1891,7 +1891,7 @@ private List<PersistFile> pollFilesToCheckpoint(long workerId)
   public synchronized FileSystemCommand workerHeartbeat(long workerId, List<Long> persistedFiles)
       throws FileDoesNotExistException, InvalidPathException, AccessControlException {
     for (long fileId : persistedFiles) {
-      setState(getPath(fileId), SetAttributeOptions.defaults().setPersisted(true));
+      setAttribute(getPath(fileId), new SetAttributeOptions.Builder().setPersisted(true).build());
     }
 
     // get the files for the given worker to checkpoint
@@ -1912,14 +1912,14 @@ public synchronized FileSystemCommand workerHeartbeat(long workerId, List<Long>
    * @param options the method options
    * @throws FileDoesNotExistException
    */
-  private void setStateInternal(long fileId, long opTimeMs, SetAttributeOptions options)
+  private void setAttributeInternal(long fileId, long opTimeMs, SetAttributeOptions options)
       throws FileDoesNotExistException {
     Inode inode = mInodeTree.getInodeById(fileId);
-    if (options.hasPinned()) {
+    if (options.getPinned() != null) {
       mInodeTree.setPinned(inode, options.getPinned(), opTimeMs);
       inode.setLastModificationTimeMs(opTimeMs);
     }
-    if (options.hasTtl()) {
+    if (options.getTtl() != null) {
       Preconditions.checkArgument(inode.isFile(), PreconditionMessage.TTL_ONLY_FOR_FILE);
       long ttl = options.getTtl();
       InodeFile file = (InodeFile) inode;
@@ -1930,7 +1930,7 @@ private void setStateInternal(long fileId, long opTimeMs, SetAttributeOptions op
         file.setLastModificationTimeMs(opTimeMs);
       }
     }
-    if (options.hasPersisted()) {
+    if (options.getPersisted() != null) {
       Preconditions.checkArgument(inode.isFile(), PreconditionMessage.PERSIST_ONLY_FOR_FILE);
       Preconditions.checkArgument(((InodeFile) inode).isCompleted(),
           PreconditionMessage.FILE_TO_PERSIST_MUST_BE_COMPLETE);
@@ -1953,9 +1953,8 @@ private void setStateInternal(long fileId, long opTimeMs, SetAttributeOptions op
    * @param entry the entry to use
    * @throws FileDoesNotExistException if the file does not exist
    */
-  // TODO(calvin): Rename SetStateEntry to SetAttributeEntry, do not rely on client side options.
-  private void setStateFromEntry(SetStateEntry entry) throws FileDoesNotExistException {
-    SetAttributeOptions options = SetAttributeOptions.defaults();
+  private void setAttributeFromEntry(SetAttributeEntry entry) throws FileDoesNotExistException {
+    SetAttributeOptions.Builder options = new SetAttributeOptions.Builder();
     if (entry.hasPinned()) {
       options.setPinned(entry.getPinned());
     }
@@ -1965,7 +1964,7 @@ private void setStateFromEntry(SetStateEntry entry) throws FileDoesNotExistExcep
     if (entry.hasPersisted()) {
       options.setPersisted(entry.getPersisted());
     }
-    setStateInternal(entry.getId(), entry.getOpTimeMs(), options);
+    setAttributeInternal(entry.getId(), entry.getOpTimeMs(), options.build());
   }
 
   /**

core/server/src/main/java/tachyon/master/file/FileSystemMasterClientServiceHandler.java

@@ -24,14 +24,14 @@
 
 import tachyon.Constants;
 import tachyon.TachyonURI;
-import tachyon.client.file.options.SetAttributeOptions;
 import tachyon.exception.FileDoesNotExistException;
 import tachyon.exception.InvalidPathException;
 import tachyon.exception.TachyonException;
 import tachyon.master.file.options.CompleteFileOptions;
 import tachyon.master.file.options.CreateDirectoryOptions;
 import tachyon.master.file.options.CreateFileOptions;
 import tachyon.master.file.options.SetAclOptions;
+import tachyon.master.file.options.SetAttributeOptions;
 import tachyon.thrift.CompleteFileTOptions;
 import tachyon.thrift.CreateDirectoryTOptions;
 import tachyon.thrift.CreateFileTOptions;
@@ -47,7 +47,6 @@
  * This class is a Thrift handler for file system master RPCs invoked by a Tachyon client.
  */
 @NotThreadSafe // TODO(jiri): make thread-safe (c.f. TACHYON-1664)
-//TODO(dong): server side should use a separate SetAttributeOptions in tachyon.master.file.options
 public final class FileSystemMasterClientServiceHandler implements
     FileSystemMasterClientService.Iface {
   private final FileSystemMaster mFileSystemMaster;
@@ -231,8 +230,7 @@ public void scheduleAsyncPersist(String path) throws TachyonTException {
   @Override
   public void setAttribute(String path, SetAttributeTOptions options) throws TachyonTException {
     try {
-      mFileSystemMaster.setState(new TachyonURI(path),
-          SetAttributeOptions.fromThriftOptions(options));
+      mFileSystemMaster.setAttribute(new TachyonURI(path), new SetAttributeOptions(options));
     } catch (TachyonException e) {
       throw e.toTachyonTException();
     }

core/server/src/main/java/tachyon/master/file/options/SetAttributeOptions.java

@@ -0,0 +1,161 @@
+/*
+ * Licensed to the University of California, Berkeley 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 tachyon.master.file.options;
+
+import javax.annotation.concurrent.NotThreadSafe;
+
+import tachyon.conf.TachyonConf;
+import tachyon.master.MasterContext;
+import tachyon.thrift.SetAttributeTOptions;
+
+/**
+ * Method option for setting the attributes.
+ */
+@NotThreadSafe
+public class SetAttributeOptions {
+  /**
+   * Builder for {@link SetAttributeOptions}
+   */
+  public static class Builder {
+    private Boolean mPinned;
+    private Long mTtl;
+    private Boolean mPersisted;
+    private long mOperationTimeMs;
+
+    /**
+     * Creates a new builder for {@link SetAttributeOptions}.
+     */
+    public Builder() {
+      this(MasterContext.getConf());
+    }
+
+    /**
+     * Creates a new builder for {@link SetAttributeOptions}.
+     *
+     * @param conf a Tachyon configuration
+     */
+    public Builder(TachyonConf conf) {
+      mPinned = null;
+      mTtl = null;
+      mPersisted = null;
+      mOperationTimeMs = System.currentTimeMillis();
+    }
+
+    /**
+     * @param pinned the pinned flag value to use
+     * @return the builder
+     */
+    public Builder setPinned(boolean pinned) {
+      mPinned = pinned;
+      return this;
+    }
+
+    /**
+     * @param ttl the time-to-live (in seconds) to use
+     * @return the builder
+     */
+    public Builder setTtl(long ttl) {
+      mTtl = ttl;
+      return this;
+    }
+
+    /**
+     * @param persisted the persisted flag value to use
+     * @return the builder
+     */
+    public Builder setPersisted(boolean persisted) {
+      mPersisted = persisted;
+      return this;
+    }
+
+    /**
+     * @param operationTimeMs the operation time to use
+     * @return the builder
+     */
+    public Builder setOperationTimeMs(long operationTimeMs) {
+      mOperationTimeMs = operationTimeMs;
+      return this;
+    }
+
+    /**
+     * Builds a new instance of {@link SetAttributeOptions}.
+     *
+     * @return a {@link SetAttributeOptions} instance
+     */
+    public SetAttributeOptions build() {
+      return new SetAttributeOptions(this);
+    }
+  }
+
+  private final Boolean mPinned;
+  private final Long mTtl;
+  private final Boolean mPersisted;
+  private long mOperationTimeMs;
+
+  /**
+   * Constructs a new method option for setting the attributes.
+   *
+   * @param options the options for setting the attributes
+   */
+  public SetAttributeOptions(SetAttributeTOptions options) {
+    mPinned = options.isSetPinned() ? options.isPinned() : null;
+    mTtl = options.isSetTtl() ? options.getTtl() : null;
+    mPersisted = options.isSetPersisted() ? options.isPersisted() : null;
+    mOperationTimeMs = System.currentTimeMillis();
+  }
+
+  /**
+   * @return the default {@link SetAttributeOptions}
+   */
+  public static SetAttributeOptions defaults() {
+    return new Builder(MasterContext.getConf()).build();
+  }
+
+  private SetAttributeOptions(Builder builder) {
+    mPinned = builder.mPinned;
+    mTtl = builder.mTtl;
+    mPersisted = builder.mPersisted;
+    mOperationTimeMs = builder.mOperationTimeMs;
+  }
+
+  /**
+   * @return the pinned flag value
+   */
+  public Boolean getPinned() {
+    return mPinned;
+  }
+
+  /**
+   * @return the time-to-live (in seconds)
+   */
+  public Long getTtl() {
+    return mTtl;
+  }
+
+  /**
+   * @return the recursive flag value
+   */
+  public Boolean getPersisted() {
+    return mPersisted;
+  }
+
+  /**
+   * @return the operation time
+   */
+  public long getOperationTimeMs() {
+    return mOperationTimeMs;
+  }
+}

core/server/src/main/java/tachyon/master/journal/JournalProtoUtils.java

@@ -71,8 +71,8 @@ public static Message unwrap(JournalEntry entry) {
         return entry.getRename();
       case SET_ACL:
         return entry.getSetAcl();
-      case SET_STATE:
-        return entry.getSetState();
+      case SET_ATTRIBUTE:
+        return entry.getSetAttribute();
       case ENTRY_NOT_SET:
         // This could mean that the field was never set, or it was set with a different version of
         // this message. Given the history of the JournalEntry protobuf message, the keys of the