ansible: add some configuration items and correct some script bugs

Cyber-SiKu · Mar 11, 2021 · 9b13166 · 9b13166
1 parent 3a8eb85
commit 9b13166
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 55 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 }}" }