diff --git a/omnioperator/omniop-deploy-tool/deploy.sh b/omnioperator/omniop-deploy-tool/deploy.sh index 7e01bffd2bb1dff87d3191d20596e010c229d622..db5053fd5e852ddef26749dbde08164b189e103f 100644 --- a/omnioperator/omniop-deploy-tool/deploy.sh +++ b/omnioperator/omniop-deploy-tool/deploy.sh @@ -46,7 +46,7 @@ check_spark_version(){ check_cpu_model(){ function_start "------Start checking cpu model------" - cpu_model=$(lscpu | grep "Model name" | sed 's/Model name:[[:space:]]*//') + cpu_model=$(lscpu | grep "^Model name:" | sed 's/Model name:[[:space:]]*//') if [ $cpu_model == "Kunpeng-920" ] && [ ${sve_flag} == true ]; then echo "ERROR: Kunpeng-920 don't support omnioperator-SVE version!" exit 1 @@ -248,7 +248,7 @@ generate_spark_defaults(){ exit 1 fi - conf_file_name="${omnioperator_${expect_spark_version}_${omnioperator_version}.conf}" + conf_file_name="omnioperator_${expect_spark_version}_${omnioperator_version}.conf" conf_file_path="$(dirname "$tmp")/${conf_file_name}" cp $tmp $conf_file_path @@ -393,7 +393,7 @@ check_omni_function(){ exit 1 fi - if echo "result" | grep -q "Omni"; then + if echo "$result" | grep -q "Omni"; then echo "INFO: Omnioperator is effective." else echo "ERROR: Omnioperator is NOT effective." diff --git a/omnioperator/omniop-deploy-tool/readme.md b/omnioperator/omniop-deploy-tool/readme.md index 00dada22ce759ae39c6f44c6efbdaaa89c70b8aa..add210c4cb4eed1ed39e6b75e5b29e7c639cb079 100644 --- a/omnioperator/omniop-deploy-tool/readme.md +++ b/omnioperator/omniop-deploy-tool/readme.md @@ -11,6 +11,10 @@ 1.4. `sve_flag`:是否选择sve版本(centos系统暂不支持,cpu为鲲鹏920的机器暂不支持) 若机器不支持OmniOperator SVE版本,而选择SVE版本安装,将安装失败 +1.5. `spark_conf_path`: 当前机器的spark conf目录路径 + +1.6. `omni_check`: 是否对部署好的omnioperator进行功能验证 + ## 2. 获取OmniOperator安装包 获取: @@ -18,7 +22,7 @@ BoostKit-omniop_{omni_version}.zip boostkit-omniop-spark-{spark_version}-{omni_version}-aarch64.zip Dependency_library_{os_type}.zip -三个包,并放置在脚本的根目录/omnioperator文件夹下 +三个包,并放置在脚本的根目录/omnioperator文件夹下(如果没有omnioperator文件夹,需要自行创建) ## 3. 脚本执行 在脚本的根目录下,执行: