Author: brandonli
Date: Sat Aug 31 21:37:27 2013
New Revision: 1519231
URL: http://svn.apache.org/r1519231
Log:
HDFS-5136. Merging change r1519229 from branch-2
Added:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/security/
- copied from r1519229,
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/security/
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/security/AccessPrivilege.java
- copied unchanged from r1519229,
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/security/AccessPrivilege.java
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/security/NfsExports.java
- copied unchanged from r1519229,
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/security/NfsExports.java
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/security/
- copied from r1519229,
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/security/
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/security/TestNfsExports.java
- copied unchanged from r1519229,
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/security/TestNfsExports.java
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/mount/MountResponse.java
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Constant.java
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/mount/MountResponse.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/mount/MountResponse.java?rev=1519231&r1=1519230&r2=1519231&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/mount/MountResponse.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/mount/MountResponse.java
Sat Aug 31 21:37:27 2013
@@ -19,6 +19,7 @@ package org.apache.hadoop.mount;
import java.util.List;
+import org.apache.hadoop.nfs.security.NfsExports;
import org.apache.hadoop.oncrpc.RpcAcceptedReply;
import org.apache.hadoop.oncrpc.XDR;
import org.apache.hadoop.oncrpc.RpcAuthInfo.AuthFlavor;
@@ -59,15 +60,28 @@ public class MountResponse {
xdr.writeBoolean(false); // Value follows no
return xdr;
}
-
+
/** Response for RPC call {@link MountInterface.MNTPROC#EXPORT} */
- public static XDR writeExportList(XDR xdr, int xid, List<String> exports) {
+ public static XDR writeExportList(XDR xdr, int xid, List<String> exports,
+ List<NfsExports> hostMatcher) {
+ assert (exports.size() == hostMatcher.size());
+
RpcAcceptedReply.voidReply(xdr, xid);
- for (String export : exports) {
+ for (int i = 0; i < exports.size(); i++) {
xdr.writeBoolean(true); // Value follows - yes
- xdr.writeString(export);
- xdr.writeInt(0);
+ xdr.writeString(exports.get(i));
+
+ // List host groups
+ String[] hostGroups = hostMatcher.get(i).getHostGroupList();
+ if (hostGroups.length > 0) {
+ for (int j = 0; j < hostGroups.length; j++) {
+ xdr.writeBoolean(true); // Value follows - yes
+ xdr.writeVariableOpaque(hostGroups[j].getBytes());
+ }
+ }
+ xdr.writeBoolean(false); // Value follows - no more group
}
+
xdr.writeBoolean(false); // Value follows - no
return xdr;
}
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=1519231&r1=1519230&r2=1519231&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
Sat Aug 31 21:37:27 2013
@@ -192,13 +192,13 @@ public class Nfs3Constant {
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 =
"dfs.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 String EXPORTS_CACHE_SIZE_KEY =
"dfs.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 String EXPORTS_CACHE_EXPIRYTIME_MILLIS_KEY =
"dfs.nfs.exports.cache.expirytime.millis";
public static final long EXPORTS_CACHE_EXPIRYTIME_MILLIS_DEFAULT = 15 * 60 *
1000; // 15 min
public static final String FILE_DUMP_DIR_KEY = "dfs.nfs3.dump.dir";
