Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-13723. Occasional "Should be different group" error in TestRefreshUserMappings#testGroupMappingRefresh. Contributed by Siyao Meng. 

(cherry picked from commit 162228e8db)
This commit is contained in:
Wei-Chiu Chuang 2018-07-11 10:02:08 -07:00 committed by Jim Brennan
parent 1b046fb26f
commit e48b91c83c
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java
View File

@ -73,7 +73,8 @@ import org.slf4j.LoggerFactory;
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"}) @InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
@InterfaceStability.Evolving @InterfaceStability.Evolving
public class Groups { public class Groups {
private static final Logger LOG = LoggerFactory.getLogger(Groups.class); @VisibleForTesting
static final Logger LOG = LoggerFactory.getLogger(Groups.class);
private final GroupMappingServiceProvider impl; private final GroupMappingServiceProvider impl;
@ -308,6 +309,7 @@ public class Groups {
*/ */
@Override @Override
public List<String> load(String user) throws Exception { public List<String> load(String user) throws Exception {
LOG.debug("GroupCacheLoader - load.");
TraceScope scope = null; TraceScope scope = null;
Tracer tracer = Tracer.curThreadTracer(); Tracer tracer = Tracer.curThreadTracer();
if (tracer != null) { if (tracer != null) {
@ -346,6 +348,7 @@ public class Groups {
public ListenableFuture<List<String>> reload(final String key, public ListenableFuture<List<String>> reload(final String key,
List<String> oldValue) List<String> oldValue)
throws Exception { throws Exception {
LOG.debug("GroupCacheLoader - reload (async).");
if (!reloadGroupsInBackground) { if (!reloadGroupsInBackground) {
return super.reload(key, oldValue); return super.reload(key, oldValue);
} }

19
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java
View File

@ -45,6 +45,8 @@ import org.apache.hadoop.hdfs.tools.DFSAdmin;
import org.apache.hadoop.security.authorize.AuthorizationException; import org.apache.hadoop.security.authorize.AuthorizationException;
import org.apache.hadoop.security.authorize.DefaultImpersonationProvider; import org.apache.hadoop.security.authorize.DefaultImpersonationProvider;
import org.apache.hadoop.security.authorize.ProxyUsers; import org.apache.hadoop.security.authorize.ProxyUsers;
import org.apache.hadoop.test.GenericTestUtils;
import org.slf4j.event.Level;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -93,6 +95,8 @@ public class TestRefreshUserMappings {
FileSystem.setDefaultUri(config, "hdfs://localhost:" + "0"); FileSystem.setDefaultUri(config, "hdfs://localhost:" + "0");
cluster = new MiniDFSCluster.Builder(config).build(); cluster = new MiniDFSCluster.Builder(config).build();
cluster.waitActive(); cluster.waitActive();
GenericTestUtils.setLogLevel(Groups.LOG, Level.DEBUG);
} }
@After @After
@ -114,21 +118,24 @@ public class TestRefreshUserMappings {
String [] args = new String[]{"-refreshUserToGroupsMappings"}; String [] args = new String[]{"-refreshUserToGroupsMappings"};
Groups groups = Groups.getUserToGroupsMappingService(config); Groups groups = Groups.getUserToGroupsMappingService(config);
String user = UserGroupInformation.getCurrentUser().getUserName(); String user = UserGroupInformation.getCurrentUser().getUserName();
System.out.println("first attempt:");
System.out.println("First attempt:");
List<String> g1 = groups.getGroups(user); List<String> g1 = groups.getGroups(user);
String [] str_groups = new String [g1.size()]; String [] str_groups = new String [g1.size()];
g1.toArray(str_groups); g1.toArray(str_groups);
System.out.println(Arrays.toString(str_groups)); System.out.println(Arrays.toString(str_groups));
System.out.println("second attempt, should be same:"); System.out.println("Second attempt, should be the same:");
List<String> g2 = groups.getGroups(user); List<String> g2 = groups.getGroups(user);
g2.toArray(str_groups); g2.toArray(str_groups);
System.out.println(Arrays.toString(str_groups)); System.out.println(Arrays.toString(str_groups));
for(int i=0; i<g2.size(); i++) { for(int i=0; i<g2.size(); i++) {
assertEquals("Should be same group ", g1.get(i), g2.get(i)); assertEquals("Should be same group ", g1.get(i), g2.get(i));
} }
// Test refresh command
admin.run(args); admin.run(args);
System.out.println("third attempt(after refresh command), should be different:"); System.out.println("Third attempt(after refresh command), should be different:");
List<String> g3 = groups.getGroups(user); List<String> g3 = groups.getGroups(user);
g3.toArray(str_groups); g3.toArray(str_groups);
System.out.println(Arrays.toString(str_groups)); System.out.println(Arrays.toString(str_groups));
@ -137,9 +144,9 @@ public class TestRefreshUserMappings {
g1.get(i).equals(g3.get(i))); g1.get(i).equals(g3.get(i)));
} }
// test time out // Test timeout
Thread.sleep(groupRefreshTimeoutSec*1100); Thread.sleep(groupRefreshTimeoutSec * 1500);
System.out.println("fourth attempt(after timeout), should be different:"); System.out.println("Fourth attempt(after timeout), should be different:");
List<String> g4 = groups.getGroups(user); List<String> g4 = groups.getGroups(user);
g4.toArray(str_groups); g4.toArray(str_groups);
System.out.println(Arrays.toString(str_groups)); System.out.println(Arrays.toString(str_groups));