Переглянути джерело

AMBARI-13725: HAWQ and PXF to support 3 digit versioning instead of 4.(jaoki)

jaoki 9 роки тому
батько
коміт
d02ec979f2
27 змінених файлів з 73 додано та 19 видалено
  1. 0 3
      ambari-server/pom.xml
  2. 0 5
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/templates/hawq-hosts.j2
  3. 0 8
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/templates/hawq-profile.sh.j2
  4. 0 3
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/templates/slaves.j2
  5. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml
  6. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml
  7. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
  8. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
  9. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml
  10. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
  11. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/constants.py
  12. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py
  13. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
  14. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqstandby.py
  15. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqstatus.py
  16. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
  17. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py
  18. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/service_check.py
  19. 0 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
  20. 24 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/templates/hawq-hosts.j2
  21. 27 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/templates/hawq-profile.sh.j2
  22. 22 0
      ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/templates/slaves.j2
  23. 0 0
      ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-site.xml
  24. 0 0
      ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml
  25. 0 0
      ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
  26. 0 0
      ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py
  27. 0 0
      ambari-server/src/main/resources/common-services/PXF/3.0.0/package/templates/pxf-env.j2

+ 0 - 3
ambari-server/pom.xml

@@ -203,9 +203,6 @@
             <exclude>src/main/resources/stacks/HDP/2.0._/services/HBASE/package/templates/regionservers.j2</exclude>
             <exclude>src/main/resources/stacks/HDPWIN/2.1/services/*/configuration*/*</exclude>
 
-            <!-- HAWQ Stack definitions -->
-            <exclude>src/main/resources/common-services/HAWQ/2.0.0.0/package/templates/*.j2</exclude>
-
             <!--test samples -->
             <exclude>src/test/resources/TestAmbaryServer.samples/**</exclude>
             <exclude>src/test/resources/*.txt</exclude>

+ 0 - 5
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/templates/hawq-hosts.j2

@@ -1,5 +0,0 @@
-{{hawqmaster_host}}
-{{hawqstandby_host}}
-{% for host in hawqsegment_hosts %}
-{{host}}
-{% endfor %}

+ 0 - 8
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/templates/hawq-profile.sh.j2

@@ -1,8 +0,0 @@
-######################################
-##### HAWQ env #######################
-######################################
-source {{hawq_greenplum_path_file}}
-export MASTER_DATA_DIRECTORY={{hawq_master_dir}}
-export PGPORT={{hawq_master_address_port}}
-export PGHOST={{hawqmaster_host}}
-export PGUSER={{hawq_user}}

+ 0 - 3
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/templates/slaves.j2

@@ -1,3 +0,0 @@
-{% for host in hawqsegment_hosts %}
-{{host}}
-{% endfor %}

+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/configuration/gpcheck-env.xml → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml


+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/configuration/hawq-limits-env.xml → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml


+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/configuration/hawq-site.xml → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml


+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/configuration/hawq-sysctl-env.xml → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml


+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/metainfo.xml → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml


+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/common.py → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py


+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/constants.py → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/constants.py


+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/hawqmaster.py → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py


+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/hawqsegment.py → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py


+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/hawqstandby.py → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqstandby.py


+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/hawqstatus.py → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqstatus.py


+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/master_helper.py → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py


+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/params.py → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py


+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/service_check.py → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/service_check.py


+ 0 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/utils.py → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py


+ 24 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/templates/hawq-hosts.j2

@@ -0,0 +1,24 @@
+#
+# 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.
+#
+
+{{hawqmaster_host}}
+{{hawqstandby_host}}
+{% for host in hawqsegment_hosts %}
+{{host}}
+{% endfor %}

+ 27 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/templates/hawq-profile.sh.j2

@@ -0,0 +1,27 @@
+#
+# 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.
+#
+
+######################################
+##### HAWQ env #######################
+######################################
+source {{hawq_greenplum_path_file}}
+export MASTER_DATA_DIRECTORY={{hawq_master_dir}}
+export PGPORT={{hawq_master_address_port}}
+export PGHOST={{hawqmaster_host}}
+export PGUSER={{hawq_user}}

+ 22 - 0
ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/templates/slaves.j2

@@ -0,0 +1,22 @@
+#
+# 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.
+#
+
+{% for host in hawqsegment_hosts %}
+{{host}}
+{% endfor %}

+ 0 - 0
ambari-server/src/main/resources/common-services/PXF/3.0.0.0/configuration/pxf-site.xml → ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-site.xml


+ 0 - 0
ambari-server/src/main/resources/common-services/PXF/3.0.0.0/metainfo.xml → ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml


+ 0 - 0
ambari-server/src/main/resources/common-services/PXF/3.0.0.0/package/scripts/params.py → ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py


+ 0 - 0
ambari-server/src/main/resources/common-services/PXF/3.0.0.0/package/scripts/pxf.py → ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py


+ 0 - 0
ambari-server/src/main/resources/common-services/PXF/3.0.0.0/package/templates/pxf-env.j2 → ambari-server/src/main/resources/common-services/PXF/3.0.0/package/templates/pxf-env.j2