----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/62449/ -----------------------------------------------------------
Review request for Ambari, Attila Magyar, Balázs Bence Sári, Eugene Chekanskiy, Jonathan Hurley, Laszlo Puskas, Nate Cole, and Sebastian Toader. Bugs: AMBARI-21919 https://issues.apache.org/jira/browse/AMBARI-21919 Repository: ambari Description ------- Kerberos identity references should use the "reference" attribute rather than rely on the "name" attribute to indicate the identity descriptor references some other identity descriptor. Either method should work on the backend, however the UI appears to not fully handle the "named" reference properly. The solution is to change ``` { "name": "/HDFS/NAMENODE/namenode_nn", "principal": { "configuration": "ranger-hdfs-audit/xasecure.audit.jaas.Client.option.principal" }, "keytab": { "configuration": "ranger-hdfs-audit/xasecure.audit.jaas.Client.option.keyTab" } } ``` by changing the "name" attribute to "reference" and adding a new "name" reference with a unique name relative to the scope of the identity descriptor. For example: ``` { "name":"hdfs_namenode_namenode_nn" "reference": "/HDFS/NAMENODE/namenode_nn", "principal": { "configuration": "ranger-hdfs-audit/xasecure.audit.jaas.Client.option.principal" }, "keytab": { "configuration": "ranger-hdfs-audit/xasecure.audit.jaas.Client.option.keyTab" } } ``` # NOTE: My apologies for the large patch. However, most of the changes are to `kerberos.json` files where there are one or more changes like: ``` "name": "/HDFS/NAMENODE/namenode_nn", ``` to ``` "name": "hdfs_namenode_namenode_nn" "reference": "/HDFS/NAMENODE/namenode_nn", ``` There are also a few other file changes, related to upgrading to Ambari 2.6.0, that may be more interesting to review: - ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/AbstractKerberosDescriptorContainer.java - ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosDescriptor.java - ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java - ambari-server/src/main/resources/kerberos_descriptor_schema.json - ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java Diffs ----- ambari-funtest/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json a555bb5b90 ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/AbstractKerberosDescriptorContainer.java 85d4f69ed8 ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosDescriptor.java a1d373bad6 ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java 0b9f2c4c98 ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/kerberos.json 7e3f449b74 ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/kerberos.json 94b1b14f8c ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/kerberos.json a6afda5fbe ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json 4fe4d3272f ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/kerberos.json e136bcf8e6 ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/kerberos.json 7d10ccc667 ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/kerberos.json 08af720165 ambari-server/src/main/resources/common-services/HAWQ/2.0.0/kerberos.json 4ed6b7871d ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json 63e929883c ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/kerberos.json 011921b192 ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json 1cf1603d47 ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/kerberos.json b5acf92f3f ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/kerberos.json c34026ae81 ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/kerberos.json af1130dbd1 ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/kerberos.json b4d0018e8e ambari-server/src/main/resources/common-services/KAFKA/0.10.0/kerberos.json b4d0018e8e ambari-server/src/main/resources/common-services/KAFKA/0.9.0/kerberos.json 247a602c71 ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/kerberos.json 6ab76106b6 ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/kerberos.json 6ab76106b6 ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/kerberos.json 2d8aa0dc52 ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/kerberos.json 9e0f12d48e ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/kerberos.json 1f87a6c81f ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/kerberos.json b3f932baf6 ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/kerberos.json d2e2ab8a10 ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/kerberos.json f1092f552b ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/kerberos.json 22dd6cb59f ambari-server/src/main/resources/common-services/PIG/0.16.1.3.0/kerberos.json 22dd6cb59f ambari-server/src/main/resources/common-services/RANGER/0.6.0/kerberos.json 1fc8acf9c6 ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/kerberos.json 1fc8acf9c6 ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/kerberos.json 208a04ddeb ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/kerberos.json 8bf4cd832e ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/kerberos.json 0ebeb7db6b ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/kerberos.json 0ebeb7db6b ambari-server/src/main/resources/common-services/SPARK/1.2.1/kerberos.json 96df126939 ambari-server/src/main/resources/common-services/SPARK/1.4.1/kerberos.json fb436578ba ambari-server/src/main/resources/common-services/SPARK/2.2.0/kerberos.json 9912af101d ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json a787d3320d ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json 692b557713 ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/kerberos.json a034411517 ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json a034411517 ambari-server/src/main/resources/common-services/STORM/1.1.0/kerberos.json a034411517 ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/kerberos.json 65dcd3366f ambari-server/src/main/resources/common-services/TEZ/0.9.0.3.0/kerberos.json 00c8ac5882 ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json 7315c093a0 ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json b1501b80d8 ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/kerberos.json b605c9de12 ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/kerberos.json b605c9de12 ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/kerberos.json 0a64ea526e ambari-server/src/main/resources/kerberos_descriptor_schema.json 34cdd497bb ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json 8618804e0b ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/kerberos.json 3e8451d467 ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/kerberos.json 5dfcb5e30a ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/kerberos.json 4c5bcdb8cb ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/kerberos.json 04ef946ffb ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/kerberos.json cbfac42a29 ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/kerberos.json ee7c7cff49 ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json 0e7a5de80d ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/kerberos.json 0c4507d7ab ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/kerberos.json 011921b192 ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json 766a0143dc ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/kerberos.json 044bd653b7 ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/kerberos.json 2d8aa0dc52 ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/kerberos.json 8bf4cd832e ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/kerberos.json 54ddf027c6 ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/kerberos.json 29cc00a3e7 ambari-server/src/main/resources/stacks/HDP/2.5/services/ZEPPELIN/kerberos.json b605c9de12 ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/kerberos.json 7d10ccc667 ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json 5b6b5737a7 ambari-server/src/main/resources/stacks/HDP/2.6/services/HDFS/kerberos.json b5acf92f3f ambari-server/src/main/resources/stacks/HDP/2.6/services/OOZIE/kerberos.json f1092f552b ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/kerberos.json c68d627201 ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json 8b6b41d678 ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json b79bac9805 ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/kerberos.json 4b9472b8ab ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/kerberos.json b605c9de12 ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/kerberos.json f1026f1a02 ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHDFS/kerberos.json 412950610a ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEYARN/kerberos.json b960dce6eb ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEZOOKEEPER/kerberos.json 0a64ea526e ambari-server/src/main/resources/stacks/PERF/1.0/services/GRUMPY/kerberos.json 335d9f3440 ambari-server/src/main/resources/stacks/PERF/1.0/services/HAPPY/kerberos.json 55389b0894 ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/kerberos.json 6ab76106b6 ambari-server/src/main/resources/stacks/PERF/1.0/services/SLEEPY/kerberos.json f22274f5c8 ambari-server/src/main/resources/stacks/PERF/1.0/services/SNOW/kerberos.json 7be70f7c67 ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java d7210c6c68 ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_ranger_kms.json d7e048fb79 ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json a555bb5b90 contrib/management-packs/hdf-ambari-mpack/src/main/resources/common-services/NIFI/1.0.0/kerberos.json 74d84e6305 contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/services/KAFKA/kerberos.json aa351d1fdc contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/kerberos.json 6e4aa4caa0 contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/kerberos.json 4b31f7ab15 contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/YARN/kerberos.json 4093431ecb Diff: https://reviews.apache.org/r/62449/diff/1/ Testing ------- Tested new Ambari 2.6.0 cluster. Test upgrade from Ambari 2.5.1 to Ambari 2.6.0 # Local test results: ``` [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ [INFO] Total time: 31:25 min [INFO] Finished at: 2017-09-20T13:11:03-04:00 [INFO] Final Memory: 89M/2007M [INFO] ------------------------------------------------------------------------ ``` # Jenkins test results: PENDING Thanks, Robert Levas