This is an automated email from the ASF dual-hosted git repository. stigahuang pushed a commit to branch branch-3.4.2 in repository https://gitbox.apache.org/repos/asf/impala.git
commit ff56cf9609a5c6c7bb4cc4187b208881a6299379 Author: Xiang Yang <[email protected]> AuthorDate: Fri Jan 19 15:09:05 2024 +0000 IMPALA-12362: (part-2/4) Optimize default configurations for packaging module. To avoid absolutely paths and keep it simple, optimize the default configurations for packaging module by remove or change some entries. At the same time, add license header to 'package/conf/*-site.xml' and rename them to '*-site.xml.template' to force administrator making configurations appropriate for their cluster. Testing: - Manually deploy packages on Ubuntu22.04 and verify it. Change-Id: Ifda229b779a3d6fca647bb81fe23dd61ad7e5d66 Reviewed-on: http://gerrit.cloudera.org:8080/20928 Reviewed-by: Quanlong Huang <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> Reviewed-on: http://gerrit.cloudera.org:8080/21264 Reviewed-by: Xiang Yang <[email protected]> Reviewed-by: Zihao Ye <[email protected]> Tested-by: Quanlong Huang <[email protected]> --- bin/rat_exclude_files.txt | 3 -- package/conf/catalogd_flags | 36 +++++++++++++----- package/conf/core-site.xml | 20 ---------- package/conf/core-site.xml.template | 39 ++++++++++++++++++++ package/conf/fair-scheduler.xml | 6 --- package/conf/fair-scheduler.xml.template | 26 +++++++++++++ .../conf/{hdfs-site.xml => hdfs-site.xml.template} | 19 ++++++++++ package/conf/hive-site.xml | 20 ---------- package/conf/hive-site.xml.template | 39 ++++++++++++++++++++ package/conf/impalad_flags | 43 ++++++++++++++++------ package/conf/llama-site.xml | 3 -- package/conf/llama-site.xml.template | 22 +++++++++++ package/conf/statestored_flags | 28 ++++++++++++-- 13 files changed, 227 insertions(+), 77 deletions(-) diff --git a/bin/rat_exclude_files.txt b/bin/rat_exclude_files.txt index 07998a1a9..29851b628 100644 --- a/bin/rat_exclude_files.txt +++ b/bin/rat_exclude_files.txt @@ -212,6 +212,3 @@ docs/images/howto_show_histogram.png docs/images/howto_static_server_pools_config.png docs/images/impala_arch.jpeg docs/images/support_send_diagnostic_data.png - -# Files of deployment configuration -package/conf/* diff --git a/package/conf/catalogd_flags b/package/conf/catalogd_flags index bbbf580ae..4c435d99a 100644 --- a/package/conf/catalogd_flags +++ b/package/conf/catalogd_flags @@ -1,12 +1,30 @@ --hostname=localhost --state_store_host=localhost -#-kudu_master_hosts=localhost +# 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. +# +# Specify flags for catalogd service. --log_dir=/var/log/catalogd --log_filename=catalogd --state_store_port=24000 --minidump_path=/var/log/impala-minidumps --catalog_topic_mode=minimal --hms_event_polling_interval_s=0 +# -hostname=localhost +# -state_store_host=localhost +# -kudu_master_hosts=localhost +# -log_dir=/var/log/impala +# -minidump_path=/var/log/impala/minidumps +# -catalog_topic_mode=minimal +# -hms_event_polling_interval_s=0 -v=1 +-log_filename=catalogd +-max_log_files=10 -max_log_size=200 diff --git a/package/conf/core-site.xml b/package/conf/core-site.xml deleted file mode 100644 index 2303cdf5f..000000000 --- a/package/conf/core-site.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<configuration> - <property> - <name>fs.defaultFS</name> - <value>hdfs://localhost:8020</value> - </property> - <property> - <name>ipc.client.connection.maxidletime</name> - <value>30000</value> - </property> - <property> - <name>ipc.client.connect.max.retries</name> - <value>50</value> - </property> - <property> - <name>fs.trash.interval</name> - <value>1</value> - </property> -</configuration> diff --git a/package/conf/core-site.xml.template b/package/conf/core-site.xml.template new file mode 100644 index 000000000..c1999d7ff --- /dev/null +++ b/package/conf/core-site.xml.template @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +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. +--> + +<configuration> + <property> + <name>fs.defaultFS</name> + <value>hdfs://localhost:8020</value> + </property> + <property> + <name>ipc.client.connection.maxidletime</name> + <value>30000</value> + </property> + <property> + <name>ipc.client.connect.max.retries</name> + <value>50</value> + </property> + <property> + <name>fs.trash.interval</name> + <value>1</value> + </property> +</configuration> diff --git a/package/conf/fair-scheduler.xml b/package/conf/fair-scheduler.xml deleted file mode 100644 index 0edf7f080..000000000 --- a/package/conf/fair-scheduler.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<allocations> - <queue name="root"> - <queue name="default"/> - </queue> -</allocations> diff --git a/package/conf/fair-scheduler.xml.template b/package/conf/fair-scheduler.xml.template new file mode 100644 index 000000000..44bf7e51f --- /dev/null +++ b/package/conf/fair-scheduler.xml.template @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +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. +--> + +<allocations> + <queue name="root"> + <queue name="default"/> + </queue> +</allocations> diff --git a/package/conf/hdfs-site.xml b/package/conf/hdfs-site.xml.template similarity index 57% rename from package/conf/hdfs-site.xml rename to package/conf/hdfs-site.xml.template index 02468a478..efc814ba8 100644 --- a/package/conf/hdfs-site.xml +++ b/package/conf/hdfs-site.xml.template @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> + <configuration> <property> <name>dfs.namenode.servicerpc-address</name> diff --git a/package/conf/hive-site.xml b/package/conf/hive-site.xml deleted file mode 100644 index ec614f2b5..000000000 --- a/package/conf/hive-site.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<configuration> - <property> - <name>hive.metastore.uris</name> - <value>thrift://localhost:9083</value> - </property> - <property> - <name>hive.support.concurrency</name> - <value>true</value> - </property> - <property> - <name>hive.metastore.client.socket.timeout</name> - <value>3600</value> - </property> - <property> - <name>hive.metastore.connect.retries</name> - <value>5</value> - </property> -</configuration> diff --git a/package/conf/hive-site.xml.template b/package/conf/hive-site.xml.template new file mode 100644 index 000000000..6e3f7c9a7 --- /dev/null +++ b/package/conf/hive-site.xml.template @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +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. +--> + +<configuration> + <property> + <name>hive.metastore.uris</name> + <value>thrift://localhost:9083</value> + </property> + <property> + <name>hive.support.concurrency</name> + <value>true</value> + </property> + <property> + <name>hive.metastore.client.socket.timeout</name> + <value>3600</value> + </property> + <property> + <name>hive.metastore.connect.retries</name> + <value>5</value> + </property> +</configuration> diff --git a/package/conf/impalad_flags b/package/conf/impalad_flags index 6cd2a9d68..ff2b55e83 100644 --- a/package/conf/impalad_flags +++ b/package/conf/impalad_flags @@ -1,15 +1,34 @@ --hostname=localhost --state_store_host=localhost --catalog_service_host=localhost -#-kudu_master_hosts=localhost +# 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. +# +# Specify flags for impalad service. --mem_limit=80% --use_local_catalog=true --log_dir=/var/log/impalad --log_filename=impalad --minidump_path=/var/log/impala-minidumps --local_library_dir=/var/lib/impala/udfs --fair_scheduler_allocation_path=/opt/impala/conf/fair-scheduler.xml --llama_site_path=/opt/impala/conf/llama-site.xml +# -hostname=localhost +# -catalog_service_host=localhost +# -state_store_host=localhost +# -kudu_master_hosts=localhost +# -log_dir=/var/log/impala +# -minidump_path=/var/log/impala/minidumps +# -local_library_dir=/var/lib/impala/udfs +# -llama_site_path=/opt/impala/conf/llama-site.xml +# -fair_scheduler_allocation_path=/opt/impala/conf/fair-scheduler.xml +# -mem_limit=80% +# -use_local_catalog=true -v=1 +-log_filename=impalad +-max_log_files=10 -max_log_size=200 diff --git a/package/conf/llama-site.xml b/package/conf/llama-site.xml deleted file mode 100644 index fefdb93ca..000000000 --- a/package/conf/llama-site.xml +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<configuration/> diff --git a/package/conf/llama-site.xml.template b/package/conf/llama-site.xml.template new file mode 100644 index 000000000..41e736eb1 --- /dev/null +++ b/package/conf/llama-site.xml.template @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +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. +--> + +<configuration/> diff --git a/package/conf/statestored_flags b/package/conf/statestored_flags index 10b0e9870..7778e1fdf 100644 --- a/package/conf/statestored_flags +++ b/package/conf/statestored_flags @@ -1,6 +1,26 @@ --hostname=localhost --log_dir=/var/log/statestore --log_filename=statestored --minidump_path=/var/log/impala-minidumps +# 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. +# +# Specify flags for statestored. + +# -hostname=localhost +# -log_dir=/var/log/impala +# -minidump_path=/var/log/impala/minidumps -v=1 +-log_filename=statestored +-max_log_files=10 -max_log_size=200
