You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by br...@apache.org on 2013/08/23 23:33:03 UTC
svn commit: r1517062 - in /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3: Nfs3Constant.java Nfs3Interface.java

Author: brandonli
Date: Fri Aug 23 21:33:03 2013
New Revision: 1517062

URL: http://svn.apache.org/r1517062
Log:
HDFS-4947. Merging change r1517049 from branch-2

Modified:
    hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Constant.java
    hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Interface.java

Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Constant.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Constant.java?rev=1517062&r1=1517061&r2=1517062&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Constant.java (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Constant.java Fri Aug 23 21:33:03 2013
@@ -189,4 +189,16 @@ public class Nfs3Constant {
   public final static int CREATE_UNCHECKED = 0;
   public final static int CREATE_GUARDED = 1;
   public final static int CREATE_EXCLUSIVE = 2;
+  
+  public static final String EXPORTS_ALLOWED_HOSTS_SEPARATOR = ";";
+  /** Allowed hosts for nfs exports */
+  public static final String EXPORTS_ALLOWED_HOSTS_KEY = "hdfs.nfs.exports.allowed.hosts";
+  public static final String EXPORTS_ALLOWED_HOSTS_KEY_DEFAULT = "* rw";
+  /** Size for nfs exports cache */
+  public static final String EXPORTS_CACHE_SIZE_KEY = "hdfs.nfs.exports.cache.size";
+  public static final int EXPORTS_CACHE_SIZE_DEFAULT = 512;
+  /** Expiration time for nfs exports cache entry */
+  public static final String EXPORTS_CACHE_EXPIRYTIME_MILLIS_KEY = "hdfs.nfs.exports.cache.expirytime.millis";
+  public static final long EXPORTS_CACHE_EXPIRYTIME_MILLIS_DEFAULT = 15 * 60 * 1000; // 15 min
+
 }

Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Interface.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Interface.java?rev=1517062&r1=1517061&r2=1517062&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Interface.java (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Interface.java Fri Aug 23 21:33:03 2013
@@ -17,6 +17,8 @@
  */
 package org.apache.hadoop.nfs.nfs3;
 
+import java.net.InetAddress;
+
 import org.apache.hadoop.nfs.nfs3.response.NFS3Response;
 import org.apache.hadoop.oncrpc.RpcAuthSys;
 import org.apache.hadoop.oncrpc.XDR;
@@ -31,53 +33,54 @@ public interface Nfs3Interface {
   public NFS3Response nullProcedure();
   
   /** GETATTR: Get file attributes */
-  public NFS3Response getattr(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response getattr(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** SETATTR: Set file attributes */
-  public NFS3Response setattr(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response setattr(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** LOOKUP: Lookup filename */
-  public NFS3Response lookup(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response lookup(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** ACCESS: Check access permission  */
-  public NFS3Response access(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response access(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** READ: Read from file */
-  public NFS3Response read(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response read(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** WRITE: Write to file */
-  public NFS3Response write(XDR xdr, Channel channel, int xid, RpcAuthSys authSys);
+  public NFS3Response write(XDR xdr, Channel channel, int xid,
+      RpcAuthSys authSys, InetAddress client);
   
   /** CREATE: Create a file  */
-  public NFS3Response create(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response create(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** MKDIR: Create a directory  */
-  public NFS3Response mkdir(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response mkdir(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** REMOVE: Remove a file  */
-  public NFS3Response remove(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response remove(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** RMDIR: Remove a directory  */
-  public NFS3Response rmdir(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response rmdir(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** RENAME: Rename a file or directory */
-  public NFS3Response rename(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response rename(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** SYMLINK: Create a symbolic link  */
-  public NFS3Response symlink(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response symlink(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** READDIR: Read From directory */
-  public NFS3Response readdir(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response readdir(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** FSSTAT: Get dynamic file system information  */
-  public NFS3Response fsstat(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response fsstat(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** FSINFO: Get static file system information */
-  public NFS3Response fsinfo(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response fsinfo(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** PATHCONF: Retrieve POSIX information */
-  public NFS3Response pathconf(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response pathconf(XDR xdr, RpcAuthSys authSys, InetAddress client);
   
   /** COMMIT: Commit cached data on a server to stable storage  */
-  public NFS3Response commit(XDR xdr, RpcAuthSys authSys);
+  public NFS3Response commit(XDR xdr, RpcAuthSys authSys, InetAddress client);
 }