adding a rudimentary integration test that specifies localhost as the…

… server to write.

clients/unshaded/src/main/java/tachyon/client/ClientOptions.java

@@ -17,7 +17,6 @@
 
 import tachyon.Constants;
 import tachyon.conf.TachyonConf;
-import tachyon.thrift.NetAddress;
 
 /**
  * Represents the set of operation specific configuration options a user can pass into a Tachyon
@@ -36,7 +35,7 @@ public static class Builder {
     /** How this operation should interact with the under storage */
     private UnderStorageType mUnderStorageType;
     /** Worker location to write data, if not possible, the operation will fail */
-    private NetAddress mLocation;
+    private String mHostname;
 
     /**
      * @param conf Tachyon configuration
@@ -47,15 +46,15 @@ public Builder(TachyonConf conf) {
           conf.getEnum(Constants.USER_DEFAULT_TACHYON_STORAGE_TYPE, TachyonStorageType.class);
       mUnderStorageType =
           conf.getEnum(Constants.USER_DEFAULT_UNDER_STORAGE_TYPE, UnderStorageType.class);
-      mLocation = null;
+      mHostname = null;
     }
 
     /**
-     * @param location the location to use
+     * @param hostname the hostname to use
      * @return the builder
      */
-    public Builder setLocation(NetAddress location) {
-      mLocation = location;
+    public Builder setLocation(String hostname) {
+      mHostname = hostname;
       return this;
     }
 
@@ -111,7 +110,7 @@ public ClientOptions build() {
   private final long mBlockSize;
   private final TachyonStorageType mTachyonStorageType;
   private final UnderStorageType mUnderStorageType;
-  private final NetAddress mLocation;
+  private final String mHostname;
 
   /**
    * @return the default <code>ClientOptions</code>
@@ -124,7 +123,7 @@ private ClientOptions(ClientOptions.Builder builder) {
     mBlockSize = builder.mBlockSize;
     mTachyonStorageType = builder.mTachyonStorageType;
     mUnderStorageType = builder.mUnderStorageType;
-    mLocation = builder.mLocation;
+    mHostname = builder.mHostname;
   }
 
   /**
@@ -149,9 +148,9 @@ public UnderStorageType getUnderStorageType() {
   }
 
   /**
-   * @return the location
+   * @return the Hostname
    */
-  public NetAddress getLocation() {
-    return mLocation;
+  public String getHostname() {
+    return mHostname;
   }
 }

clients/unshaded/src/main/java/tachyon/client/file/FileOutStream.java

@@ -31,7 +31,6 @@
 import tachyon.client.UnderStorageType;
 import tachyon.client.block.BlockStoreContext;
 import tachyon.client.block.BufferedBlockOutStream;
-import tachyon.thrift.NetAddress;
 import tachyon.underfs.UnderFileSystem;
 import tachyon.util.io.PathUtils;
 import tachyon.worker.WorkerClient;
@@ -56,7 +55,7 @@ public final class FileOutStream extends OutputStream implements Cancelable {
 
   private boolean mCanceled;
   private boolean mClosed;
-  private NetAddress mLocation;
+  private String mHostname;
   private boolean mShouldCacheCurrentBlock;
   private BufferedBlockOutStream mCurrentBlockOutStream;
   private List<BufferedBlockOutStream> mPreviousBlockOutStreams;
@@ -90,7 +89,7 @@ public FileOutStream(long fileId, ClientOptions options) throws IOException {
     }
     mClosed = false;
     mCanceled = false;
-    mLocation = options.getLocation();
+    mHostname = options.getHostname();
     mShouldCacheCurrentBlock = mTachyonStorageType.isStore();
   }
 
@@ -231,12 +230,8 @@ private void getNextBlock() throws IOException {
     }
 
     if (mTachyonStorageType.isStore()) {
-      String hostname = null;
-      if (null != mLocation) {
-        hostname = mLocation.getHost();
-      }
       mCurrentBlockOutStream =
-          mContext.getTachyonBlockStore().getOutStream(getNextBlockId(), mBlockSize, hostname);
+          mContext.getTachyonBlockStore().getOutStream(getNextBlockId(), mBlockSize, mHostname);
       mShouldCacheCurrentBlock = true;
     }
   }

integration-tests/src/test/java/tachyon/client/FileOutStreamIntegrationTest.java

@@ -43,6 +43,7 @@
 import tachyon.underfs.UnderFileSystemCluster;
 import tachyon.util.io.BufferUtils;
 import tachyon.util.io.PathUtils;
+import tachyon.util.network.NetworkAddressUtils;
 import tachyon.worker.WorkerContext;
 
 /**
@@ -61,6 +62,7 @@ public class FileOutStreamIntegrationTest {
   private static ClientOptions sWriteBoth;
   private static ClientOptions sWriteTachyon;
   private static ClientOptions sWriteUnderStore;
+  private static ClientOptions sWriteLocal;
 
   private TachyonFileSystem mTfs = null;
   private TachyonConf mMasterTachyonConf;
@@ -105,6 +107,10 @@ public final void before() throws Exception {
     sWriteUnderStore =
         new ClientOptions.Builder(mMasterTachyonConf).setStorageTypes(TachyonStorageType
             .NO_STORE, UnderStorageType.PERSIST).setBlockSize(BLOCK_SIZE_BYTES).build();
+    sWriteLocal = 
+        new ClientOptions.Builder(mMasterTachyonConf).setStorageTypes(TachyonStorageType.STORE,
+            UnderStorageType.PERSIST).setBlockSize(BLOCK_SIZE_BYTES)
+            .setLocation(NetworkAddressUtils.getLocalHostName(ClientContext.getConf())).build();
   }
 
   @BeforeClass
@@ -218,6 +224,23 @@ private void writeTest3Util(TachyonURI filePath, ClientOptions op, int len) thro
     checkWrite(filePath, op.getUnderStorageType(), len, len / 2 * 2);
   }
 
+  /**
+   * Test writing to a file and specify the location to be localhost.
+   *
+   * @throws IOException
+   * @throws InterruptedException
+   */
+  @Test
+  public void writeSpecifyLocalTest() throws IOException, InterruptedException {
+    TachyonURI filePath = new TachyonURI(PathUtils.uniqPath());
+    int len = 2;
+    FileOutStream os = mTfs.getOutStream(filePath, sWriteLocal);
+    os.write((byte) 0);
+    os.write((byte) 1);
+    os.close();
+    checkWrite(filePath, sWriteLocal.getUnderStorageType(), len, len);
+  }
+
   /**
    * Test writing to a file for longer than HEARTBEAT_INTERVAL_MS to make sure the sessionId doesn't
    * change. Tracks [TACHYON-171].