Repository: hadoop Updated Branches: refs/heads/branch-2 7e583a382 -> daa768534
HADOOP-13178. TestShellBasedIdMapping.testStaticMapUpdate doesn't work on OS X (Kai Sasaki via aw) (cherry picked from commit d8c1fd1944160ad5b5d093731ae987d701802321) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/daa76853 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/daa76853 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/daa76853 Branch: refs/heads/branch-2 Commit: daa768534409f08a83759634b5c3966e32e6f170 Parents: 7e583a3 Author: Allen Wittenauer <[email protected]> Authored: Sat May 21 10:00:36 2016 -0700 Committer: Akira Ajisaka <[email protected]> Committed: Mon Jul 24 11:57:10 2017 +0900 ---------------------------------------------------------------------- .../apache/hadoop/security/ShellBasedIdMapping.java | 2 +- .../hadoop/security/TestShellBasedIdMapping.java | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/daa76853/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java index da930b4..b61d37d 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java @@ -85,7 +85,7 @@ public class ShellBasedIdMapping implements IdMappingServiceProvider { private static final Pattern EMPTY_LINE = Pattern.compile("^\\s*$"); private static final Pattern COMMENT_LINE = Pattern.compile("^\\s*#.*$"); private static final Pattern MAPPING_LINE = - Pattern.compile("^(uid|gid)\\s+(\\d+)\\s+(\\d+)\\s*(#.*)?$"); + Pattern.compile("^(uid|gid)\\s+(\\d+)\\s+(0|-?[1-9]\\d*)\\s*(#.*)?$"); final private long timeout; http://git-wip-us.apache.org/repos/asf/hadoop/blob/daa76853/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestShellBasedIdMapping.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestShellBasedIdMapping.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestShellBasedIdMapping.java index 3b533d2..e395247 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestShellBasedIdMapping.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestShellBasedIdMapping.java @@ -148,8 +148,9 @@ public class TestShellBasedIdMapping { // getUid() incrIdMapping.clearNameMaps(); uidNameMap = refIdMapping.getUidNameMap(); - { - BiMap.Entry<Integer, String> me = uidNameMap.entrySet().iterator().next(); + for (BiMap.Entry<Integer, String> me : uidNameMap.entrySet()) { + tempStaticMapFile.delete(); + incrIdMapping.clearNameMaps(); Integer id = me.getKey(); String name = me.getValue(); @@ -174,8 +175,9 @@ public class TestShellBasedIdMapping { // getGid() incrIdMapping.clearNameMaps(); gidNameMap = refIdMapping.getGidNameMap(); - { - BiMap.Entry<Integer, String> me = gidNameMap.entrySet().iterator().next(); + for (BiMap.Entry<Integer, String> me : gidNameMap.entrySet()) { + tempStaticMapFile.delete(); + incrIdMapping.clearNameMaps(); Integer id = me.getKey(); String name = me.getValue(); @@ -189,7 +191,11 @@ public class TestShellBasedIdMapping { Integer rid = id + 10000; String smapStr = "gid " + rid + " " + id; // Sleep a bit to avoid that two changes have the same modification time - try {Thread.sleep(1000);} catch (InterruptedException e) {} + try { + Thread.sleep(100); + } catch (InterruptedException e) { + // Do nothing + } createStaticMapFile(tempStaticMapFile, smapStr); // Now the id found for "name" should be the id specified by --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
