ソースを参照

AMBARI-6555. Stack API: Incorrect information from cardinality field of service component. (aonishuk)

Andrew Onishuk 11 年 前
コミット
367c61c41f
18 ファイル変更25 行追加25 行削除
  1. 2 2
      ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/metainfo.xml
  2. 2 2
      ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml
  3. 2 2
      ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml
  4. 1 1
      ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/metainfo.xml
  5. 1 1
      ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/metainfo.xml
  6. 1 1
      ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/metainfo.xml
  7. 1 1
      ambari-server/src/main/resources/stacks/HDP/1.3.2/services/SQOOP/metainfo.xml
  8. 1 1
      ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/metainfo.xml
  9. 2 2
      ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml
  10. 2 2
      ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metainfo.xml
  11. 2 2
      ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml
  12. 1 1
      ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml
  13. 1 1
      ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml
  14. 2 2
      ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml
  15. 1 1
      ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml
  16. 1 1
      ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml
  17. 1 1
      ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/metainfo.xml
  18. 1 1
      ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml

+ 2 - 2
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/metainfo.xml

@@ -28,7 +28,7 @@
         <component>
           <name>HBASE_MASTER</name>
           <category>MASTER</category>
-          <cardinality>1</cardinality>
+          <cardinality>1+</cardinality>
           <dependencies>
             <dependency>
               <name>HDFS/HDFS_CLIENT</name>
@@ -86,7 +86,7 @@
         <component>
           <name>HBASE_CLIENT</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <commandScript>
             <script>scripts/hbase_client.py</script>
             <scriptType>PYTHON</scriptType>

+ 2 - 2
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml

@@ -27,7 +27,7 @@
         <component>
           <name>NAMENODE</name>
           <category>MASTER</category>
-          <cardinality>1</cardinality>
+          <cardinality>1-2</cardinality>
           <commandScript>
             <script>scripts/namenode.py</script>
             <scriptType>PYTHON</scriptType>
@@ -70,7 +70,7 @@
         <component>
           <name>HDFS_CLIENT</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <commandScript>
             <script>scripts/hdfs_client.py</script>
             <scriptType>PYTHON</scriptType>

+ 2 - 2
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml

@@ -69,7 +69,7 @@
         <component>
           <name>MYSQL_SERVER</name>
           <category>MASTER</category>
-          <cardinality>1</cardinality>
+          <cardinality>0-1</cardinality>
           <commandScript>
             <script>scripts/mysql_server.py</script>
             <scriptType>PYTHON</scriptType>
@@ -79,7 +79,7 @@
         <component>
           <name>HIVE_CLIENT</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <commandScript>
             <script>scripts/hive_client.py</script>
             <scriptType>PYTHON</scriptType>

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/metainfo.xml

@@ -59,7 +59,7 @@
         <component>
           <name>MAPREDUCE_CLIENT</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality> 
+          <cardinality>1+</cardinality>
           <commandScript>
             <script>scripts/client.py</script>
             <scriptType>PYTHON</scriptType>

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/metainfo.xml

@@ -54,7 +54,7 @@
         <component>
           <name>OOZIE_CLIENT</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <dependencies>
             <dependency>
               <name>HDFS/HDFS_CLIENT</name>

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/metainfo.xml

@@ -26,7 +26,7 @@
         <component>
           <name>PIG</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <commandScript>
             <script>scripts/pig_client.py</script>
             <scriptType>PYTHON</scriptType>

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/SQOOP/metainfo.xml

@@ -29,7 +29,7 @@
         <component>
           <name>SQOOP</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <dependencies>
             <dependency>
               <name>HDFS/HDFS_CLIENT</name>

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/metainfo.xml

@@ -38,7 +38,7 @@
         <component>
           <name>ZOOKEEPER_CLIENT</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <commandScript>
             <script>scripts/zookeeper_client.py</script>
             <scriptType>PYTHON</scriptType>

+ 2 - 2
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml

@@ -28,7 +28,7 @@
         <component>
           <name>HBASE_MASTER</name>
           <category>MASTER</category>
-          <cardinality>1</cardinality>
+          <cardinality>1+</cardinality>
           <dependencies>
             <dependency>
               <name>HDFS/HDFS_CLIENT</name>
@@ -76,7 +76,7 @@
         <component>
           <name>HBASE_CLIENT</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <commandScript>
             <script>scripts/hbase_client.py</script>
             <scriptType>PYTHON</scriptType>

+ 2 - 2
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metainfo.xml

@@ -27,7 +27,7 @@
         <component>
           <name>NAMENODE</name>
           <category>MASTER</category>
-          <cardinality>1</cardinality>
+          <cardinality>1-2</cardinality>
           <commandScript>
             <script>scripts/namenode.py</script>
             <scriptType>PYTHON</scriptType>
@@ -71,7 +71,7 @@
         <component>
           <name>HDFS_CLIENT</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <commandScript>
             <script>scripts/hdfs_client.py</script>
             <scriptType>PYTHON</scriptType>

+ 2 - 2
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml

@@ -83,7 +83,7 @@
         <component>
           <name>MYSQL_SERVER</name>
           <category>MASTER</category>
-          <cardinality>1</cardinality>
+          <cardinality>0-1</cardinality>
           <commandScript>
             <script>scripts/mysql_server.py</script>
             <scriptType>PYTHON</scriptType>
@@ -93,7 +93,7 @@
         <component>
           <name>HIVE_CLIENT</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <commandScript>
             <script>scripts/hive_client.py</script>
             <scriptType>PYTHON</scriptType>

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml

@@ -61,7 +61,7 @@
         <component>
           <name>OOZIE_CLIENT</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <dependencies>
             <dependency>
               <name>HDFS/HDFS_CLIENT</name>

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml

@@ -29,7 +29,7 @@
         <component>
           <name>SQOOP</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <dependencies>
             <dependency>
               <name>HDFS/HDFS_CLIENT</name>

+ 2 - 2
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml

@@ -28,7 +28,7 @@
         <component>
           <name>RESOURCEMANAGER</name>
           <category>MASTER</category>
-          <cardinality>1</cardinality>
+          <cardinality>1-2</cardinality>
           <commandScript>
             <script>scripts/resourcemanager.py</script>
             <scriptType>PYTHON</scriptType>
@@ -68,7 +68,7 @@
         <component>
           <name>YARN_CLIENT</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <commandScript>
             <script>scripts/yarn_client.py</script>
             <scriptType>PYTHON</scriptType>

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml

@@ -38,7 +38,7 @@
         <component>
           <name>ZOOKEEPER_CLIENT</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <commandScript>
             <script>scripts/zookeeper_client.py</script>
             <scriptType>PYTHON</scriptType>

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml

@@ -26,7 +26,7 @@
         <component>
           <name>FALCON_CLIENT</name>
           <category>CLIENT</category>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <commandScript>
             <script>scripts/falcon_client.py</script>
             <scriptType>PYTHON</scriptType>

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/metainfo.xml

@@ -25,7 +25,7 @@
       <components>
         <component>
           <name>TEZ_CLIENT</name>
-          <cardinality>0+</cardinality>
+          <cardinality>1+</cardinality>
           <category>CLIENT</category>
           <commandScript>
             <script>scripts/tez_client.py</script>

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml

@@ -28,7 +28,7 @@
         <component>
           <name>APP_TIMELINE_SERVER</name>
           <category>SLAVE</category>
-          <cardinality>1</cardinality>
+          <cardinality>0-1</cardinality>
           <commandScript>
             <script>scripts/application_timeline_server.py</script>
             <scriptType>PYTHON</scriptType>