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 sh...@apache.org on 2017/09/08 18:28:30 UTC
[1/3] hadoop git commit: HADOOP-13442. Optimize UGI group lookups.
Contributed by Daryn Sharp.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 0dca198f0 -> e89de1f82
HADOOP-13442. Optimize UGI group lookups. Contributed by Daryn Sharp.
(cherry picked from commit 94225152399e6e89fa7b4cff6d17d33e544329a3)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/aa760e96
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/aa760e96
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/aa760e96
Branch: refs/heads/branch-2.7
Commit: aa760e960c0c0a7cdb577388f43349d86c46e637
Parents: 0dca198
Author: Kihwal Lee <ki...@apache.org>
Authored: Thu Aug 4 10:49:19 2016 -0500
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Fri Sep 8 10:49:50 2017 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
.../java/org/apache/hadoop/fs/FileSystem.java | 4 +--
.../apache/hadoop/fs/viewfs/ViewFileSystem.java | 6 ++---
.../org/apache/hadoop/fs/viewfs/ViewFs.java | 12 ++++-----
.../org/apache/hadoop/io/SecureIOUtils.java | 3 +--
.../java/org/apache/hadoop/security/Groups.java | 26 +++++++++++++-----
.../hadoop/security/UserGroupInformation.java | 28 +++++++++++++-------
.../security/authorize/AccessControlList.java | 2 +-
.../security/TestUserGroupInformation.java | 6 +++--
9 files changed, 55 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa760e96/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index c3b1871..53125fe 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -8,6 +8,8 @@ Release 2.7.5 - UNRELEASED
IMPROVEMENTS
+ HADOOP-13442. Optimize UGI group lookups. (Daryn Sharp via kihwal, shv)
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa760e96/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
index 2e684f5..f0b6ede 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
@@ -26,7 +26,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -2185,12 +2184,11 @@ public abstract class FileSystem extends Configured implements Closeable {
FsPermission perm = stat.getPermission();
UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
String user = ugi.getShortUserName();
- List<String> groups = Arrays.asList(ugi.getGroupNames());
if (user.equals(stat.getOwner())) {
if (perm.getUserAction().implies(mode)) {
return;
}
- } else if (groups.contains(stat.getGroup())) {
+ } else if (ugi.getGroups().contains(stat.getGroup())) {
if (perm.getGroupAction().implies(mode)) {
return;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa760e96/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
index 4eabb66..b612cab 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
@@ -829,7 +829,7 @@ public class ViewFileSystem extends FileSystem {
public FileStatus getFileStatus(Path f) throws IOException {
checkPathIsSlash(f);
return new FileStatus(0, true, 0, 0, creationTime, creationTime,
- PERMISSION_555, ugi.getUserName(), ugi.getGroupNames()[0],
+ PERMISSION_555, ugi.getUserName(), ugi.getPrimaryGroupName(),
new Path(theInternalDir.fullPath).makeQualified(
myUri, ROOT_PATH));
@@ -850,7 +850,7 @@ public class ViewFileSystem extends FileSystem {
result[i++] = new FileStatus(0, false, 0, 0,
creationTime, creationTime, PERMISSION_555,
- ugi.getUserName(), ugi.getGroupNames()[0],
+ ugi.getUserName(), ugi.getPrimaryGroupName(),
link.getTargetLink(),
new Path(inode.fullPath).makeQualified(
myUri, null));
@@ -982,7 +982,7 @@ public class ViewFileSystem extends FileSystem {
public AclStatus getAclStatus(Path path) throws IOException {
checkPathIsSlash(path);
return new AclStatus.Builder().owner(ugi.getUserName())
- .group(ugi.getGroupNames()[0])
+ .group(ugi.getPrimaryGroupName())
.addEntries(AclUtil.getMinimalAcl(PERMISSION_555))
.stickyBit(false).build();
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa760e96/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java
index 7fb06f5..fd861bb 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java
@@ -844,14 +844,14 @@ public class ViewFs extends AbstractFileSystem {
public FileStatus getFileStatus(final Path f) throws IOException {
checkPathIsSlash(f);
return new FileStatus(0, true, 0, 0, creationTime, creationTime,
- PERMISSION_555, ugi.getUserName(), ugi.getGroupNames()[0],
+ PERMISSION_555, ugi.getUserName(), ugi.getPrimaryGroupName(),
new Path(theInternalDir.fullPath).makeQualified(
myUri, null));
}
@Override
public FileStatus getFileLinkStatus(final Path f)
- throws FileNotFoundException {
+ throws IOException {
// look up i internalDirs children - ignore first Slash
INode<AbstractFileSystem> inode =
theInternalDir.children.get(f.toUri().toString().substring(1));
@@ -864,13 +864,13 @@ public class ViewFs extends AbstractFileSystem {
INodeLink<AbstractFileSystem> inodelink =
(INodeLink<AbstractFileSystem>) inode;
result = new FileStatus(0, false, 0, 0, creationTime, creationTime,
- PERMISSION_555, ugi.getUserName(), ugi.getGroupNames()[0],
+ PERMISSION_555, ugi.getUserName(), ugi.getPrimaryGroupName(),
inodelink.getTargetLink(),
new Path(inode.fullPath).makeQualified(
myUri, null));
} else {
result = new FileStatus(0, true, 0, 0, creationTime, creationTime,
- PERMISSION_555, ugi.getUserName(), ugi.getGroupNames()[0],
+ PERMISSION_555, ugi.getUserName(), ugi.getPrimaryGroupName(),
new Path(inode.fullPath).makeQualified(
myUri, null));
}
@@ -915,7 +915,7 @@ public class ViewFs extends AbstractFileSystem {
result[i++] = new FileStatus(0, false, 0, 0,
creationTime, creationTime,
- PERMISSION_555, ugi.getUserName(), ugi.getGroupNames()[0],
+ PERMISSION_555, ugi.getUserName(), ugi.getPrimaryGroupName(),
link.getTargetLink(),
new Path(inode.fullPath).makeQualified(
myUri, null));
@@ -1049,7 +1049,7 @@ public class ViewFs extends AbstractFileSystem {
public AclStatus getAclStatus(Path path) throws IOException {
checkPathIsSlash(path);
return new AclStatus.Builder().owner(ugi.getUserName())
- .group(ugi.getGroupNames()[0])
+ .group(ugi.getPrimaryGroupName())
.addEntries(AclUtil.getMinimalAcl(PERMISSION_555))
.stickyBit(false).build();
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa760e96/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SecureIOUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SecureIOUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SecureIOUtils.java
index 1b092ec..ad238e6 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SecureIOUtils.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SecureIOUtils.java
@@ -23,7 +23,6 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.RandomAccessFile;
-import java.util.Arrays;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
@@ -276,7 +275,7 @@ public class SecureIOUtils {
UserGroupInformation.createRemoteUser(expectedOwner);
final String adminsGroupString = "Administrators";
success = owner.equals(adminsGroupString)
- && Arrays.asList(ugi.getGroupNames()).contains(adminsGroupString);
+ && ugi.getGroups().contains(adminsGroupString);
} else {
success = false;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa760e96/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java
index 9fd39b0..3c428b5 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java
@@ -18,14 +18,17 @@
package org.apache.hadoop.security;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Ticker;
@@ -33,6 +36,7 @@ import com.google.common.cache.CacheBuilder;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
+
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceAudience.Private;
@@ -42,7 +46,6 @@ import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.util.ReflectionUtils;
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.Timer;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -62,8 +65,8 @@ public class Groups {
private final GroupMappingServiceProvider impl;
private final LoadingCache<String, List<String>> cache;
- private final Map<String, List<String>> staticUserToGroupsMap =
- new HashMap<String, List<String>>();
+ private final AtomicReference<Map<String, List<String>>> staticMapRef =
+ new AtomicReference<>();
private final long cacheTimeout;
private final long negativeCacheTimeout;
private final long warningDeltaMs;
@@ -129,6 +132,8 @@ public class Groups {
CommonConfigurationKeys.HADOOP_USER_GROUP_STATIC_OVERRIDES_DEFAULT);
Collection<String> mappings = StringUtils.getStringCollection(
staticMapping, ";");
+ Map<String, List<String>> staticUserToGroupsMap =
+ new HashMap<String, List<String>>();
for (String users : mappings) {
Collection<String> userToGroups = StringUtils.getStringCollection(users,
"=");
@@ -147,6 +152,8 @@ public class Groups {
}
staticUserToGroupsMap.put(user, groups);
}
+ staticMapRef.set(
+ staticUserToGroupsMap.isEmpty() ? null : staticUserToGroupsMap);
}
private boolean isNegativeCacheEnabled() {
@@ -166,9 +173,12 @@ public class Groups {
*/
public List<String> getGroups(final String user) throws IOException {
// No need to lookup for groups of static users
- List<String> staticMapping = staticUserToGroupsMap.get(user);
- if (staticMapping != null) {
- return staticMapping;
+ Map<String, List<String>> staticUserToGroupsMap = staticMapRef.get();
+ if (staticUserToGroupsMap != null) {
+ List<String> staticMapping = staticUserToGroupsMap.get(user);
+ if (staticMapping != null) {
+ return staticMapping;
+ }
}
// Check the negative cache first
@@ -228,7 +238,9 @@ public class Groups {
throw noGroupsForUser(user);
}
- return groups;
+ // return immutable de-duped list
+ return Collections.unmodifiableList(
+ new ArrayList<>(new LinkedHashSet<>(groups)));
}
/**
http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa760e96/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
index 611b906..dd5e0f3 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
@@ -37,7 +37,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -1475,11 +1474,11 @@ public class UserGroupInformation {
}
public String getPrimaryGroupName() throws IOException {
- String[] groups = getGroupNames();
- if (groups.length == 0) {
+ List<String> groups = getGroups();
+ if (groups.isEmpty()) {
throw new IOException("There is no primary group for UGI " + this);
}
- return groups[0];
+ return groups.get(0);
}
/**
@@ -1592,26 +1591,35 @@ public class UserGroupInformation {
}
/**
+ * Get the group names for this user. {@ #getGroups(String)} is less
+ * expensive alternative when checking for a contained element.
+ * @return the list of users with the primary group first. If the command
+ * fails, it returns an empty list.
+ */
+ public String[] getGroupNames() {
+ List<String> groups = getGroups();
+ return groups.toArray(new String[groups.size()]);
+ }
+
+ /**
* Get the group names for this user.
* @return the list of users with the primary group first. If the command
* fails, it returns an empty list.
*/
- public synchronized String[] getGroupNames() {
+ public List<String> getGroups() {
ensureInitialized();
try {
- Set<String> result = new LinkedHashSet<String>
- (groups.getGroups(getShortUserName()));
- return result.toArray(new String[result.size()]);
+ return groups.getGroups(getShortUserName());
} catch (IOException ie) {
if (LOG.isDebugEnabled()) {
LOG.debug("Failed to get groups for user " + getShortUserName()
+ " by " + ie);
LOG.trace("TRACE", ie);
}
- return StringUtils.emptyStringArray;
+ return Collections.emptyList();
}
}
-
+
/**
* Return the username.
*/
http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa760e96/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AccessControlList.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AccessControlList.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AccessControlList.java
index b1b474b..a32a5fe 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AccessControlList.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AccessControlList.java
@@ -231,7 +231,7 @@ public class AccessControlList implements Writable {
if (allAllowed || users.contains(ugi.getShortUserName())) {
return true;
} else if (!groups.isEmpty()) {
- for(String group: ugi.getGroupNames()) {
+ for (String group : ugi.getGroups()) {
if (groups.contains(group)) {
return true;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa760e96/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
index d09a730..735f9a1 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
@@ -432,8 +432,10 @@ public class TestUserGroupInformation {
UserGroupInformation uugi =
UserGroupInformation.createUserForTesting(USER_NAME, GROUP_NAMES);
assertEquals(USER_NAME, uugi.getUserName());
- assertArrayEquals(new String[]{GROUP1_NAME, GROUP2_NAME, GROUP3_NAME},
- uugi.getGroupNames());
+ String[] expected = new String[]{GROUP1_NAME, GROUP2_NAME, GROUP3_NAME};
+ assertArrayEquals(expected, uugi.getGroupNames());
+ assertArrayEquals(expected, uugi.getGroups().toArray(new String[0]));
+ assertEquals(GROUP1_NAME, uugi.getPrimaryGroupName());
}
@SuppressWarnings("unchecked") // from Mockito mocks
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/3] hadoop git commit: HDFS-10738. Fix
TestRefreshUserMappings.testRefreshSuperUserGroupsConfiguration test failure.
Contributed by Rakesh R.
Posted by sh...@apache.org.
HDFS-10738. Fix TestRefreshUserMappings.testRefreshSuperUserGroupsConfiguration test failure. Contributed by Rakesh R.
(cherry picked from commit 0f701f433dd3be233bf53e856864c82349e8274e)
(cherry picked from commit 7f1879abe642219fce0328a8e96c983601d202b0)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b40b8a0a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b40b8a0a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b40b8a0a
Branch: refs/heads/branch-2.7
Commit: b40b8a0addb92bd09e8fb084d6e89507775eb962
Parents: aa760e9
Author: Kihwal Lee <ki...@apache.org>
Authored: Mon Aug 22 11:04:03 2016 -0500
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Fri Sep 8 10:52:58 2017 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 4 ++++
.../security/TestRefreshUserMappings.java | 20 ++++++++++++--------
2 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b40b8a0a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 3ce47d7..3213ad2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -25,6 +25,10 @@ Release 2.7.5 - UNRELEASED
HDFS-9107. Prevent NN's unrecoverable death spiral after full GC (Daryn
Sharp via Colin P. McCabe)
+ HDFS-10738. Fix
+ TestRefreshUserMappings.testRefreshSuperUserGroupsConfiguration
+ test failure. (Rakesh R via kihwal)
+
Release 2.7.4 - 2017-08-04
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b40b8a0a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java
index ca67245..a924de7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java
@@ -149,9 +149,13 @@ public class TestRefreshUserMappings {
@Test
public void testRefreshSuperUserGroupsConfiguration() throws Exception {
final String SUPER_USER = "super_user";
- final String [] GROUP_NAMES1 = new String [] {"gr1" , "gr2"};
- final String [] GROUP_NAMES2 = new String [] {"gr3" , "gr4"};
-
+ final List<String> groupNames1 = new ArrayList<>();
+ groupNames1.add("gr1");
+ groupNames1.add("gr2");
+ final List<String> groupNames2 = new ArrayList<>();
+ groupNames2.add("gr3");
+ groupNames2.add("gr4");
+
//keys in conf
String userKeyGroups = DefaultImpersonationProvider.getTestProvider().
getProxySuperuserGroupConfKey(SUPER_USER);
@@ -176,12 +180,12 @@ public class TestRefreshUserMappings {
when(ugi1.getUserName()).thenReturn("userL1");
when(ugi2.getUserName()).thenReturn("userL2");
-
+
// set groups for users
- when(ugi1.getGroupNames()).thenReturn(GROUP_NAMES1);
- when(ugi2.getGroupNames()).thenReturn(GROUP_NAMES2);
-
-
+ when(ugi1.getGroups()).thenReturn(groupNames1);
+ when(ugi2.getGroups()).thenReturn(groupNames2);
+
+
// check before
try {
ProxyUsers.authorize(ugi1, "127.0.0.1");
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/3] hadoop git commit: MAPREDUCE-6750. Fix
TestHSAdminServer#testRefreshSuperUserGroups (Kihwal Lee via Varun Saxena)
Posted by sh...@apache.org.
MAPREDUCE-6750. Fix TestHSAdminServer#testRefreshSuperUserGroups (Kihwal Lee via Varun Saxena)
(cherry picked from commit c4b77aed7e756dd463fd88141054ea0e3acd6396)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e89de1f8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e89de1f8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e89de1f8
Branch: refs/heads/branch-2.7
Commit: e89de1f829eefd6d1b99bb3b0a093302522492d2
Parents: b40b8a0
Author: Varun Saxena <va...@apache.org>
Authored: Tue Aug 9 23:35:44 2016 +0530
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Fri Sep 8 10:56:41 2017 -0700
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../apache/hadoop/mapreduce/v2/hs/server/TestHSAdminServer.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e89de1f8/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index ddee52f..72ef262 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -15,6 +15,9 @@ Release 2.7.5 - UNRELEASED
MAPREDUCE-6931. Remove TestDFSIO "Total Throughput" calculation.
(Dennis Huo via shv)
+ MAPREDUCE-6750. Fix TestHSAdminServer#testRefreshSuperUserGroups
+ (Kihwal Lee via Varun Saxena)
+
Release 2.7.4 - 2017-08-04
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e89de1f8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/server/TestHSAdminServer.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/server/TestHSAdminServer.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/server/TestHSAdminServer.java
index d831347..1eb1d1c 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/server/TestHSAdminServer.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/server/TestHSAdminServer.java
@@ -187,7 +187,8 @@ public class TestHSAdminServer {
when(ugi.getRealUser()).thenReturn(superUser);
when(superUser.getShortUserName()).thenReturn("superuser");
when(superUser.getUserName()).thenReturn("superuser");
- when(ugi.getGroupNames()).thenReturn(new String[] { "group3" });
+ when(ugi.getGroups())
+ .thenReturn(Arrays.asList(new String[] { "group3" }));
when(ugi.getUserName()).thenReturn("regularUser");
// Set super user groups not to include groups of regularUser
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org