diff --git a/curve-ansible/README.md b/curve-ansible/README.md index 343ed1d5fa..d5bf29a57c 100644 --- a/curve-ansible/README.md +++ b/curve-ansible/README.md @@ -374,7 +374,6 @@ ansible-playbook rolling_update_nebd.yml -i client.ini --tags restart │   ├── get_curve_version_from_metric.yml # 从metric获取curve版本 │   ├── get_distro_name.yml # 获取系统版本 │   ├── get_nebd_version_from_metric.yml # 从metric获取nebd版本 -│   ├── get_software_version_from_package_version.yml # 从包版本获取软件版本 │   ├── install_with_yum_apt.yml # 用apt或yum的方式安装 │   ├── start_service.yml # 启动服务 │   ├── stop_service.yml # 停止服务 diff --git a/curve-ansible/common_tasks/get_software_version_from_package_version.yml b/curve-ansible/common_tasks/get_software_version_from_package_version.yml deleted file mode 100644 index ee6c6b0350..0000000000 --- a/curve-ansible/common_tasks/get_software_version_from_package_version.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# -# Copyright (c) 2020 NetEase Inc. -# -# Licensed 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. -# - -- name: get software version from package_version - shell: echo {{ package_version }} | awk -F "+" '{print $1}' - register: - result - failed_when: result.stdout == "" - -- name: set software_version - set_fact: - software_version: "{{ result.stdout }}" diff --git a/curve-ansible/roles/generate_config/defaults/main.yml b/curve-ansible/roles/generate_config/defaults/main.yml index f84053084e..d19d110356 100644 --- a/curve-ansible/roles/generate_config/defaults/main.yml +++ b/curve-ansible/roles/generate_config/defaults/main.yml @@ -200,6 +200,8 @@ client_log_path: /data/log/curve/ client_metric_dummy_server_start_port: 9000 client_turn_off_health_check: true client_session_map_path: ./session_map.json +client_closefd_timeout_sec: 300 +client_closefd_time_interval_sec: 600 # nebd默认配置 client_config_path: /etc/curve/client.conf diff --git a/curve-ansible/roles/generate_config/templates/client.conf.j2 b/curve-ansible/roles/generate_config/templates/client.conf.j2 index cc7eb26b1a..e979cab1d3 100644 --- a/curve-ansible/roles/generate_config/templates/client.conf.j2 +++ b/curve-ansible/roles/generate_config/templates/client.conf.j2 @@ -133,6 +133,14 @@ global.logPath={{ client_log_path }} # 单元测试情况下 # logpath=./runlog/ +# +################# read from source conf ############### +# +# close timeout fd which read from source file +closefd.timeout={{ client_closefd_timeout_sec }} +# timeInterval of backend thread iterates the fdMap to close the timeout fd +closefd.timeInterval={{ client_closefd_time_interval_sec }} + # ############### metric 配置信息 ############# # diff --git a/curve-ansible/roles/restart_service/tasks/include/restart_nebd.yml b/curve-ansible/roles/restart_service/tasks/include/restart_nebd.yml index 63342997b5..b3659d838b 100644 --- a/curve-ansible/roles/restart_service/tasks/include/restart_nebd.yml +++ b/curve-ansible/roles/restart_service/tasks/include/restart_nebd.yml @@ -18,12 +18,6 @@ - name: restart nebd-server block: - name: stop nebd-server - vars: - ch_dir: "{{ deploy_dir }}" - daemon_script: nebd-daemon - service_port: "{{ nebd_port }}" - process_name: > - {{ curve_bin_dir }}/nebd-server - include_tasks: common_tasks/stop_service.yml + include_tasks: roles/stop_service/tasks/include/stop_nebd.yml - name: start nebd-server include_tasks: roles/start_service/tasks/include/start_nebd.yml diff --git a/curve-ansible/rolling_update_curve.yml b/curve-ansible/rolling_update_curve.yml index 6535c1ea88..57f130656a 100644 --- a/curve-ansible/rolling_update_curve.yml +++ b/curve-ansible/rolling_update_curve.yml @@ -109,13 +109,9 @@ - pause: prompt: "Confirm restart mds in {{ inventory_hostname }}. ENTER to continue or CTRL-C A to quit" when: need_confirm - - vars: - package_version: "{{ mds_package_version }}" - software_version: - include_tasks: "common_tasks/get_software_version_from_package_version.yml" # 重启mds roles: - - { role: restart_service, service_name: mds, expected_curve_version: "{{ software_version }}", + - { role: restart_service, service_name: mds, expected_curve_version: "{{ mds_package_version }}", command_need_sudo: "{{ mds_need_sudo }}"} @@ -155,12 +151,8 @@ - pause: prompt: "Confirm restart chunkserver in {{ play_hosts | join(',') }}. ENTER to continue or CTRL-C A to quit" when: need_confirm - - vars: - package_version: "{{ cs_package_version }}" - software_version: - include_tasks: "common_tasks/get_software_version_from_package_version.yml" roles: - - { role: restart_service, service_name: chunkserver, expected_curve_version: "{{ software_version }}", + - { role: restart_service, service_name: chunkserver, expected_curve_version: "{{ cs_package_version }}", command_need_sudo: "{{ chunkserver_need_sudo }}"} tasks: - include_tasks: "common_tasks/wait_copysets_status_healthy.yml" @@ -210,12 +202,7 @@ - pause: prompt: "Confirm restart snapshotclone in {{ inventory_hostname }}. ENTER to continue or CTRL-C A to quit" when: need_confirm - - vars: - package_version: "{{ snapshot_package_version }}" - software_version: - include_tasks: "common_tasks/get_software_version_from_package_version.yml" - # 重启snapshot clone roles: - - { role: restart_service, service_name: snapshotclone, expected_curve_version: "{{ software_version }}", + - { role: restart_service, service_name: snapshotclone, expected_curve_version: "{{ snapshot_package_version }}", command_need_sudo: "{{ snapshot_need_sudo }}" } diff --git a/curve-ansible/rolling_update_nebd.yml b/curve-ansible/rolling_update_nebd.yml index cde8e4453b..8ab5ca1bfc 100644 --- a/curve-ansible/rolling_update_nebd.yml +++ b/curve-ansible/rolling_update_nebd.yml @@ -49,10 +49,6 @@ - pause: prompt: "Confirm restart nebd-server in {{ inventory_hostname }}. ENTER to continue or CTRL-C A to quit" when: need_confirm - - vars: - package_version: "{{ nebd_package_version }}" - software_version: - include_tasks: "common_tasks/get_software_version_from_package_version.yml" roles: - - { role: restart_service, service_name: nebd, expected_nebd_version: "{{ software_version }}", + - { role: restart_service, service_name: nebd, expected_nebd_version: "{{ nebd_package_version }}", command_need_sudo: "{{ nebd_need_sudo }}" }