Merge pull request #1545 from swordqiu/hotfix/qj-parallel-limit-nproc

fix: parallel limit jobs by nproc

Author: swordqiu

lib/service.py

@@ -385,14 +385,16 @@ def inject_options(self, parser):
                             metavar='OFFLINE_DATA_PATH',
                             help="offline ISO mount point, e.g., /mnt")
         parser.add_argument("--ch-password", dest="ch_password",
-                            default="your-clickhouse-password",
                             help=help_d("clickhouse password"))
         parser.add_argument("--ch-port", dest="ch_port",
                             default=9000, type=int,
                             help=help_d("clickhouse port"))
 
     def do_action(self, args):
         # config = 
+        if args.ch_password is None:
+            args.ch_password = utils.generage_random_string(12)
+            print(f'generated clickhouse password: {args.ch_password}')
         cluster = construct_cluster(
             args.primary_master_host,
             args.ssh_user,

lib/utils.py

@@ -107,3 +107,11 @@ def is_valid_dns(dns):
         return True
     except socket.gaierror:
         return False
+
+def generage_random_string(N=12):
+    import random
+    import string
+    return ''.join(
+        random.choice(string.ascii_uppercase + string.digits)
+        for _ in range(N))
+

onecloud/roles/clickhouse/deploy/tasks/main.yml

@@ -39,5 +39,4 @@
   when:
   - offline_data_path is defined
   - offline_data_path | length > 0
-  - (is_centos_x86 | default(false) | bool == true) or (is_openeuler_x86 | default(false) | bool == true)
   - ch_password | default('') | length > 0

onecloud/roles/clickhouse/install/tasks/main.yml

@@ -4,7 +4,23 @@
 
 - block:
   - name: Import OS Specific tasks
-    include_tasks: "{{ ansible_distribution | lower |replace(' ', '_')}}.yml"
+    include_tasks: "{{ item }}"
+    with_first_found:
+    - files:
+      - "{{ ansible_distribution | lower |replace(' ', '_')}}.yml"
+      - defaults.yml
+      paths:
+        - os
+
+  - name: Ensure clickhouse-server installed
+    package:
+      name: clickhouse-server
+      state: present
+
+  - name: Ensure clickhouse-client installed
+    package:
+      name: clickhouse-client
+      state: present
 
   - name: Ensure group "clickhouse" exists
     ansible.builtin.group:
@@ -50,7 +66,7 @@
   - name: Allow remote hosts connect to clickhouse (config.xml)
     lineinfile:
       path: /etc/clickhouse-server/config.xml
-      insertafter: '<!-- Default values - try listen localhost on IPv4 and IPv6. -->'
+      insertafter: '<!-- <listen_host>::</listen_host> -->'
       line: '    <listen_host>::</listen_host>'
       state: present
       backup: yes
@@ -157,4 +173,3 @@
   when:
   - offline_data_path is defined
   - offline_data_path | length > 0
-  - (is_centos_x86 | default(false) | bool == true) or (is_openeuler_x86 | default(false) | bool == true)