From 9237a98965004e2198d7672302f1459d7b1da1d8 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 16 Apr 2021 08:42:52 +0200 Subject: [PATCH] debug debug Signed-off-by: Guillaume Abrioux --- roles/ceph-osd/tasks/main.yml | 11 +++++++++-- tests/functional/filestore-to-bluestore/hosts | 8 ++------ .../filestore-to-bluestore/vagrant_variables.yml | 2 +- tox-filestore_to_bluestore.ini | 4 ++-- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml index 185950553..e65d7bb64 100644 --- a/roles/ceph-osd/tasks/main.yml +++ b/roles/ceph-osd/tasks/main.yml @@ -87,8 +87,8 @@ - name: wait for all osd to be up command: "{{ hostvars[groups[mon_group_name][0]]['container_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} osd stat -f json" register: wait_for_all_osds_up - retries: "{{ nb_retry_wait_osd_up }}" - delay: "{{ delay_wait_osd_up }}" + retries: "86400" + delay: "1" changed_when: false delegate_to: "{{ groups[mon_group_name][0] }}" until: @@ -99,6 +99,13 @@ - inventory_hostname == ansible_play_hosts_all | last tags: wait_all_osds_up +- name: sleep 365d + command: sleep 365d + when: + - not ansible_check_mode + - inventory_hostname == ansible_play_hosts_all | last + - sleep_after_fs2bs | default(False) | bool + - name: include crush_rules.yml include_tasks: crush_rules.yml when: hostvars[groups[mon_group_name][0]]['crush_rule_config'] | default(crush_rule_config) | bool diff --git a/tests/functional/filestore-to-bluestore/hosts b/tests/functional/filestore-to-bluestore/hosts index 9c458f7d0..06ddec6f1 100644 --- a/tests/functional/filestore-to-bluestore/hosts +++ b/tests/functional/filestore-to-bluestore/hosts @@ -2,9 +2,5 @@ mon0 [osds] -osd0 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/dev/sdc1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'journal': 'journal1', 'journal_vg': 'journals'}]" -osd1 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/dev/sdc1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'journal': 'journal1', 'journal_vg': 'journals'}]" dmcrypt=true -osd2 osd_objectstore=filestore devices="['/dev/sda', '/dev/sdb']" dedicated_devices="['/dev/sdc']" journal_size=1024 -osd3 osd_objectstore=filestore lvm_volumes="[{'data': '/dev/sda', 'journal': '/dev/sdc1'},{'data': '/dev/sdb', 'journal': '/dev/sdc2'}]" -osd4 osd_objectstore=filestore lvm_volumes="[{'data': '/dev/sda', 'journal': '/dev/sdc1'},{'data': '/dev/sdb', 'journal': '/dev/sdc2'}]" dmcrypt=true -osd5 osd_objectstore=filestore osd_auto_discovery=true journal_size=1024 \ No newline at end of file +osd0 osd_objectstore=filestore lvm_volumes="[{'data': '/dev/sda', 'journal': '/dev/sdc1'},{'data': '/dev/sdb', 'journal': '/dev/sdc2'}]" +osd1 osd_objectstore=filestore lvm_volumes="[{'data': '/dev/sda', 'journal': '/dev/sdc1'},{'data': '/dev/sdb', 'journal': '/dev/sdc2'}]" diff --git a/tests/functional/filestore-to-bluestore/vagrant_variables.yml b/tests/functional/filestore-to-bluestore/vagrant_variables.yml index df6851c17..86ff61536 100644 --- a/tests/functional/filestore-to-bluestore/vagrant_variables.yml +++ b/tests/functional/filestore-to-bluestore/vagrant_variables.yml @@ -5,7 +5,7 @@ docker: false # DEFINE THE NUMBER OF VMS TO RUN mon_vms: 1 -osd_vms: 6 +osd_vms: 2 mds_vms: 0 rgw_vms: 0 nfs_vms: 0 diff --git a/tox-filestore_to_bluestore.ini b/tox-filestore_to_bluestore.ini index 79e272032..03a56ef14 100644 --- a/tox-filestore_to_bluestore.ini +++ b/tox-filestore_to_bluestore.ini @@ -43,8 +43,7 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml - ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit 'osd0:osd1' - ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit 'osd3:osd4' --tags partitions + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit 'osd0:osd1' --tags partitions # deploy the cluster ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ @@ -57,6 +56,7 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/filestore-to-bluestore.yml --limit osds --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ + sleep_after_fs2bs=True \ " bash -c "CEPH_STABLE_RELEASE={env:UPDATE_CEPH_STABLE_RELEASE:nautilus} py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests"