Hello community, here is the log from the commit of package drbd-formula for openSUSE:Leap:15.2 checked in at 2020-05-28 22:00:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/drbd-formula (Old) and /work/SRC/openSUSE:Leap:15.2/.drbd-formula.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd-formula" Thu May 28 22:00:49 2020 rev:2 rq:809884 version:0.3.10 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/drbd-formula/drbd-formula.changes 2020-01-15 14:53:03.581510797 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.drbd-formula.new.3606/drbd-formula.changes 2020-05-28 22:00:50.363281791 +0200 @@ -1,0 +2,20 @@ +Mon Dec 23 07:58:27 UTC 2019 - nick wang <nw...@suse.com> + +- Version 0.3.10 + * With the fix of salt-shaptools 0.2.9, doesn't need to + estimate a long time for write I/O completion. + +------------------------------------------------------------------- +Wed Dec 18 10:39:28 UTC 2019 - nick wang <nw...@suse.com> + +- Version 0.3.9 + * Make file system after initial resync finished + * Sleep longer in case sync source change state late + +------------------------------------------------------------------- +Thu Nov 28 10:01:29 UTC 2019 - Xabier Arbulu <xarb...@suse.com> + +- Version 0.3.8 + * Add json rendering to jinja templates for old salt versions + +------------------------------------------------------------------- Old: ---- drbd-formula-0.3.7.tar.gz New: ---- drbd-formula-0.3.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drbd-formula.spec ++++++ --- /var/tmp/diff_new_pack.tvxVR5/_old 2020-05-28 22:00:50.811283152 +0200 +++ /var/tmp/diff_new_pack.tvxVR5/_new 2020-05-28 22:00:50.815283164 +0200 @@ -19,14 +19,14 @@ # See also https://en.opensuse.org/openSUSE:Specfile_guidelines Name: drbd-formula -Version: 0.3.7 +Version: 0.3.10 Release: 0 Summary: DRBD deployment salt formula License: Apache-2.0 URL: https://github.com/SUSE/%{name} Source0: %{name}-%{version}.tar.gz Requires: drbd-utils -Requires: salt-shaptools +Requires: salt-shaptools >= 0.2.9 Requires: salt-formulas-configuration BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ drbd-formula-0.3.7.tar.gz -> drbd-formula-0.3.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.7/README.md new/drbd-formula-0.3.10/README.md --- old/drbd-formula-0.3.7/README.md 2019-11-14 10:13:12.998991325 +0100 +++ new/drbd-formula-0.3.10/README.md 2019-12-23 10:04:52.691682819 +0100 @@ -4,7 +4,7 @@ [](https://travis-ci.org/SUSE/drbd-formula) # Version -0.3.3 +0.3.9 # DRBD bootstrap salt formula diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.7/drbd/defaults.yaml new/drbd-formula-0.3.10/drbd/defaults.yaml --- old/drbd-formula-0.3.7/drbd/defaults.yaml 2019-11-14 10:13:12.998991325 +0100 +++ new/drbd-formula-0.3.10/drbd/defaults.yaml 2019-12-23 10:04:52.691682819 +0100 @@ -6,7 +6,7 @@ res_template: "res_single_vol_v9.j2" need_init_sync: true sync_interval: 10 - sync_timeout: 500 + sync_timeout: 2000 need_format: true stop_after_init_sync: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.7/drbd/global_confs.sls new/drbd-formula-0.3.10/drbd/global_confs.sls --- old/drbd-formula-0.3.7/drbd/global_confs.sls 2019-11-14 10:13:12.998991325 +0100 +++ new/drbd-formula-0.3.10/drbd/global_confs.sls 2019-12-23 10:04:52.691682819 +0100 @@ -8,7 +8,7 @@ - mode: 644 - template: jinja - defaults: - resource: {{ drbd.resource }} + resource: {{ drbd.resource|json }} /etc/drbd.d/global_common.conf: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.7/drbd/initial_sync.sls new/drbd-formula-0.3.10/drbd/initial_sync.sls --- old/drbd-formula-0.3.7/drbd/initial_sync.sls 2019-11-14 10:13:13.002993325 +0100 +++ new/drbd-formula-0.3.10/drbd/initial_sync.sls 2019-12-23 10:04:52.691682819 +0100 @@ -2,6 +2,20 @@ {% set host = grains['host'] %} {% for res in drbd.resource %} +{% if drbd.need_format is defined and drbd.need_format is sameas true%} +{% if res.file_system == 'xfs' %} +init_drbd_install_xfs: + pkg.installed: + - pkgs: + - xfsprogs + - retry: + attempts: 3 + interval: 15 +{% endif %} +{% endif %} +{% endfor %} + +{% for res in drbd.resource %} init-stop-{{ res.name }}-if-run: drbd.stopped: - name: {{ res.name }} @@ -20,42 +34,27 @@ - init-create-metadata-{{ res.name }} {% endfor %} -init-extra-sleep: - cmd.run: - - name: 'sleep 3' +init-sleep-drbd-start: + module.run: + - test.sleep: + - length: 3 {% for res in drbd.resource %} -{% if drbd.need_format is defined and drbd.need_format is sameas true%} -{% if res.file_system == 'xfs' %} -init_drbd_install_xfs: - pkg.installed: - - pkgs: - - xfsprogs -{% endif %} -{% endif %} - {% if drbd.promotion == host %} init-promote-{{ res.name }}: drbd.promoted: - name: {{ res.name }} - force: True - require: - - init-extra-sleep - -{% if drbd.need_format is defined and drbd.need_format is sameas true%} -init-format-{{ res.name }}: - blockdev.formatted: - - name: {{ res.device }} - - fs_type: {{ res.file_system|default("ext4") }} - - force: True -{% endif %} + - init-sleep-drbd-start {% else %} -init-sleep-{{ res.name }}: - cmd.run: - - name: 'sleep 3' +init-sleep-{{ res.name }}-promote: + module.run: + - test.sleep: + - length: 1 - require: - - init-extra-sleep + - init-sleep-drbd-start {% endif %} {% endfor %} @@ -67,13 +66,42 @@ - timeout: {{ drbd.sync_timeout }} - require: {% if drbd.promotion == host %} -{% if drbd.format_as is defined %} - - init-format-{{ res.name }} -{% else %} - init-promote-{{ res.name }} +{% else %} + - init-sleep-{{ res.name }}-promote {% endif %} + +# Sleep several seconds, in case one node stop before other nodes +# check disk status in wait-for-{{ res.name }}-synced +# sleep time should at least >= drbd.sync_interval +init-sleep-to-wait-all-synced-{{ res.name }}: + module.run: + - test.sleep: + - length: {{ drbd.sync_interval + 5 }} + - require: + - init-wait-for-{{ res.name }}-synced + +{% if drbd.need_format is defined and drbd.need_format is sameas true%} +{% if drbd.promotion == host %} +init-format-{{ res.name }}: + blockdev.formatted: + - name: {{ res.device }} + - fs_type: {{ res.file_system|default("ext4") }} + - force: True + - require: + - init-sleep-to-wait-all-synced-{{ res.name }} + {% else %} - - init-sleep-{{ res.name }} +# Not a must to wait format(mkfs) finished. +# Since eventually the later steps will be blocked +# on waiting the primary node finished format. +init-sleep-{{ res.name }}-format: + module.run: + - test.sleep: + - length: 10 + - require: + - init-sleep-to-wait-all-synced-{{ res.name }} +{% endif %} {% endif %} {% if drbd.stop_after_init_sync is defined and drbd.stop_after_init_sync is sameas true %} @@ -82,27 +110,26 @@ drbd.demoted: - name: {{ res.name }} - require: - - init-wait-for-{{ res.name }}-synced -{% endif %} - -# Sleep several seconds, in case one node stop before other nodes -# check disk status in wait-for-{{ res.name }}-synced -# sleep time should >= drbd.sync_interval -init-sleep-to-wait-all-before-stop-{{ res.name }}: - cmd.run: - - name: 'sleep {{ drbd.sync_interval + 3 }}' - - require: -{% if drbd.promotion == host %} - - init-demote-{{ res.name }} +{% if drbd.need_format is defined and drbd.need_format is sameas true%} + - init-format-{{ res.name }} {% else %} - - init-wait-for-{{ res.name }}-synced + - init-sleep-to-wait-all-synced-{{ res.name }} +{% endif %} {% endif %} init-stop-{{ res.name }}: drbd.stopped: - name: {{ res.name }} - require: - - init-sleep-to-wait-all-before-stop-{{ res.name }} +{% if drbd.promotion == host %} + - init-demote-{{ res.name }} +{% else %} +{% if drbd.need_format is defined and drbd.need_format is sameas true%} + - init-sleep-{{ res.name }}-format +{% else %} + - init-sleep-to-wait-all-synced-{{ res.name }} +{% endif %} +{% endif %} {% endif %} {% endfor %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.7/drbd/mkfs.sls new/drbd-formula-0.3.10/drbd/mkfs.sls --- old/drbd-formula-0.3.7/drbd/mkfs.sls 2019-11-14 10:13:13.002993325 +0100 +++ new/drbd-formula-0.3.10/drbd/mkfs.sls 2019-12-23 10:04:52.691682819 +0100 @@ -11,6 +11,9 @@ pkg.installed: - pkgs: - xfsprogs + - retry: + attempts: 3 + interval: 15 {% endif %} drbd_format_{{ res.name }}: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.7/drbd/nfs_ready.sls new/drbd-formula-0.3.10/drbd/nfs_ready.sls --- old/drbd-formula-0.3.7/drbd/nfs_ready.sls 2019-11-14 10:13:13.002993325 +0100 +++ new/drbd-formula-0.3.10/drbd/nfs_ready.sls 2019-12-23 10:04:52.691682819 +0100 @@ -9,6 +9,9 @@ pkg.installed: - pkgs: - nfs-formula + - retry: + attempts: 3 + interval: 15 {% endif %} {% for res in drbd.resource %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.7/drbd/packages.sls new/drbd-formula-0.3.10/drbd/packages.sls --- old/drbd-formula-0.3.7/drbd/packages.sls 2019-11-14 10:13:13.002993325 +0100 +++ new/drbd-formula-0.3.10/drbd/packages.sls 2019-12-23 10:04:52.691682819 +0100 @@ -54,3 +54,15 @@ {% endif %} {% endif %} + +{% for res in drbd.resource %} +{% if res.file_system == 'xfs' %} +install_xfs_pacage_for_drbd: + pkg.installed: + - pkgs: + - xfsprogs + - retry: + attempts: 3 + interval: 15 +{% endif %} +{% endfor %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.7/drbd/promote.sls new/drbd-formula-0.3.10/drbd/promote.sls --- old/drbd-formula-0.3.7/drbd/promote.sls 2019-11-14 10:13:13.002993325 +0100 +++ new/drbd-formula-0.3.10/drbd/promote.sls 2019-12-23 10:04:52.691682819 +0100 @@ -15,8 +15,9 @@ {% else %} # Sleep for a while in case original pri not demote yet. pr-sleep-{{ res.name }}: - cmd.run: - - name: 'sleep 1' + module.run: + - test.sleep: + - length: 3 - require: - pr-start-{{ res.name }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.7/drbd/res.sls new/drbd-formula-0.3.10/drbd/res.sls --- old/drbd-formula-0.3.7/drbd/res.sls 2019-11-14 10:13:13.002993325 +0100 +++ new/drbd-formula-0.3.10/drbd/res.sls 2019-12-23 10:04:52.691682819 +0100 @@ -39,6 +39,6 @@ {% if res.nodes is defined and res.nodes|length > 0 %} - context: - nodes: {{ res.nodes }} + nodes: {{ res.nodes|json }} {% endif %} {% endfor %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.7/drbd/sleep.sls new/drbd-formula-0.3.10/drbd/sleep.sls --- old/drbd-formula-0.3.7/drbd/sleep.sls 2019-11-14 10:13:13.002993325 +0100 +++ new/drbd-formula-0.3.10/drbd/sleep.sls 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -{# Could use to help both node start, may replace by status monitor #} -extra-sleep: - cmd.run: - - name: 'sleep 3' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.7/drbd-formula.changes new/drbd-formula-0.3.10/drbd-formula.changes --- old/drbd-formula-0.3.7/drbd-formula.changes 2019-11-14 10:13:13.002993325 +0100 +++ new/drbd-formula-0.3.10/drbd-formula.changes 2019-12-23 10:04:52.691682819 +0100 @@ -1,4 +1,24 @@ ------------------------------------------------------------------- +Mon Dec 23 07:58:27 UTC 2019 - nick wang <nw...@suse.com> + +- Version 0.3.10 + * With the fix of salt-shaptools 0.2.9, doesn't need to + estimate a long time for write I/O completion. + +------------------------------------------------------------------- +Wed Dec 18 10:39:28 UTC 2019 - nick wang <nw...@suse.com> + +- Version 0.3.9 + * Make file system after initial resync finished + * Sleep longer in case sync source change state late + +------------------------------------------------------------------- +Thu Nov 28 10:01:29 UTC 2019 - Xabier Arbulu <xarb...@suse.com> + +- Version 0.3.8 + * Add json rendering to jinja templates for old salt versions + +------------------------------------------------------------------- Wed Nov 13 11:59:38 UTC 2019 - Xabier Arbulu <xarb...@suse.com> - Version 0.3.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.7/drbd-formula.spec new/drbd-formula-0.3.10/drbd-formula.spec --- old/drbd-formula-0.3.7/drbd-formula.spec 2019-11-14 10:13:13.002993325 +0100 +++ new/drbd-formula-0.3.10/drbd-formula.spec 2019-12-23 10:04:52.691682819 +0100 @@ -19,14 +19,14 @@ # See also https://en.opensuse.org/openSUSE:Specfile_guidelines Name: drbd-formula -Version: 0.3.7 +Version: 0.3.10 Release: 0 Summary: DRBD deployment salt formula License: Apache-2.0 URL: https://github.com/SUSE/%{name} Source0: %{name}-%{version}.tar.gz Requires: drbd-utils -Requires: salt-shaptools +Requires: salt-shaptools >= 0.2.9 Requires: salt-formulas-configuration BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.7/examples/pillar.example.drbd new/drbd-formula-0.3.10/examples/pillar.example.drbd --- old/drbd-formula-0.3.7/examples/pillar.example.drbd 2019-11-14 10:13:13.002993325 +0100 +++ new/drbd-formula-0.3.10/examples/pillar.example.drbd 2019-12-23 10:04:52.691682819 +0100 @@ -22,7 +22,7 @@ #sync_interval: 10 ## Optional: timeout for waiting for resource synced - #sync_timeout: 500 + #sync_timeout: 2000 ## Optional: format the DRBD resource after initial resync #need_format: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.7/pillar.example new/drbd-formula-0.3.10/pillar.example --- old/drbd-formula-0.3.7/pillar.example 2019-11-14 10:13:13.002993325 +0100 +++ new/drbd-formula-0.3.10/pillar.example 2019-12-23 10:04:52.691682819 +0100 @@ -22,7 +22,7 @@ #sync_interval: 10 ## Optional: timeout for waiting for resource synced - #sync_timeout: 500 + #sync_timeout: 2000 ## Optional: format the DRBD resource after initial resync #need_format: true
