feature: add [network] to CPI
(cherry picked from commit b89b188ab8be1c782e535bf89e00466bcddf96fd)
This commit is contained in:
gaoruoshu@huawei.com
openeuler-sync-bot
parent
d66a47f5bb
commit
d044c7f068
@ -2,7 +2,7 @@
|
||||
|
||||
Name: atune-collector
|
||||
Version: 1.1.0
|
||||
Release: 4
|
||||
Release: 5
|
||||
Summary: A-Tune-Collector is used to collect various system resources.
|
||||
License: Mulan PSL v2
|
||||
URL: https://gitee.com/openeuler/A-Tune-Collector
|
||||
@ -20,6 +20,7 @@ Patch9: feature-set-nginx.patch
|
||||
Patch10: bugfix-create-file-only-if-setting-params.patch
|
||||
Patch11: change-import-behavior.patch
|
||||
Patch12: atune-collector-add-backup-for-apps.patch
|
||||
Patch13: feature-add-network-CPI.patch
|
||||
|
||||
BuildRequires: python3-setuptools
|
||||
Requires: python3-dict2xml
|
||||
@ -44,6 +45,9 @@ The A-Tune-Collector is used to collect various system resources and can also be
|
||||
%attr(0600,root,root) %{_sysconfdir}/atune_collector/*
|
||||
|
||||
%changelog
|
||||
* Tue Aug 22 2023 gaoruoshu <gaoruoshu@huawei.com> - 1.1.0-5
|
||||
- feature: add [network] to CPI
|
||||
|
||||
* Wed Aug 16 2023 gaoruoshu <gaoruoshu@huawei.com> - 1.1.0-4
|
||||
- atune-collector: add backup for apps
|
||||
|
||||
|
||||
182
feature-add-network-CPI.patch
Normal file
182
feature-add-network-CPI.patch
Normal file
@ -0,0 +1,182 @@
|
||||
From 148c57c3695080667e138425b1295e89197a241b Mon Sep 17 00:00:00 2001
|
||||
From: gaoruoshu <gaoruoshu@huawei.com>
|
||||
Date: Tue, 22 Aug 2023 15:07:50 +0800
|
||||
Subject: [PATCH] feature: add [network] CPI
|
||||
|
||||
---
|
||||
.../plugin/configurator/__init__.py | 2 +
|
||||
.../plugin/configurator/network/__init__.py | 21 ++++
|
||||
.../plugin/configurator/network/network.py | 113 ++++++++++++++++++
|
||||
3 files changed, 136 insertions(+)
|
||||
create mode 100644 atune_collector/plugin/configurator/network/__init__.py
|
||||
create mode 100644 atune_collector/plugin/configurator/network/network.py
|
||||
|
||||
diff --git a/atune_collector/plugin/configurator/__init__.py b/atune_collector/plugin/configurator/__init__.py
|
||||
index fd7ea63..46cff84 100755
|
||||
--- a/atune_collector/plugin/configurator/__init__.py
|
||||
+++ b/atune_collector/plugin/configurator/__init__.py
|
||||
@@ -22,6 +22,7 @@ from .bios import *
|
||||
from .bootloader import *
|
||||
from .file_config import *
|
||||
from .kernel_config import *
|
||||
+from .network import *
|
||||
from .script import *
|
||||
from .sysctl import *
|
||||
from .sysfs import *
|
||||
@@ -37,6 +38,7 @@ __all__ = ["exceptions",
|
||||
"bootloader",
|
||||
"file_config",
|
||||
"kernel_config",
|
||||
+ "network",
|
||||
"script",
|
||||
"sysctl",
|
||||
"sysfs",
|
||||
diff --git a/atune_collector/plugin/configurator/network/__init__.py b/atune_collector/plugin/configurator/network/__init__.py
|
||||
new file mode 100644
|
||||
index 0000000..088e459
|
||||
--- /dev/null
|
||||
+++ b/atune_collector/plugin/configurator/network/__init__.py
|
||||
@@ -0,0 +1,21 @@
|
||||
+#!/usr/bin/python3
|
||||
+# -*- coding: utf-8 -*-
|
||||
+# Copyright (c) 2019 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: 2023-08-22
|
||||
+
|
||||
+"""
|
||||
+Init file.
|
||||
+"""
|
||||
+
|
||||
+__all__ = ["network"]
|
||||
+
|
||||
+from . import network
|
||||
+
|
||||
diff --git a/atune_collector/plugin/configurator/network/network.py b/atune_collector/plugin/configurator/network/network.py
|
||||
new file mode 100644
|
||||
index 0000000..977f29c
|
||||
--- /dev/null
|
||||
+++ b/atune_collector/plugin/configurator/network/network.py
|
||||
@@ -0,0 +1,113 @@
|
||||
+#!/usr/bin/python3
|
||||
+# -*- coding: utf-8 -*-
|
||||
+# Copyright (c) 2019 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: 2023-08-22
|
||||
+
|
||||
+"""
|
||||
+The sub class of the Configurator, used to extend script for network for CPI.
|
||||
+"""
|
||||
+
|
||||
+import re
|
||||
+import logging
|
||||
+import os
|
||||
+import math
|
||||
+import configparser
|
||||
+import subprocess
|
||||
+
|
||||
+from ..exceptions import SetConfigError
|
||||
+from ..common import Configurator
|
||||
+
|
||||
+LOGGER = logging.getLogger(__name__)
|
||||
+
|
||||
+
|
||||
+class Network(Configurator):
|
||||
+ _module = "NETWORK"
|
||||
+ _submod = "NETWORK"
|
||||
+
|
||||
+
|
||||
+ def __init__(self, user=None):
|
||||
+ Configurator.__init__(self, user)
|
||||
+ self._cmd_map = {'xps': ['all', 'off', 'half', 'separate'],
|
||||
+ 'rps': ['all', 'off', 'half', 'separate']}
|
||||
+ self._nic = self._get_nic()
|
||||
+ self._queue_dir = '/sys/class/net/{}/queues'.format(self._nic)
|
||||
+
|
||||
+ def _get_nic(self):
|
||||
+ if not os.path.isfile('/etc/atuned/atuned.cnf'):
|
||||
+ raise SetConfigError('Cannot get network name')
|
||||
+ config = configparser.ConfigParser()
|
||||
+ config.read('/etc/atuned/atuned.cnf')
|
||||
+ return config.get('system', 'network')
|
||||
+
|
||||
+ def _set_cpus(self, key, value, pattern):
|
||||
+ dir_strs = shell_cmd(['ls', self._queue_dir],
|
||||
+ 'Failed to get dir under {}'.format(self._queue_dir))
|
||||
+ dir_list = re.findall(pattern, dir_strs)
|
||||
+ core_num = os.cpu_count()
|
||||
+ for index, dir_name in enumerate(dir_list):
|
||||
+ file_path = '{}/{}/{}_cpus'.format(self._queue_dir, dir_name, key)
|
||||
+ shell_cmd(['cat', file_path],
|
||||
+ 'Failed to set {}={}: does not support for {}'.format(key, value, key))
|
||||
+
|
||||
+ if value == 'off':
|
||||
+ set_value = '0'
|
||||
+ elif value == 'all':
|
||||
+ set_value = 'f' * (core_num // 4)
|
||||
+ if core_num % 4 != 0:
|
||||
+ bin_num = int('0b' + '1' * (core_num % 4), 2)
|
||||
+ set_value = f"{bin_num:x}" + set_value
|
||||
+ elif value == 'half':
|
||||
+ half_num = core_num // 2
|
||||
+ if core_num == 1:
|
||||
+ val_format = 1
|
||||
+ elif key == 'rps':
|
||||
+ offset = index % (half_num + core_num % 2)
|
||||
+ val_format = 1 << offset
|
||||
+ else:
|
||||
+ offset = index % half_num
|
||||
+ val_format = 1 << (offset + half_num + core_num % 2)
|
||||
+ set_value = f"{val_format:x}"
|
||||
+ else: # value == 'separate'
|
||||
+ num = 1 << (index % core_num)
|
||||
+ set_value = f"{num:x}"
|
||||
+
|
||||
+ shell_cmd(['sh', '-c', 'echo {} > {}'.format(set_value, file_path)],
|
||||
+ 'Failed to set {} to {}'.format(key, file_path))
|
||||
+ return 0
|
||||
+
|
||||
+ def _set(self, key, value):
|
||||
+ if not key.lower() in self._cmd_map or not value.lower() in self._cmd_map[key.lower()]:
|
||||
+ raise SetConfigError("Invalid value {}={}".format(key, value))
|
||||
+
|
||||
+ if key == 'xps':
|
||||
+ self._set_cpus(key.lower(), value.lower(), r'tx-\d+')
|
||||
+ elif key == 'rps':
|
||||
+ self._set_cpus(key.lower(), value.lower(), r'rx-\d+')
|
||||
+
|
||||
+ return 0
|
||||
+
|
||||
+ def _get(self, key, _):
|
||||
+ pass
|
||||
+
|
||||
+ def _backup(self, config, _):
|
||||
+ return str(config)
|
||||
+
|
||||
+ @staticmethod
|
||||
+ def check(config1, config2):
|
||||
+ return True
|
||||
+
|
||||
+
|
||||
+def shell_cmd(cmd, error_message):
|
||||
+ output = subprocess.run(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
+ if output.returncode != 0:
|
||||
+ raise SetConfigError(error_message)
|
||||
+ return output.stdout.decode()
|
||||
+
|
||||
--
|
||||
2.27.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user