packages/A-Tune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade A-Tune to v1.0.0

Browse Source
This commit is contained in:
hanxinke 2021-11-16 16:30:23 +08:00
parent 9f45bbf2dd
commit e6ea7f9812
6 changed files with 13 additions and 928 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
atune-support-for-Go-1.15.patch
View File

@ -1,184 +0,0 @@
From b2d9728e16dd5c55b8d1528fd37a58cf9790bc76 Mon Sep 17 00:00:00 2001
From: HW_TaoChen <boby.chen@huawei.com>
Date: Wed, 30 Dec 2020 16:57:48 +0800
Subject: [PATCH] atune: support for Go 1.15
Signed-off-by: hanxinke <hanxinke@huawei.com>
---
Makefile | 40 ++++++++++---------
.../collections/stack/stack.go | 4 +-
vendor/modules.txt | 19 +++++++++
3 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/Makefile b/Makefile
index 68f6252..08eb3e5 100755
--- a/Makefile
+++ b/Makefile
@@ -125,17 +125,19 @@ restcerts:
openssl genrsa -out $(REST_CERT_PATH)/ca.key 2048
openssl req -new -x509 -days 3650 -subj "/CN=ca" -key $(REST_CERT_PATH)/ca.key -out $(REST_CERT_PATH)/ca.crt
openssl genrsa -out $(REST_CERT_PATH)/server.key 2048
+ cp /etc/pki/tls/openssl.cnf $(REST_CERT_PATH)
@if test $(REST_IP_ADDR) == localhost; then \
- openssl req -new -subj "/CN=localhost" -key $(REST_CERT_PATH)/server.key -out $(REST_CERT_PATH)/server.csr; \
- openssl x509 -req -sha256 -CA $(REST_CERT_PATH)/ca.crt -CAkey $(REST_CERT_PATH)/ca.key -CAcreateserial -days 3650 \
- -in $(REST_CERT_PATH)/server.csr -out $(REST_CERT_PATH)/server.crt; \
+ echo "[SAN]\nsubjectAltName=DNS:$(REST_IP_ADDR)" >> $(REST_CERT_PATH)/openssl.cnf; \
+ echo "subjectAltName=DNS:$(REST_IP_ADDR)" > $(REST_CERT_PATH)/extfile.cnf; \
else \
- openssl req -new -subj "/CN=$(REST_IP_ADDR)" -key $(REST_CERT_PATH)/server.key -out $(REST_CERT_PATH)/server.csr; \
+ echo "[SAN]\nsubjectAltName=IP:$(REST_IP_ADDR)" >> $(REST_CERT_PATH)/openssl.cnf; \
echo "subjectAltName=IP:$(REST_IP_ADDR)" > $(REST_CERT_PATH)/extfile.cnf; \
- openssl x509 -req -sha256 -CA $(REST_CERT_PATH)/ca.crt -CAkey $(REST_CERT_PATH)/ca.key -CAcreateserial -days 3650 \
- -extfile $(REST_CERT_PATH)/extfile.cnf -in $(REST_CERT_PATH)/server.csr -out $(REST_CERT_PATH)/server.crt; \
fi
- rm -rf $(REST_CERT_PATH)/*.srl $(REST_CERT_PATH)/*.csr $(REST_CERT_PATH)/extfile.cnf
+ openssl req -new -subj "/CN=$(REST_IP_ADDR)" -config $(REST_CERT_PATH)/openssl.cnf \
+ -key $(REST_CERT_PATH)/server.key -out $(REST_CERT_PATH)/server.csr
+ openssl x509 -req -sha256 -CA $(REST_CERT_PATH)/ca.crt -CAkey $(REST_CERT_PATH)/ca.key -CAcreateserial -days 3650 \
+ -extfile $(REST_CERT_PATH)/extfile.cnf -in $(REST_CERT_PATH)/server.csr -out $(REST_CERT_PATH)/server.crt
+ rm -rf $(REST_CERT_PATH)/*.srl $(REST_CERT_PATH)/*.csr $(REST_CERT_PATH)/*.cnf
@echo "END GENERATE REST CERTS"
enginecerts:
@@ -145,20 +147,22 @@ enginecerts:
openssl genrsa -out $(ENGINE_CERT_PATH)/ca.key 2048; \
openssl req -new -x509 -days 3650 -subj "/CN=ca" -key $(ENGINE_CERT_PATH)/ca.key -out $(ENGINE_CERT_PATH)/ca.crt; \
fi
+ cp /etc/pki/tls/openssl.cnf $(ENGINE_CERT_PATH)
+ @if test $(ENGINE_IP_ADDR) == localhost; then \
+ echo "[SAN]\nsubjectAltName=DNS:$(ENGINE_IP_ADDR)" >> $(ENGINE_CERT_PATH)/openssl.cnf; \
+ echo "subjectAltName=DNS:$(ENGINE_IP_ADDR)" > $(ENGINE_CERT_PATH)/extfile.cnf; \
+ else \
+ echo "[SAN]\nsubjectAltName=IP:$(ENGINE_IP_ADDR)" >> $(ENGINE_CERT_PATH)/openssl.cnf; \
+ echo "subjectAltName=IP:$(ENGINE_IP_ADDR)" > $(ENGINE_CERT_PATH)/extfile.cnf; \
+ fi
@for name in server client; do \
openssl genrsa -out $(ENGINE_CERT_PATH)/$$name.key 2048; \
- if test $(ENGINE_IP_ADDR) == localhost; then \
- openssl req -new -subj "/CN=localhost" -key $(ENGINE_CERT_PATH)/$$name.key -out $(ENGINE_CERT_PATH)/$$name.csr; \
- openssl x509 -req -sha256 -CA $(ENGINE_CERT_PATH)/ca.crt -CAkey $(ENGINE_CERT_PATH)/ca.key -CAcreateserial -days 3650 \
- -in $(ENGINE_CERT_PATH)/$$name.csr -out $(ENGINE_CERT_PATH)/$$name.crt; \
- else \
- openssl req -new -subj "/CN=$(ENGINE_IP_ADDR)" -key $(ENGINE_CERT_PATH)/$$name.key -out $(ENGINE_CERT_PATH)/$$name.csr; \
- echo "subjectAltName=IP:$(ENGINE_IP_ADDR)" > $(ENGINE_CERT_PATH)/extfile.cnf; \
- openssl x509 -req -sha256 -CA $(ENGINE_CERT_PATH)/ca.crt -CAkey $(ENGINE_CERT_PATH)/ca.key -CAcreateserial -days 3650 \
- -extfile $(ENGINE_CERT_PATH)/extfile.cnf -in $(ENGINE_CERT_PATH)/$$name.csr -out $(ENGINE_CERT_PATH)/$$name.crt; \
- fi; \
+ openssl req -new -subj "/CN=$(ENGINE_IP_ADDR)" -config $(ENGINE_CERT_PATH)/openssl.cnf \
+ -key $(ENGINE_CERT_PATH)/$$name.key -out $(ENGINE_CERT_PATH)/$$name.csr; \
+ openssl x509 -req -sha256 -CA $(ENGINE_CERT_PATH)/ca.crt -CAkey $(ENGINE_CERT_PATH)/ca.key -CAcreateserial -days 3650 \
+ -extfile $(ENGINE_CERT_PATH)/extfile.cnf -in $(ENGINE_CERT_PATH)/$$name.csr -out $(ENGINE_CERT_PATH)/$$name.crt; \
done
- rm -rf $(ENGINE_CERT_PATH)/*.srl $(ENGINE_CERT_PATH)/*.csr $(ENGINE_CERT_PATH)/extfile.cnf
+ rm -rf $(ENGINE_CERT_PATH)/*.srl $(ENGINE_CERT_PATH)/*.csr $(ENGINE_CERT_PATH)/*.cnf
@echo "END GENERATE ENGINE CERTS"
env:
diff --git a/vendor/github.com/golang-collections/collections/stack/stack.go b/vendor/github.com/golang-collections/collections/stack/stack.go
index 04063df..a433fc9 100644
--- a/vendor/github.com/golang-collections/collections/stack/stack.go
+++ b/vendor/github.com/golang-collections/collections/stack/stack.go
@@ -8,7 +8,7 @@ type (
node struct {
value interface{}
prev *node
- }
+ }
)
// Create a new stack
func New() *Stack {
@@ -30,7 +30,7 @@ func (this *Stack) Pop() interface{} {
if this.length == 0 {
return nil
}
-
+
n := this.top
this.top = n.prev
this.length--
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 5807785..b45918a 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1,20 +1,27 @@
# github.com/antlr/antlr4 v0.0.0-20190726171924-e4737db19f4f
+## explicit
github.com/antlr/antlr4/runtime/Go/antlr
# github.com/bndr/gotabulate v1.1.2
+## explicit
github.com/bndr/gotabulate
# github.com/caibirdme/yql v0.0.0-20190801103415-238f3c90b514
+## explicit
github.com/caibirdme/yql
github.com/caibirdme/yql/internal/grammar
github.com/caibirdme/yql/internal/stack
# github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
+## explicit
github.com/coreos/go-systemd/daemon
# github.com/go-ini/ini v1.42.0
+## explicit
github.com/go-ini/ini
# github.com/go-xorm/xorm v0.7.4
+## explicit
github.com/go-xorm/xorm
# github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
github.com/golang-collections/collections/stack
# github.com/golang/protobuf v1.3.1
+## explicit
github.com/golang/protobuf/proto
github.com/golang/protobuf/protoc-gen-go/descriptor
github.com/golang/protobuf/ptypes
@@ -26,10 +33,13 @@ github.com/juju/errors
# github.com/konsorten/go-windows-terminal-sequences v1.0.1
github.com/konsorten/go-windows-terminal-sequences
# github.com/mattn/go-sqlite3 v1.11.0
+## explicit
github.com/mattn/go-sqlite3
# github.com/mitchellh/mapstructure v1.1.2
+## explicit
github.com/mitchellh/mapstructure
# github.com/newm4n/grool v1.0.2
+## explicit
github.com/newm4n/grool/antlr
github.com/newm4n/grool/antlr/parser
github.com/newm4n/grool/builder
@@ -38,11 +48,16 @@ github.com/newm4n/grool/engine
github.com/newm4n/grool/model
github.com/newm4n/grool/pkg
# github.com/sirupsen/logrus v1.4.2
+## explicit
github.com/sirupsen/logrus
github.com/sirupsen/logrus/hooks/syslog
+# github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337
+## explicit
# github.com/urfave/cli v1.20.0
+## explicit
github.com/urfave/cli
# golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
+## explicit
golang.org/x/net/context
golang.org/x/net/http/httpguts
golang.org/x/net/http2
@@ -60,6 +75,7 @@ golang.org/x/text/unicode/norm
# google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107
google.golang.org/genproto/googleapis/rpc/status
# google.golang.org/grpc v1.22.0
+## explicit
google.golang.org/grpc
google.golang.org/grpc/balancer
google.golang.org/grpc/balancer/base
@@ -95,7 +111,10 @@ google.golang.org/grpc/serviceconfig
google.golang.org/grpc/stats
google.golang.org/grpc/status
google.golang.org/grpc/tap
+# gopkg.in/ini.v1 v1.48.0
+## explicit
# gopkg.in/yaml.v2 v2.2.2
+## explicit
gopkg.in/yaml.v2
# xorm.io/builder v0.3.5
xorm.io/builder
--
2.23.0

638
atune-update-file-description-and-testcase.patch
View File

@ -1,638 +0,0 @@
From a71a13d8b4f984e22d4117e89c7d88f8d4628aaf Mon Sep 17 00:00:00 2001
From: gaoruoshu <gaoruoshu@huawei.com>
Date: Mon, 11 Jan 2021 16:21:21 +0800
Subject: [PATCH] update file description and testcase
---
Documentation/UserGuide/A-Tune-User-Guide.md | 2 +-
...224\250\346\210\267\346\214\207\345\215\227.md" | 2 +-
profiles/basic-test-suite/baseline/fio.conf | 53 ++++++++++++++++++++++
profiles/basic-test-suite/baseline/lmbench.conf | 49 ++++++++++++++++++++
profiles/basic-test-suite/baseline/netperf.conf | 48 ++++++++++++++++++++
profiles/basic-test-suite/baseline/stream.conf | 48 ++++++++++++++++++++
profiles/basic-test-suite/baseline/unixbench.conf | 51 +++++++++++++++++++++
.../basic-test-suite/euleros-baseline/fio.conf | 53 ----------------------
.../basic-test-suite/euleros-baseline/lmbench.conf | 49 --------------------
.../basic-test-suite/euleros-baseline/netperf.conf | 48 --------------------
.../basic-test-suite/euleros-baseline/stream.conf | 48 --------------------
.../euleros-baseline/unixbench.conf | 51 ---------------------
tests/configurator/test_kernel_config.py | 4 +-
13 files changed, 253 insertions(+), 253 deletions(-)
create mode 100644 profiles/basic-test-suite/baseline/fio.conf
create mode 100644 profiles/basic-test-suite/baseline/lmbench.conf
create mode 100644 profiles/basic-test-suite/baseline/netperf.conf
create mode 100644 profiles/basic-test-suite/baseline/stream.conf
create mode 100644 profiles/basic-test-suite/baseline/unixbench.conf
delete mode 100644 profiles/basic-test-suite/euleros-baseline/fio.conf
delete mode 100644 profiles/basic-test-suite/euleros-baseline/lmbench.conf
delete mode 100644 profiles/basic-test-suite/euleros-baseline/netperf.conf
delete mode 100644 profiles/basic-test-suite/euleros-baseline/stream.conf
delete mode 100644 profiles/basic-test-suite/euleros-baseline/unixbench.conf
diff --git a/Documentation/UserGuide/A-Tune-User-Guide.md b/Documentation/UserGuide/A-Tune-User-Guide.md
index d798d8a..bffface 100644
--- a/Documentation/UserGuide/A-Tune-User-Guide.md
+++ b/Documentation/UserGuide/A-Tune-User-Guide.md
@@ -763,7 +763,7 @@ Check the CPU, BIOS, OS, and NIC information.
cpu:1 version: Kunpeng 920-6426 speed: 2600000000 HZ cores: 64
system information:
DMIBIOSVersion: 0.59
- OSRelease: 4.19.36-vhulk1906.3.0.h356.eulerosv2r8.aarch64
+ OSRelease: ...
network information:
name: eth0 product: HNS GE/10GE/25GE RDMA Network Controller
name: eth1 product: HNS GE/10GE/25GE Network Controller
diff --git "a/Documentation/UserGuide/A-Tune\347\224\250\346\210\267\346\214\207\345\215\227.md" "b/Documentation/UserGuide/A-Tune\347\224\250\346\210\267\346\214\207\345\215\227.md"
index cf1fcbf..070aefc 100644
--- "a/Documentation/UserGuide/A-Tune\347\224\250\346\210\267\346\214\207\345\215\227.md"
+++ "b/Documentation/UserGuide/A-Tune\347\224\250\346\210\267\346\214\207\345\215\227.md"
@@ -774,7 +774,7 @@ WORKLOAD_TYPE支持的类型参考list命令查询结果。
cpu:1 version: Kunpeng 920-6426 speed: 2600000000 HZ cores: 64
system information:
DMIBIOSVersion: 0.59
- OSRelease: 4.19.36-vhulk1906.3.0.h356.eulerosv2r8.aarch64
+ OSRelease: ...
network information:
name: eth0 product: HNS GE/10GE/25GE RDMA Network Controller
name: eth1 product: HNS GE/10GE/25GE Network Controller
diff --git a/profiles/basic-test-suite/baseline/fio.conf b/profiles/basic-test-suite/baseline/fio.conf
new file mode 100644
index 0000000..7427d94
--- /dev/null
+++ b/profiles/basic-test-suite/baseline/fio.conf
@@ -0,0 +1,53 @@
+# Copyright (c) 2020 Huawei Technologies Co., Ltd.
+# A-Tune is licensed under the Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+# http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
+# PURPOSE.
+# See the Mulan PSL v2 for more details.
+# Create: 2020-06-18
+#
+# baseline test fio A-Tune configuration
+#
+[main]
+include = include-basic-test-suite
+
+[kernel_config]
+#TODO CONFIG
+
+[bios]
+#TODO CONFIG
+
+[bootloader.grub2]
+#TODO CONFIG
+
+[sysfs]
+block/{disk}/queue/scheduler = mq-deadline
+block/{disk}/queue/max_sectors_kb = 1024
+block/{disk}/queue/read_ahead_kb = 4096
+block/{disk}/queue/rq_affinity = 2
+
+[systemctl]
+#TODO CONFIG
+
+[sysctl]
+#TODO CONFIG
+
+[script]
+#TODO CONFIG
+
+[ulimit]
+#TODO CONFIG
+
+[schedule_policy]
+#TODO CONFIG
+
+[check]
+#TODO CONFIG
+
+[tip]
+set /sys/block/{disk}/queue/iosched/retry_dev to 8 colon 16 = sysfs
+set /sys/block/{disk}/queue/iosched/retry_count to 8 = sysfs
+set /sys/block/{disk}/queue/iosched/retry_min_write to 2 = sysfs
diff --git a/profiles/basic-test-suite/baseline/lmbench.conf b/profiles/basic-test-suite/baseline/lmbench.conf
new file mode 100644
index 0000000..3055e9e
--- /dev/null
+++ b/profiles/basic-test-suite/baseline/lmbench.conf
@@ -0,0 +1,49 @@
+# Copyright (c) 2020 Huawei Technologies Co., Ltd.
+# A-Tune is licensed under the Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+# http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
+# PURPOSE.
+# See the Mulan PSL v2 for more details.
+# Create: 2020-06-18
+#
+# baseline test lmbench A-Tune configuration
+#
+[main]
+include = include-basic-test-suite
+
+[kernel_config]
+#TODO CONFIG
+
+[bios]
+#TODO CONFIG
+
+[bootloader.grub2]
+#TODO CONFIG
+
+[sysfs]
+#TODO CONFIG
+
+[systemctl]
+#TODO CONFIG
+
+[sysctl]
+#TODO CONFIG
+
+[script]
+#TODO CONFIG
+
+[ulimit]
+#TODO CONFIG
+
+[schedule_policy]
+#TODO CONFIG
+
+[check]
+#TODO CONFIG
+
+[tip]
+mkfs.ext4 -b 16384 -O ^metadata_csum /dev/{disk} and restart the host = block
+modify compilation options from -O to -O2 = compile
diff --git a/profiles/basic-test-suite/baseline/netperf.conf b/profiles/basic-test-suite/baseline/netperf.conf
new file mode 100644
index 0000000..8a5fa06
--- /dev/null
+++ b/profiles/basic-test-suite/baseline/netperf.conf
@@ -0,0 +1,48 @@
+# Copyright (c) 2020 Huawei Technologies Co., Ltd.
+# A-Tune is licensed under the Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+# http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
+# PURPOSE.
+# See the Mulan PSL v2 for more details.
+# Create: 2020-06-18
+#
+# baseline test netperf A-Tune configuration
+#
+[main]
+include = include-basic-test-suite
+
+[kernel_config]
+#TODO CONFIG
+
+[bios]
+#TODO CONFIG
+
+[bootloader.grub2]
+#TODO CONFIG
+
+[sysfs]
+#TODO CONFIG
+
+[systemctl]
+#TODO CONFIG
+
+[sysctl]
+#TODO CONFIG
+
+[script]
+#TODO CONFIG
+
+[ulimit]
+#TODO CONFIG
+
+[schedule_policy]
+#TODO CONFIG
+
+[check]
+#TODO CONFIG
+
+[tip]
+#TODO CONFIG
diff --git a/profiles/basic-test-suite/baseline/stream.conf b/profiles/basic-test-suite/baseline/stream.conf
new file mode 100644
index 0000000..0220811
--- /dev/null
+++ b/profiles/basic-test-suite/baseline/stream.conf
@@ -0,0 +1,48 @@
+# Copyright (c) 2020 Huawei Technologies Co., Ltd.
+# A-Tune is licensed under the Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+# http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
+# PURPOSE.
+# See the Mulan PSL v2 for more details.
+# Create: 2020-06-18
+#
+# baseline test stream A-Tune configuration
+#
+[main]
+include = include-basic-test-suite
+
+[kernel_config]
+#TODO CONFIG
+
+[bios]
+#TODO CONFIG
+
+[bootloader.grub2]
+#TODO CONFIG
+
+[sysfs]
+#TODO CONFIG
+
+[systemctl]
+#TODO CONFIG
+
+[sysctl]
+#TODO CONFIG
+
+[script]
+#TODO CONFIG
+
+[ulimit]
+#TODO CONFIG
+
+[schedule_policy]
+#TODO CONFIG
+
+[check]
+#TODO CONFIG
+
+[tip]
+add -ftree-vectorize compilation option in gcc compilation = application
diff --git a/profiles/basic-test-suite/baseline/unixbench.conf b/profiles/basic-test-suite/baseline/unixbench.conf
new file mode 100644
index 0000000..9d93246
--- /dev/null
+++ b/profiles/basic-test-suite/baseline/unixbench.conf
@@ -0,0 +1,51 @@
+# Copyright (c) 2020 Huawei Technologies Co., Ltd.
+# A-Tune is licensed under the Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+# http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
+# PURPOSE.
+# See the Mulan PSL v2 for more details.
+# Create: 2020-06-18
+#
+# baseline test unixbench A-Tune configuration
+#
+[main]
+include = include-throughput-performance, include-basic-test-suite
+
+[kernel_config]
+#TODO CONFIG
+
+[bios]
+#TODO CONFIG
+
+[bootloader.grub2]
+#TODO CONFIG
+
+[sysfs]
+#TODO CONFIG
+
+[systemctl]
+#TODO CONFIG
+
+[sysctl]
+#TODO CONFIG
+
+[script]
+#TODO CONFIG
+
+[ulimit]
+#TODO CONFIG
+
+[schedule_policy]
+#TODO CONFIG
+
+[check]
+#TODO CONFIG
+
+[tip]
+format the test block {disk} size to 64KB = block
+use writeback, nojournal_checksum, noatime, nobarrier, noinit_itable, noacl and dioread_nolock to mount the test partition and set inode_readahead_blks to 4096 = block
+add --without-gmp compilation option to coreutils package and upgrade the package = compile
+add --static to the environment variable LDFLAGS during the compilation of bash package and upgrade the package = compile
diff --git a/profiles/basic-test-suite/euleros-baseline/fio.conf b/profiles/basic-test-suite/euleros-baseline/fio.conf
deleted file mode 100644
index 330d43b..0000000
--- a/profiles/basic-test-suite/euleros-baseline/fio.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (c) 2020 Huawei Technologies Co., Ltd.
-# A-Tune is licensed under the Mulan PSL v2.
-# You can use this software according to the terms and conditions of the Mulan PSL v2.
-# You may obtain a copy of Mulan PSL v2 at:
-# http://license.coscl.org.cn/MulanPSL2
-# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
-# PURPOSE.
-# See the Mulan PSL v2 for more details.
-# Create: 2020-06-18
-#
-# euleros baseline test fio A-Tune configuration
-#
-[main]
-include = include-basic-test-suite
-
-[kernel_config]
-#TODO CONFIG
-
-[bios]
-#TODO CONFIG
-
-[bootloader.grub2]
-#TODO CONFIG
-
-[sysfs]
-block/{disk}/queue/scheduler = mq-deadline
-block/{disk}/queue/max_sectors_kb = 1024
-block/{disk}/queue/read_ahead_kb = 4096
-block/{disk}/queue/rq_affinity = 2
-
-[systemctl]
-#TODO CONFIG
-
-[sysctl]
-#TODO CONFIG
-
-[script]
-#TODO CONFIG
-
-[ulimit]
-#TODO CONFIG
-
-[schedule_policy]
-#TODO CONFIG
-
-[check]
-#TODO CONFIG
-
-[tip]
-set /sys/block/{disk}/queue/iosched/retry_dev to 8 colon 16 = sysfs
-set /sys/block/{disk}/queue/iosched/retry_count to 8 = sysfs
-set /sys/block/{disk}/queue/iosched/retry_min_write to 2 = sysfs
diff --git a/profiles/basic-test-suite/euleros-baseline/lmbench.conf b/profiles/basic-test-suite/euleros-baseline/lmbench.conf
deleted file mode 100644
index 9ce64a4..0000000
--- a/profiles/basic-test-suite/euleros-baseline/lmbench.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (c) 2020 Huawei Technologies Co., Ltd.
-# A-Tune is licensed under the Mulan PSL v2.
-# You can use this software according to the terms and conditions of the Mulan PSL v2.
-# You may obtain a copy of Mulan PSL v2 at:
-# http://license.coscl.org.cn/MulanPSL2
-# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
-# PURPOSE.
-# See the Mulan PSL v2 for more details.
-# Create: 2020-06-18
-#
-# euleros baseline test lmbench A-Tune configuration
-#
-[main]
-include = include-basic-test-suite
-
-[kernel_config]
-#TODO CONFIG
-
-[bios]
-#TODO CONFIG
-
-[bootloader.grub2]
-#TODO CONFIG
-
-[sysfs]
-#TODO CONFIG
-
-[systemctl]
-#TODO CONFIG
-
-[sysctl]
-#TODO CONFIG
-
-[script]
-#TODO CONFIG
-
-[ulimit]
-#TODO CONFIG
-
-[schedule_policy]
-#TODO CONFIG
-
-[check]
-#TODO CONFIG
-
-[tip]
-mkfs.ext4 -b 16384 -O ^metadata_csum /dev/{disk} and restart the host = block
-modify compilation options from -O to -O2 = compile
diff --git a/profiles/basic-test-suite/euleros-baseline/netperf.conf b/profiles/basic-test-suite/euleros-baseline/netperf.conf
deleted file mode 100644
index 1470e07..0000000
--- a/profiles/basic-test-suite/euleros-baseline/netperf.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (c) 2020 Huawei Technologies Co., Ltd.
-# A-Tune is licensed under the Mulan PSL v2.
-# You can use this software according to the terms and conditions of the Mulan PSL v2.
-# You may obtain a copy of Mulan PSL v2 at:
-# http://license.coscl.org.cn/MulanPSL2
-# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
-# PURPOSE.
-# See the Mulan PSL v2 for more details.
-# Create: 2020-06-18
-#
-# euleros baseline test netperf A-Tune configuration
-#
-[main]
-include = include-basic-test-suite
-
-[kernel_config]
-#TODO CONFIG
-
-[bios]
-#TODO CONFIG
-
-[bootloader.grub2]
-#TODO CONFIG
-
-[sysfs]
-#TODO CONFIG
-
-[systemctl]
-#TODO CONFIG
-
-[sysctl]
-#TODO CONFIG
-
-[script]
-#TODO CONFIG
-
-[ulimit]
-#TODO CONFIG
-
-[schedule_policy]
-#TODO CONFIG
-
-[check]
-#TODO CONFIG
-
-[tip]
-#TODO CONFIG
diff --git a/profiles/basic-test-suite/euleros-baseline/stream.conf b/profiles/basic-test-suite/euleros-baseline/stream.conf
deleted file mode 100644
index 602a7c4..0000000
--- a/profiles/basic-test-suite/euleros-baseline/stream.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (c) 2020 Huawei Technologies Co., Ltd.
-# A-Tune is licensed under the Mulan PSL v2.
-# You can use this software according to the terms and conditions of the Mulan PSL v2.
-# You may obtain a copy of Mulan PSL v2 at:
-# http://license.coscl.org.cn/MulanPSL2
-# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
-# PURPOSE.
-# See the Mulan PSL v2 for more details.
-# Create: 2020-06-18
-#
-# euleros baseline test stream A-Tune configuration
-#
-[main]
-include = include-basic-test-suite
-
-[kernel_config]
-#TODO CONFIG
-
-[bios]
-#TODO CONFIG
-
-[bootloader.grub2]
-#TODO CONFIG
-
-[sysfs]
-#TODO CONFIG
-
-[systemctl]
-#TODO CONFIG
-
-[sysctl]
-#TODO CONFIG
-
-[script]
-#TODO CONFIG
-
-[ulimit]
-#TODO CONFIG
-
-[schedule_policy]
-#TODO CONFIG
-
-[check]
-#TODO CONFIG
-
-[tip]
-add -ftree-vectorize compilation option in gcc compilation = application
diff --git a/profiles/basic-test-suite/euleros-baseline/unixbench.conf b/profiles/basic-test-suite/euleros-baseline/unixbench.conf
deleted file mode 100644
index fb74ab6..0000000
--- a/profiles/basic-test-suite/euleros-baseline/unixbench.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (c) 2020 Huawei Technologies Co., Ltd.
-# A-Tune is licensed under the Mulan PSL v2.
-# You can use this software according to the terms and conditions of the Mulan PSL v2.
-# You may obtain a copy of Mulan PSL v2 at:
-# http://license.coscl.org.cn/MulanPSL2
-# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
-# PURPOSE.
-# See the Mulan PSL v2 for more details.
-# Create: 2020-06-18
-#
-# euleros baseline test unixbench A-Tune configuration
-#
-[main]
-include = include-throughput-performance, include-basic-test-suite
-
-[kernel_config]
-#TODO CONFIG
-
-[bios]
-#TODO CONFIG
-
-[bootloader.grub2]
-#TODO CONFIG
-
-[sysfs]
-#TODO CONFIG
-
-[systemctl]
-#TODO CONFIG
-
-[sysctl]
-#TODO CONFIG
-
-[script]
-#TODO CONFIG
-
-[ulimit]
-#TODO CONFIG
-
-[schedule_policy]
-#TODO CONFIG
-
-[check]
-#TODO CONFIG
-
-[tip]
-format the test block {disk} size to 64KB = block
-use writeback, nojournal_checksum, noatime, nobarrier, noinit_itable, noacl and dioread_nolock to mount the test partition and set inode_readahead_blks to 4096 = block
-add --without-gmp compilation option to coreutils package and upgrade the package = compile
-add --static to the environment variable LDFLAGS during the compilation of bash package and upgrade the package = compile
diff --git a/tests/configurator/test_kernel_config.py b/tests/configurator/test_kernel_config.py
index d6dfa7a..9be5485 100644
--- a/tests/configurator/test_kernel_config.py
+++ b/tests/configurator/test_kernel_config.py
@@ -21,13 +21,13 @@ from analysis.plugin.public import NeedConfigWarning
class TestKernelConfig:
""" test kernel config"""
user = "UT"
- config_key = "CONFIG_EULEROS_DETAILED_RAS_INFO"
+ config_key = "CONFIG_KDB_KEYBOARD"
def test_get_kernel_config_no_exist(self):
"""test get kernel config with no exist"""
try:
kernel_config = KernelConfig(self.user)
- value = kernel_config.get("CONFIG_EULEROS_TEST_KERNEL_CONFIG")
+ value = kernel_config.get("CONFIG_TEST_KERNEL_CONFIG")
assert value is None
except (FileNotFoundError, LookupError):
assert True
--
1.8.3.1

32
atune.spec
View File

@ -2,27 +2,24 @@
Summary: AI auto tuning system Summary: AI auto tuning system
Name: atune Name: atune
Version: 0.3 Version: 1.0.0
Release: 0.9 Release: 1
License: Mulan PSL v2 License: Mulan PSL v2
URL: https://gitee.com/openeuler/A-Tune URL: https://gitee.com/openeuler/A-Tune
Source: https://gitee.com/openeuler/A-Tune/repository/archive/v%{version}.tar.gz Source: https://gitee.com/openeuler/A-Tune/repository/archive/v%{version}.tar.gz
Patch1: atune-support-for-Go-1.15.patch
Patch2: atune-update-file-description-and-testcase.patch
Patch6001: backport-atune-add-go-compile-flag.patch
Patch6002: backport-atune-add-successExitStatus-100-to-atuned.service.patch
BuildRequires: rpm-build golang-bin procps-ng BuildRequires: rpm-build golang-bin procps-ng
BuildRequires: sqlite >= 3.24.0 openssl BuildRequires: sqlite >= 3.24.0 openssl
BuildRequires: python3-scikit-optimize python3-pandas python3-xgboost BuildRequires: python3-scikit-optimize python3-pandas python3-xgboost
BuildRequires: python3-pyyaml python3-numpy
Requires: systemd Requires: systemd
Requires: atune-client Requires: atune-client
Requires: atune-db Requires: atune-db
Requires: python3-dict2xml Requires: python3-dict2xml
Requires: python3-flask-restful Requires: python3-flask-restful
Requires: python3-pandas Requires: python3-pandas
Requires: python3-pyyaml
Requires: python3-numpy
%ifarch aarch64 %ifarch aarch64
Requires: prefetch_tuning Requires: prefetch_tuning
%endif %endif
@ -30,6 +27,7 @@ Requires: perf
Requires: sysstat Requires: sysstat
Requires: hwloc-gui Requires: hwloc-gui
Requires: psmisc Requires: psmisc
Requires: atune-collector
%define debug_package %{nil} %define debug_package %{nil}
@ -58,19 +56,18 @@ Requires: python3-xgboost
Requires: python3-flask-restful Requires: python3-flask-restful
Requires: python3-pandas Requires: python3-pandas
Requires: python3-lhsmdu Requires: python3-lhsmdu
Conflicts: atune < 0.3-0.1 Conflicts: atune < 0.3-0.3
%description engine %description engine
atune engine tool for manage atuned AI tuning system. atune engine tool for manage atuned AI tuning system.
%prep %prep
%autosetup -n A-Tune -p1 %autosetup -n A-Tune-v%{version} -p1
%build %build
sed -i "s/^rest_tls.*/rest_tls = false/" misc/atuned.cnf sed -i "s/^rest_tls.*/rest_tls = false/" misc/atuned.cnf
sed -i "s/^engine_tls.*/engine_tls = false/" misc/atuned.cnf sed -i "s/^engine_tls.*/engine_tls = false/" misc/atuned.cnf
sed -i "s/^engine_tls.*/engine_tls = false/" misc/engine.cnf sed -i "s/^engine_tls.*/engine_tls = false/" misc/engine.cnf
make models
%make_build %make_build
%install %install
@ -84,18 +81,17 @@ make models
%attr(0640,root,root) /usr/lib/atuned/modules/daemon_profile_server.so %attr(0640,root,root) /usr/lib/atuned/modules/daemon_profile_server.so
%attr(0640,root,root) %{_unitdir}/atuned.service %attr(0640,root,root) %{_unitdir}/atuned.service
%attr(0750,root,root) %{_bindir}/atuned %attr(0750,root,root) %{_bindir}/atuned
%attr(0750,root,root) /usr/libexec/atuned/scripts/*
%attr(0750,root,root) /usr/libexec/atuned/analysis/* %attr(0750,root,root) /usr/libexec/atuned/analysis/*
%attr(0640,root,root) /usr/lib/atuned/profiles/* %attr(0640,root,root) /usr/lib/atuned/profiles/*
%exclude /usr/libexec/atuned/analysis/app_engine.py %exclude /usr/libexec/atuned/analysis/app_engine.py
%exclude /usr/libexec/atuned/analysis/models/ %exclude /usr/libexec/atuned/analysis/models/
%exclude /usr/libexec/atuned/analysis/optimizer/ %exclude /usr/libexec/atuned/analysis/optimizer/
%exclude /usr/libexec/atuned/analysis/engine/ %exclude /usr/libexec/atuned/analysis/engine/
%exclude /usr/libexec/atuned/analysis/dataset/
%attr(0750,root,root) %dir /usr/lib/atuned %attr(0750,root,root) %dir /usr/lib/atuned
%attr(0750,root,root) %dir /usr/lib/atuned/modules %attr(0750,root,root) %dir /usr/lib/atuned/modules
%attr(0750,root,root) %dir /usr/lib/atuned/profiles %attr(0750,root,root) %dir /usr/lib/atuned/profiles
%attr(0750,root,root) %dir /usr/libexec/atuned %attr(0750,root,root) %dir /usr/libexec/atuned
%attr(0750,root,root) %dir /usr/libexec/atuned/scripts
%attr(0750,root,root) %dir /usr/libexec/atuned/analysis %attr(0750,root,root) %dir /usr/libexec/atuned/analysis
%attr(0750,root,root) %dir /usr/share/atuned %attr(0750,root,root) %dir /usr/share/atuned
%attr(0750,root,root) %dir /etc/atuned %attr(0750,root,root) %dir /etc/atuned
@ -114,22 +110,17 @@ make models
%attr(0750,root,root) %dir /var/run/atuned %attr(0750,root,root) %dir /var/run/atuned
%attr(0750,root,root) /var/lib/atuned/atuned.db %attr(0750,root,root) /var/lib/atuned/atuned.db
%attr(0750,root,root) %dir /usr/libexec/atuned %attr(0750,root,root) %dir /usr/libexec/atuned
%attr(0750,root,root) %dir /usr/libexec/atuned/analysis
%attr(0750,root,root) %dir /usr/libexec/atuned/analysis/models
%attr(0750,root,root) /usr/libexec/atuned/analysis/models/*
%files engine %files engine
%license License/LICENSE %license License/LICENSE
%defattr(0640,root,root,-) %defattr(0640,root,root,-)
%attr(0640,root,root) %{_unitdir}/atune-engine.service %attr(0640,root,root) %{_unitdir}/atune-engine.service
%attr(0750,root,root) /usr/libexec/atuned/analysis/* %attr(0750,root,root) /usr/libexec/atuned/analysis/*
%attr(0750,root,root) /usr/libexec/atuned/resources/*
%attr(0750,root,root) /etc/atuned/* %attr(0750,root,root) /etc/atuned/*
%exclude /usr/libexec/atuned/analysis/app.py %exclude /usr/libexec/atuned/analysis/app_rest.py
%exclude /usr/libexec/atuned/analysis/plugin/ %exclude /usr/libexec/atuned/analysis/plugin/
%exclude /usr/libexec/atuned/analysis/atuned/ %exclude /usr/libexec/atuned/analysis/atuned/
%attr(0750,root,root) %dir /usr/libexec/atuned/analysis %attr(0750,root,root) %dir /usr/libexec/atuned/analysis
%attr(0750,root,root) %dir /usr/libexec/atuned/resources
%attr(0750,root,root) %dir /etc/atuned %attr(0750,root,root) %dir /etc/atuned
%exclude /etc/atuned/atuned.cnf %exclude /etc/atuned/atuned.cnf
%exclude /etc/atuned/rules %exclude /etc/atuned/rules
@ -146,6 +137,9 @@ make models
%systemd_postun_with_restart atuned.service %systemd_postun_with_restart atuned.service
%changelog %changelog
* Tue Nov 16 2021 hanxinke <hanxinke@huawei.com> - 1.0.0-1
- upgrade to v1.0.0
* Tue Sep 28 2021 hanxinke <hanxinke@huawei.com> - 0.3-0.9 * Tue Sep 28 2021 hanxinke <hanxinke@huawei.com> - 0.3-0.9
- add successExitStatus 100 to atuned.service - add successExitStatus 100 to atuned.service

34
backport-atune-add-go-compile-flag.patch
View File

@ -1,34 +0,0 @@
From 44c3814b0814d64d104ddb0605fad46be8d0b06f Mon Sep 17 00:00:00 2001
From: zhuguodong <zhuguodong8@huawei.com>
Date: Thu, 24 Dec 2020 08:06:38 +0000
Subject: [PATCH] makefile change
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 68f6252..b54458c 100755
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ SRCVERSION = $(shell git rev-parse --short HEAD 2>/dev/null)
ATUNEVERSION = $(VERSION)$(if $(SRCVERSION),($(SRCVERSION)))
GOLDFLAGS += -X gitee.com/openeuler/A-Tune/common/config.Version=$(ATUNEVERSION)
-GOFLAGS = -ldflags "$(GOLDFLAGS)"
+GOFLAGS = -ldflags '-s -w -extldflags "-static" -extldflags "-zrelro" -extldflags "-znow" -extldflags "-ftrapv" $(GOLDFLAGS)'
CERT_PATH=$(DESTDIR)/etc/atuned
GRPC_CERT_PATH=$(CERT_PATH)/grpc_certs
@@ -29,7 +29,7 @@ atuned:
go build -mod=vendor -v $(GOFLAGS) -o $(PKGPATH)/atuned cmd/atuned/*.go
modules:
- cd ${CURDIR}/modules/server/profile/ && go build -mod=vendor -buildmode=plugin -o ${CURDIR}/pkg/daemon_profile_server.so *.go
+ cd ${CURDIR}/modules/server/profile/ && go build -mod=vendor -buildmode=plugin $(GOFLAGS) -o ${CURDIR}/pkg/daemon_profile_server.so *.go
clean:
rm -rf $(PKGPATH)/*
--
2.27.0

53
backport-atune-add-successExitStatus-100-to-atuned.service.patch
View File

@ -1,53 +0,0 @@
From e45f1c5d09938dc2911c0b5d57ef8feb1b951c97 Mon Sep 17 00:00:00 2001
From: Zhipeng Xie <xiezhipeng1@huawei.com>
Date: Sun, 20 Sep 2020 23:59:54 -0400
Subject: [PATCH] Add SuccessExitStatus=100 to atuned.service
call os.Exit(100) when get killed signal
Fix https://gitee.com/openeuler/A-Tune/issues/I1VCQY?from=project-issue
Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
---
common/service/pyservice/pyservice.go | 4 ++--
misc/atuned.service | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/service/pyservice/pyservice.go b/common/service/pyservice/pyservice.go
index 99b2239..b3df55c 100644
--- a/common/service/pyservice/pyservice.go
+++ b/common/service/pyservice/pyservice.go
@@ -14,10 +14,10 @@
package pyservice
import (
+ "bufio"
"gitee.com/openeuler/A-Tune/common/config"
"gitee.com/openeuler/A-Tune/common/log"
"gitee.com/openeuler/A-Tune/common/registry"
- "bufio"
"io"
"os"
"os/exec"
@@ -94,5 +94,5 @@ func listenToSystemSignals(cmd *exec.Cmd) {
signal.Notify(signalChan, os.Interrupt, syscall.SIGTERM)
<-signalChan
_ = syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
- os.Exit(-1)
+ os.Exit(100)
}
diff --git a/misc/atuned.service b/misc/atuned.service
index e2a8851..3b31b6e 100644
--- a/misc/atuned.service
+++ b/misc/atuned.service
@@ -6,6 +6,7 @@ Requires=polkit.service
[Service]
Type=notify
ExecStart=/usr/bin/atuned
+SuccessExitStatus=100
[Install]
WantedBy=multi-user.target
--
1.8.3.1

BIN
v0.3.tar.gz → v1.0.0.tar.gz
View File

Binary file not shown.