From 6990bd71729118522bb90cff4bcdc07df692471d Mon Sep 17 00:00:00 2001 From: liangruifeng <960641173@qq.com> Date: Thu, 6 Feb 2025 15:14:54 +0800 Subject: [PATCH 1/3] 20250206 Fix message printing error (cherry picked from commit e9602629c338ecf3b116368ec7c89acb67b7c59b) --- omnioperator/omniop-deploy-tool/deploy.sh | 4 ++-- omnioperator/omniop-deploy-tool/readme.md | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/omnioperator/omniop-deploy-tool/deploy.sh b/omnioperator/omniop-deploy-tool/deploy.sh index 7e01bffd2..fdd59c5ca 100644 --- a/omnioperator/omniop-deploy-tool/deploy.sh +++ b/omnioperator/omniop-deploy-tool/deploy.sh @@ -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 00dada22c..add210c4c 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. 脚本执行 在脚本的根目录下，执行： -- Gitee From fd75958ea87d51262bd9812354facea0c332063e Mon Sep 17 00:00:00 2001 From: liangruifeng <960641173@qq.com> Date: Mon, 10 Feb 2025 19:47:17 +0800 Subject: [PATCH 2/3] fix check cpu print INFO (cherry picked from commit ec3e3276b5a813dec35d47b1db2acd2226f5c986) --- omnioperator/omniop-deploy-tool/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnioperator/omniop-deploy-tool/deploy.sh b/omnioperator/omniop-deploy-tool/deploy.sh index fdd59c5ca..db5053fd5 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 -- Gitee From 0bd2d26e925adadce2692e8aa676f9de83065aa0 Mon Sep 17 00:00:00 2001 From: liangruifeng <960641173@qq.com> Date: Tue, 8 Jul 2025 16:52:44 +0800 Subject: [PATCH 3/3] update readme --- README.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c47c81a44..a174e2099 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,12 @@ # boostkit-bigdata BoostKit Acceleration Packages —— Big Data Component Adaptation Layer -## Notice -The boostkit-bigdata repo contains acceleration plugins and patches for multiple pieces of open source software including openLooKeng, Apache Spark, Hive, and HBase. Using these plugins and patches depends on other pieces of open source software (which are available in the central repo). You shall understand and agree that when using the other pieces of open source software, you shall strictly comply with their open source licenses and fulfill the obligations specified in the licenses. Any vulnerabilities and security issues of the other open source software are resolved by the corresponding upstream communities based on their own vulnerability and security response mechanisms. Please pay attention to the notifications and version updates released by the upstream communities. The Kunpeng Compute community does not assume any responsibility for the vulnerabilities and security issues of the preceding open source software. +## 介绍 +boostkit-bigdata 仓库包含为多款开源软件（包括 openLooKeng、Apache Spark、Hive 和 HBase）提供的加速插件和补丁。使用这些插件和补丁需依赖其他开源软件（这些软件可在中央仓库获取）。您应理解并同意：在使用其他开源软件时，必须严格遵守其开源许可证要求，并履行许可证中规定的义务。其他开源软件的任何漏洞与安全问题，均由相应的上游社区根据其漏洞和安全响应机制解决。请密切关注上游社区发布的通知和版本更新。鲲鹏计算社区对上述开源软件的漏洞及安全问题不承担任何责任。 + +## 操作系统 +支持x86、鲲鹏架构下的openEuler系（例如openEuler 22.03 LTS）操作系统，支持centos系统 + +## 参与贡献 +如果您想为本仓库贡献代码，请向本仓库任意maintainer发送邮件 +如果您找到产品中的任何Bug，欢迎您提出ISSUE \ No newline at end of file -- Gitee