You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by vi...@apache.org on 2014/04/11 22:16:10 UTC
svn commit: r1586766 - in /hadoop/common:
branches/branch-2.4/hadoop-yarn-project/
branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/
br...
Author: vinodkv
Date: Fri Apr 11 20:16:10 2014
New Revision: 1586766
URL: http://svn.apache.org/r1586766
Log:
YARN-1883. Merged into branch-2.4 also.
svn merge --ignore-ancestry -c 1582862 ../../trunk/ onto branch-2.4.
Fixed CHANGES.txt entries too.
Modified:
hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt?rev=1586766&r1=1586765&r2=1586766&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt Fri Apr 11 20:16:10 2014
@@ -20,6 +20,9 @@ Release 2.4.1 - UNRELEASED
YARN-1905. TestProcfsBasedProcessTree must only run on Linux. (cnauroth)
+ YARN-1883. TestRMAdminService fails due to inconsistent entries in
+ UserGroups (Mit Desai via jeagles)
+
YARN-1908. Fixed DistributedShell to not fail in secure clusters. (Vinod
Kumar Vavilapalli and Jian He via vinodkv)
Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java?rev=1586766&r1=1586765&r2=1586766&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java (original)
+++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java Fri Apr 11 20:16:10 2014
@@ -90,6 +90,9 @@ public class TestRMAdminService {
fs.delete(tmpDir, true);
fs.mkdirs(workingPath);
fs.mkdirs(tmpDir);
+
+ // reset the groups to what it default test settings
+ MockUnixGroupsMapping.resetGroups();
}
@After
@@ -785,12 +788,7 @@ public class TestRMAdminService {
private static class MockUnixGroupsMapping implements
GroupMappingServiceProvider {
- @SuppressWarnings("serial")
- private static List<String> group = new ArrayList<String>() {{
- add("test_group_A");
- add("test_group_B");
- add("test_group_C");
- }};
+ private static List<String> group = new ArrayList<String>();
@Override
public List<String> getGroups(String user) throws IOException {
@@ -813,6 +811,13 @@ public class TestRMAdminService {
group.add("test_group_E");
group.add("test_group_F");
}
+
+ public static void resetGroups() {
+ group.clear();
+ group.add("test_group_A");
+ group.add("test_group_B");
+ group.add("test_group_C");
+ }
}
}
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1586766&r1=1586765&r2=1586766&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Fri Apr 11 20:16:10 2014
@@ -35,9 +35,6 @@ Release 2.5.0 - UNRELEASED
YARN-1136. Replace junit.framework.Assert with org.junit.Assert (Chen He
via jeagles)
- YARN-1883. TestRMAdminService fails due to inconsistent entries in
- UserGroups (Mit Desai via jeagles)
-
YARN-1889. In Fair Scheduler, avoid creating objects on each call to
AppSchedulable comparator (Hong Zhiguo via Sandy Ryza)
@@ -76,6 +73,9 @@ Release 2.4.1 - UNRELEASED
YARN-1905. TestProcfsBasedProcessTree must only run on Linux. (cnauroth)
+ YARN-1883. TestRMAdminService fails due to inconsistent entries in
+ UserGroups (Mit Desai via jeagles)
+
YARN-1908. Fixed DistributedShell to not fail in secure clusters. (Vinod
Kumar Vavilapalli and Jian He via vinodkv)
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1586766&r1=1586765&r2=1586766&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Fri Apr 11 20:16:10 2014
@@ -50,9 +50,6 @@ Release 2.5.0 - UNRELEASED
YARN-1136. Replace junit.framework.Assert with org.junit.Assert (Chen He
via jeagles)
- YARN-1883. TestRMAdminService fails due to inconsistent entries in
- UserGroups (Mit Desai via jeagles)
-
YARN-1889. In Fair Scheduler, avoid creating objects on each call to
AppSchedulable comparator (Hong Zhiguo via Sandy Ryza)
@@ -91,6 +88,9 @@ Release 2.4.1 - UNRELEASED
YARN-1905. TestProcfsBasedProcessTree must only run on Linux. (cnauroth)
+ YARN-1883. TestRMAdminService fails due to inconsistent entries in
+ UserGroups (Mit Desai via jeagles)
+
YARN-1908. Fixed DistributedShell to not fail in secure clusters. (Vinod
Kumar Vavilapalli and Jian He via vinodkv)