hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vino...@apache.org
Subject svn commit: r941571 - in /hadoop/mapreduce/branches/branch-0.21: ./ src/docs/src/documentation/content/xdocs/ src/java/ src/java/org/apache/hadoop/mapreduce/
Date Thu, 06 May 2010 04:36:59 GMT
Author: vinodkv
Date: Thu May  6 04:36:59 2010
New Revision: 941571

URL: http://svn.apache.org/viewvc?rev=941571&view=rev
Log:
MAPREDUCE-1747. Remove documentation for the 'unstable' job-acls feature. Contributed by Vinod
Kumar Vavilapalli.

Modified:
    hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
    hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/cluster_setup.xml
    hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
    hadoop/mapreduce/branches/branch-0.21/src/java/mapred-default.xml
    hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobACL.java
    hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobStatus.java
    hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/MRConfig.java
    hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java

Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=941571&r1=941570&r2=941571&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Thu May  6 04:36:59 2010
@@ -721,6 +721,10 @@ Release 0.21.0 - Unreleased
     MAPREDUCE-1749. Move configuration strings out of JobContext so that it
     can be made public stable. (omalley)
 
+    MAPREDUCE-1747. Remove documentation for the 'unstable' job-acls feature.
+    This thus removes the incompatible change/feature job-acls from branch 0.21
+    (vinodkv)
+
   OPTIMIZATIONS
 
     MAPREDUCE-270. Fix the tasktracker to optionally send an out-of-band

Modified: hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/cluster_setup.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/cluster_setup.xml?rev=941571&r1=941570&r2=941571&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/cluster_setup.xml
(original)
+++ hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/cluster_setup.xml
Thu May  6 04:36:59 2010
@@ -272,17 +272,6 @@
 		        TaskTrackers.
 		      </td>
   		    </tr>
-        <tr>
-          <td>mapreduce.cluster.job-authorization-enabled</td>
-          <td>Boolean, specifying whether job ACLs are supported for 
-              authorizing view and modification of a job</td>
-          <td>
-            If <em>true</em>, job ACLs would be checked while viewing or
-            modifying a job. More details are available at 
-            <a href ="mapred_tutorial.html#Job+Authorization">Job Authorization</a>.

-          </td>
-        </tr>
-  		    
 		  </table>      
 
           <p>Typically all the above parameters are marked as 

Modified: hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml?rev=941571&r1=941570&r2=941571&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
(original)
+++ hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
Thu May  6 04:36:59 2010
@@ -1600,60 +1600,6 @@
             </li>
           </ul>
         </section>
-        
-        <section>
-          <title>Job Authorization</title>
-          <p>Job level authorization is enabled on the cluster, if the configuration
-          <code>mapreduce.cluster.job-authorization-enabled</code> is set to
-          true. When enabled, access control checks are done by the JobTracker
-          and the TaskTracker before allowing users to view
-          job details or to modify a job using Map/Reduce APIs,
-          CLI or web user interfaces.</p>
-         
-          <p>A job submitter can specify access control lists for viewing or
-          modifying a job via the configuration properties
-          <code>mapreduce.job.acl-view-job</code> and
-          <code>mapreduce.job.acl-modify-job</code> respectively. By default,

-          nobody is given access in these properties.</p> 
-          
-          <p>However, irrespective of the ACLs configured, a job's owner,
-          the superuser and the members of an admin configured supergroup
-          (<code>mapreduce.cluster.permissions.supergroup</code>) always
-          have access to view and modify a job.</p>
-          
-          <p> A job view ACL authorizes users against the configured 
-          <code>mapreduce.job.acl-view-job</code> before returning possibly 
-          sensitive information about a job, like: </p>
-          <ul>
-            <li> job level counters </li>
-            <li> task level counters </li>
-            <li> tasks's diagnostic information </li>
-            <li> task logs displayed on the TaskTracker web UI </li>
-            <li> job.xml showed by the JobTracker's web UI </li>
-          </ul>
-          <p>Other information about a job, like its status and its profile, 
-          is accessible to all users, without requiring authorization.</p>
-          
-          <p> A job modification ACL authorizes users against the configured
-          <code>mapreduce.job.acl-modify-job</code> before allowing
-          modifications to jobs, like: </p>
-          <ul>
-            <li> killing a job </li>
-            <li> killing/failing a task of a job </li>
-            <li> setting the priority of a job </li>
-          </ul>
-          <p>These operations are also protected by the queue level ACL,
-          "acl-administer-jobs", configured via mapred-queue-acls.xml. The caller
-          will be authorized against both queue level ACLs and job level ACLs,
-          depending on what is enabled.</p>
-          
-          <p>The format of a job level ACL is the same as the format for a
-          queue level ACL as defined in the
-          <a href ="cluster_setup.html#Configuring+the+Hadoop+Daemons">
-          Cluster Setup</a> documentation.
-          </p>
-          
-        </section>
       </section>
 
       <section>

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/mapred-default.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/mapred-default.xml?rev=941571&r1=941570&r2=941571&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/mapred-default.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/mapred-default.xml Thu May  6 04:36:59
2010
@@ -931,73 +931,6 @@
 </property>
 
 <property>
-  <name>mapreduce.cluster.job-authorization-enabled</name>
-  <value>false</value>
-  <description> Boolean flag that specifies if job-level authorization checks
-  should be enabled on the jobs submitted to the cluster.  Job-level
-  authorization is enabled if this flag is set to true or disabled otherwise.
-  It is disabled by default. If enabled, access control checks are made by
-  JobTracker and TaskTracker when requests are made by users for viewing the
-  job-details (See mapreduce.job.acl-view-job) or for modifying the job
-  (See mapreduce.job.acl-modify-job) using Map/Reduce APIs, RPCs or via the
-  console and web user interfaces.
-  </description>
-</property>
-
-<property>
-  <name>mapreduce.job.acl-modify-job</name>
-  <value></value>
-  <description> Job specific access-control list for 'modifying' the job. It
-    is only used if authorization is enabled in Map/Reduce by setting the
-    configuration property mapreduce.cluster.job-authorization-enabled to true.
-    This specifies the list of users and/or groups who can do modification
-    operations on the job. For specifying a list of users and groups the
-    format to use is "user1,user2 group1,group". If set to '*', it allows all
-    users/groups to modify this job. If set to '', it allows none. This
-    configuration is used to guard all the modifications with respect to this
-    job and takes care of all the following operations:
-      o killing this job
-      o killing a task of this job, failing a task of this job
-      o setting the priority of this job
-    Each of these operations are also protected by the per-queue level ACL
-    "acl-administer-jobs" configured via mapred-queues.xml. So a caller should
-    have the authorization to satisfy both the queue-level ACL and the
-    job-level ACL.
-
-    Irrespective of this ACL configuration, job-owner, superuser and members
-    of supergroup configured on JobTracker via 
-    "mapreduce.cluster.permissions.supergroup",
-    can do all the modification operations.
-
-    By default, nobody else besides job-owner, superuser/supergroup can
-    perform modification operations on a job that they don't own.
-  </description>
-</property>
-
-<property>
-  <name>mapreduce.job.acl-view-job</name>
-  <value></value>
-  <description> Job specific access-control list for 'viewing' the job. It is
-    only used if authorization is enabled in Map/Reduce by setting the
-    configuration property mapreduce.cluster.job-authorization-enabled to true.
-    This specifies the list of users and/or groups who can view private details
-    about the job. For specifying a list of users and groups the
-    format to use is "user1,user2 group1,group". If set to '*', it allows all
-    users/groups to modify this job. If set to '', it allows none. This
-    configuration is used to guard some of the job-views and at present only
-    protects APIs that can return possibly sensitive information of the
-    job-owner like
-      o job-level counters
-      o task-level counters
-      o tasks' diagnostic information
-      o task-logs displayed on the TaskTracker web-UI and
-      o job.xml showed by the JobTracker's web-UI
-    Every other piece information of jobs is still accessible by any other
-    users, for e.g., JobStatus, JobProfile, list of jobs in the queue, etc.
-  </description>
-</property>
-
-<property>
   <name>mapreduce.tasktracker.indexcache.mb</name>
   <value>10</value>
   <description> The maximum memory that a task tracker allows for the 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobACL.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobACL.java?rev=941571&r1=941570&r2=941571&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobACL.java
(original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobACL.java
Thu May  6 04:36:59 2010
@@ -19,9 +19,6 @@ package org.apache.hadoop.mapreduce;
 
 import org.apache.hadoop.classification.*;
 
-/**
- * Job related ACLs
- */
 @InterfaceAudience.Private
 public enum JobACL {
 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobStatus.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobStatus.java?rev=941571&r1=941570&r2=941571&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobStatus.java
(original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobStatus.java
Thu May  6 04:36:59 2010
@@ -230,11 +230,6 @@ public class JobStatus implements Writab
     this.schedulingInfo = schedulingInfo;
   }
 
-  /**
-   * Set the job acls.
-   * 
-   * @param acls {@link Map} from {@link JobACL} to {@link AccessControlList}
-   */
   protected synchronized void setJobACLs(Map<JobACL, AccessControlList> acls) {
     this.jobACLs = acls;
   }
@@ -297,11 +292,6 @@ public class JobStatus implements Writab
    return schedulingInfo;
   }
 
-  /**
-   * Get the job acls.
-   * 
-   * @return a {@link Map} from {@link JobACL} to {@link AccessControlList}
-   */
   public synchronized Map<JobACL, AccessControlList> getJobACLs() {
     return jobACLs;
   }

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/MRConfig.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/MRConfig.java?rev=941571&r1=941570&r2=941571&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/MRConfig.java
(original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/MRConfig.java
Thu May  6 04:36:59 2010
@@ -35,7 +35,7 @@ public interface MRConfig {
   public static final String MAPMEMORY_MB = "mapreduce.cluster.mapmemory.mb";
   public static final String REDUCEMEMORY_MB = 
     "mapreduce.cluster.reducememory.mb";
-  public static final String JOB_LEVEL_AUTHORIZATION_ENABLING_FLAG = 
+  static final String JOB_LEVEL_AUTHORIZATION_ENABLING_FLAG = 
     "mapreduce.cluster.job-authorization-enabled";
   public static final String MR_SUPERGROUP =
     "mapreduce.cluster.permissions.supergroup";

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java?rev=941571&r1=941570&r2=941571&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java
(original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java
Thu May  6 04:36:59 2010
@@ -264,8 +264,8 @@ public interface MRJobConfig {
 
   public static final String JOB_CANCEL_DELEGATION_TOKEN = "mapreduce.job.complete.cancel.delegation.tokens";
 
-  public static final String JOB_ACL_VIEW_JOB = "mapreduce.job.acl-view-job";
+  static final String JOB_ACL_VIEW_JOB = "mapreduce.job.acl-view-job";
 
-  public static final String JOB_ACL_MODIFY_JOB = "mapreduce.job.acl-modify-job";
+  static final String JOB_ACL_MODIFY_JOB = "mapreduce.job.acl-modify-job";
 
-}
\ No newline at end of file
+}



Mime
View raw message