From 194f52bbad29e4c5d0e7c5d7e1b41923f5faa2c6 Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Tue, 6 Dec 2011 01:37:25 +0000 Subject: [PATCH] Merge -c 1210738 from trunk to branch-0.23 to fix MAPREDUCE-3496. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1210739 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/mapred/JobQueueClient.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 862e743926b..90db6f7ec6e 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -197,6 +197,9 @@ Release 0.23.1 - Unreleased MAPREDUCE-3389. MRApps loads the 'mrapp-generated-classpath' file with classpath from the build machine. (tucu) + MAPREDUCE-3496. Fixed client to print queue acls in consistent order. + (Jonathan Eagles via acmurthy) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueClient.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueClient.java index e4dc3100778..47ebb9284a2 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueClient.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueClient.java @@ -22,6 +22,7 @@ import java.io.Writer; import java.util.List; import java.util.ArrayList; +import java.util.Arrays; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.security.UserGroupInformation; @@ -200,6 +201,7 @@ private void displayQueueAclsInfoForCurrentUser() throws IOException { for (QueueAclsInfo queueInfo : queueAclsInfoList) { System.out.print(queueInfo.getQueueName() + " "); String[] ops = queueInfo.getOperations(); + Arrays.sort(ops); int max = ops.length - 1; for (int j = 0; j < ops.length; j++) { System.out.print(ops[j].replaceFirst("acl-", ""));