falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rostafiyc...@apache.org
Subject git commit: FALCON-811 falcon superuser should be used instead of admin. Contributed by Raghav Kumar Gautam
Date Mon, 20 Oct 2014 12:51:03 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master 0db944c87 -> b4cd214c7


FALCON-811 falcon superuser should be used instead of admin. Contributed by Raghav Kumar Gautam


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/b4cd214c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/b4cd214c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/b4cd214c

Branch: refs/heads/master
Commit: b4cd214c7b47e7c8ee17f77ac315c596887e1f86
Parents: 0db944c
Author: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Authored: Mon Oct 20 15:49:37 2014 +0300
Committer: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Committed: Mon Oct 20 15:49:37 2014 +0300

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                   |  3 +++
 falcon-regression/README.md                     | 12 ++++-----
 falcon-regression/merlin-core/README.md         | 21 ---------------
 .../core/enumsAndConstants/MerlinConstants.java | 14 +++++-----
 falcon-regression/merlin/README.md              | 28 --------------------
 .../regression/security/ClusterAclTest.java     |  6 ++---
 .../falcon/regression/security/FeedAclTest.java |  6 ++---
 .../regression/security/ProcessAclTest.java     |  6 ++---
 8 files changed, 26 insertions(+), 70 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b4cd214c/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index ea64cd5..88cd808 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -14,6 +14,9 @@ Trunk (Unreleased)
    via Samarth Gupta)
 
   IMPROVEMENTS
+   FALCON-811 falcon superuser should be used instead of admin (Raghav Kumar Gautam via Ruslan
+   Ostafiychuk)
+
    FALCON-812 all the entities must have acl (Raghav Kumar Gautam)
 
    FALCON-801 Increasing time to wait for instance (Paul Isaychuk)

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b4cd214c/falcon-regression/README.md
----------------------------------------------------------------------
diff --git a/falcon-regression/README.md b/falcon-regression/README.md
index b8139b4..691e17c 100644
--- a/falcon-regression/README.md
+++ b/falcon-regression/README.md
@@ -51,7 +51,7 @@ Populate it with prism related properties:
     prism.service_user = falcon
     prism.hadoop_url = node-1.example.com:8020
     prism.hadoop_location = /usr/lib/hadoop/bin/hadoop
-    prism.ivory_hostname = http://node-1.example.com:15443
+    prism.ivory_hostname = http://node-1.example.com:15000
     prism.storeLocation = hdfs://node-1.example.com:8020/apps/falcon
 
 Specify the clusters that you would be using for testing:
@@ -68,7 +68,7 @@ For each cluster specify properties:
     cluster1.password = rgautam
     cluster1.hadoop_url = node-1.example.com:8020
     cluster1.hadoop_location = /usr/lib/hadoop/bin/hadoop
-    cluster1.ivory_hostname = http://node-1.example.com:15443
+    cluster1.ivory_hostname = http://node-1.example.com:15000
     cluster1.cluster_readonly = webhdfs://node-1.example.com:50070
     cluster1.cluster_execute = node-1.example.com:8032
     cluster1.cluster_write = hdfs://node-1.example.com:8020
@@ -103,8 +103,8 @@ Security Tests:
 ACL tests require multiple user account setup:
 
     other.user.name=root
-    admin.user.name=falcon
-    admin2.user.name=falcon2
+    falcon.super.user.name=falcon
+    falcon.super2.user.name=falcon2
 
 ACL tests also require group name of the current user:
 
@@ -113,8 +113,8 @@ ACL tests also require group name of the current user:
 For testing with kerberos set keytabs properties for different users:
 
     current_user_keytab=/home/qa/hadoopqa/keytabs/qa.headless.keytab
-    admin.user.keytab=/home/qa/hadoopqa/keytabs/falcon.headless.keytab
-    admin2.user.keytab=/home/qa/hadoopqa/keytabs/falcon2.headless.keytab
+    falcon.super.user.keytab=/home/qa/hadoopqa/keytabs/falcon.headless.keytab
+    falcon.super2.user.keytab=/home/qa/hadoopqa/keytabs/falcon2.headless.keytab
     other.user.keytab=/home/qa/hadoopqa/keytabs/root.headless.keytab
 
 Automatic capture of oozie logs

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b4cd214c/falcon-regression/merlin-core/README.md
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/README.md b/falcon-regression/merlin-core/README.md
deleted file mode 100644
index 99f2c12..0000000
--- a/falcon-regression/merlin-core/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-merlinEssentials
-================
-Merlin common module

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b4cd214c/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java
b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java
index e877803..dab5d2c 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java
@@ -48,11 +48,13 @@ public final class MerlinConstants {
     /** a user that does not belong to the group of current user. */
     public static final String DIFFERENT_USER = Config.getProperty("other.user.name", "root");
 
-    /** falcon admin user: the user that started falcon prism/server processes. */
-    public static final String ADMIN_USER_NAME = Config.getProperty("admin.user.name", "falcon");
+    /** falcon super user. */
+    public static final String FALCON_SUPER_USER_NAME =
+            Config.getProperty("falcon.super.user.name", "falcon");
 
-    /** a user that belongs to falcon admin group but is not same as falcon admin user. */
-    public static final String ADMIN2_USER_NAME = Config.getProperty("admin2.user.name",
"falcon2");
+    /** a user that belongs to falcon super user group but is not FALCON_SUPER_USER_NAME.
*/
+    public static final String FALCON_SUPER_USER2_NAME =
+            Config.getProperty("falcon.super.user2.name", "falcon2");
     private static final String USER_2_NAME_STR = "user2_name";
     private static final String USER_2_KEYTAB_STR = "user2_keytab";
     public static final String USER2_NAME;
@@ -77,8 +79,8 @@ public final class MerlinConstants {
         keyTabMap = new HashMap<String, String>();
         keyTabMap.put(CURRENT_USER_NAME, currentUserKeytab);
         keyTabMap.put(user2Name, user2Keytab);
-        keyTabMap.put(ADMIN_USER_NAME, Config.getProperty("admin.user.keytab"));
-        keyTabMap.put(ADMIN2_USER_NAME, Config.getProperty("admin2.user.keytab"));
+        keyTabMap.put(FALCON_SUPER_USER_NAME, Config.getProperty("falcon.super.user.keytab"));
+        keyTabMap.put(FALCON_SUPER_USER2_NAME, Config.getProperty("falcon.super.user2.keytab"));
         keyTabMap.put(DIFFERENT_USER, Config.getProperty("other.user.keytab"));
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b4cd214c/falcon-regression/merlin/README.md
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/README.md b/falcon-regression/merlin/README.md
deleted file mode 100644
index 4fac557..0000000
--- a/falcon-regression/merlin/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-FalconRegression
-===============
-/* Comments */
-falcon regression test
-=======
-merlin
-======
-
-Apache Falcon Test Automation Framework
->>>>>>> 173df032e019fbb8c2fb122cff328a23935cb3b3

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b4cd214c/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java
index bbcb43d..de873cd 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java
@@ -95,7 +95,7 @@ public class ClusterAclTest extends BaseTestClass {
     @DataProvider(name = "generateUserReadOpsPermissions")
     public Object[][] generateUserReadOpsPermissions() {
         final Object[][] allowedCombinations = MathUtil.crossProduct(
-            new String[]{MerlinConstants.ADMIN_USER_NAME, MerlinConstants.ADMIN2_USER_NAME,
+            new String[]{MerlinConstants.FALCON_SUPER_USER_NAME, MerlinConstants.FALCON_SUPER_USER2_NAME,
                 MerlinConstants.USER2_NAME},
             new EntityOp[]{EntityOp.dependency, EntityOp.listing, EntityOp.definition},
             new Boolean[]{true}
@@ -132,8 +132,8 @@ public class ClusterAclTest extends BaseTestClass {
     public Object[][] generateUserAndDeletePermission() {
         return new Object[][] {
             //first element is username, second element indicates if deletion is allowed
-            {MerlinConstants.ADMIN_USER_NAME, true},
-            {MerlinConstants.ADMIN2_USER_NAME, true},
+            {MerlinConstants.FALCON_SUPER_USER_NAME, true},
+            {MerlinConstants.FALCON_SUPER_USER2_NAME, true},
             {MerlinConstants.USER2_NAME, true},
             {"root", false},
         };

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b4cd214c/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java
index 18f548c..b756a95 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java
@@ -97,7 +97,7 @@ public class FeedAclTest extends BaseTestClass {
         final EntityOp[] falconReadOps = {EntityOp.status, EntityOp.dependency,
             EntityOp.listing, EntityOp.definition};
         final Object[][] allowedCombinations = MathUtil.crossProduct(
-            new String[]{MerlinConstants.ADMIN_USER_NAME, MerlinConstants.ADMIN2_USER_NAME,
+            new String[]{MerlinConstants.FALCON_SUPER_USER_NAME, MerlinConstants.FALCON_SUPER_USER2_NAME,
                 MerlinConstants.USER2_NAME},
             falconReadOps,
             new Boolean[]{true}
@@ -139,7 +139,7 @@ public class FeedAclTest extends BaseTestClass {
             EntityOp.schedule, EntityOp.submitAndSchedule};
 
         final Object[][] allowedCombinations = MathUtil.crossProduct(
-            new String[]{MerlinConstants.ADMIN_USER_NAME, MerlinConstants.ADMIN2_USER_NAME,
+            new String[]{MerlinConstants.FALCON_SUPER_USER_NAME, MerlinConstants.FALCON_SUPER_USER2_NAME,
                 MerlinConstants.USER2_NAME},
             falconEditOps,
             new Boolean[]{true}
@@ -182,7 +182,7 @@ public class FeedAclTest extends BaseTestClass {
     public Object[][] generateUserScheduledEditOpsPermission() {
 
         final Object[][] allowedCombinations = MathUtil.crossProduct(
-            new String[]{MerlinConstants.ADMIN_USER_NAME, MerlinConstants.ADMIN2_USER_NAME,
+            new String[]{MerlinConstants.FALCON_SUPER_USER_NAME, MerlinConstants.FALCON_SUPER_USER2_NAME,
                 MerlinConstants.USER2_NAME},
             new EntityOp[]{EntityOp.delete, EntityOp.update, EntityOp.suspend, EntityOp.resume},
             new Boolean[]{true}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b4cd214c/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java
index c9191af..e2b0fee 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java
@@ -96,7 +96,7 @@ public class ProcessAclTest extends BaseTestClass {
         final EntityOp[] falconReadOps = {EntityOp.status, EntityOp.dependency,
             EntityOp.listing, EntityOp.definition};
         final Object[][] allowedCombinations = MathUtil.crossProduct(
-            new String[]{MerlinConstants.ADMIN_USER_NAME, MerlinConstants.ADMIN2_USER_NAME,
+            new String[]{MerlinConstants.FALCON_SUPER_USER_NAME, MerlinConstants.FALCON_SUPER_USER2_NAME,
                 MerlinConstants.USER2_NAME},
             falconReadOps,
             new Boolean[]{true}
@@ -138,7 +138,7 @@ public class ProcessAclTest extends BaseTestClass {
             EntityOp.schedule, EntityOp.submitAndSchedule};
 
         final Object[][] allowedCombinations = MathUtil.crossProduct(
-            new String[]{MerlinConstants.ADMIN_USER_NAME, MerlinConstants.ADMIN2_USER_NAME,
+            new String[]{MerlinConstants.FALCON_SUPER_USER_NAME, MerlinConstants.FALCON_SUPER_USER2_NAME,
                 MerlinConstants.USER2_NAME},
             falconEditOps,
             new Boolean[]{true}
@@ -180,7 +180,7 @@ public class ProcessAclTest extends BaseTestClass {
     public Object[][] generateUserScheduledEditOpsPermission() {
 
         final Object[][] allowedCombinations = MathUtil.crossProduct(
-            new String[]{MerlinConstants.ADMIN_USER_NAME, MerlinConstants.ADMIN2_USER_NAME,
+            new String[]{MerlinConstants.FALCON_SUPER_USER_NAME, MerlinConstants.FALCON_SUPER_USER2_NAME,
                 MerlinConstants.USER2_NAME},
             new EntityOp[]{EntityOp.delete, EntityOp.update, EntityOp.suspend, EntityOp.resume},
             new Boolean[]{true}


Mime
View raw message