Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package drbd-formula for openSUSE:Factory
checked in at 2021-05-20 19:25:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/drbd-formula (Old)
and /work/SRC/openSUSE:Factory/.drbd-formula.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd-formula"
Thu May 20 19:25:20 2021 rev:11 rq:894551 version:0.4.3+git.1621498620.45e1839
Changes:
--------
--- /work/SRC/openSUSE:Factory/drbd-formula/drbd-formula.changes
2021-03-19 16:43:09.162113715 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-formula.new.2988/drbd-formula.changes
2021-05-20 19:25:49.081756040 +0200
@@ -1,0 +2,7 @@
+Mon May 17 05:43:52 UTC 2021 - nick wang <nw...@suse.com>
+
+- Version bump 0.4.3
+ * Support more parameters for variable rate resync
+ max_buffers, sndbuf_size, rcvbuf_size, c_delay_target, c_min_rate
+
+-------------------------------------------------------------------
Old:
----
drbd-formula-0.4.2+git.1616116365.1e3ab34.tar.gz
New:
----
drbd-formula-0.4.3+git.1621498620.45e1839.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ drbd-formula.spec ++++++
--- /var/tmp/diff_new_pack.zFw6Zp/_old 2021-05-20 19:25:49.529754203 +0200
+++ /var/tmp/diff_new_pack.zFw6Zp/_new 2021-05-20 19:25:49.533754186 +0200
@@ -20,7 +20,7 @@
%define fdir %{_datadir}/salt-formulas
# See also https://en.opensuse.org/openSUSE:Specfile_guidelines
Name: drbd-formula
-Version: 0.4.2+git.1616116365.1e3ab34
+Version: 0.4.3+git.1621498620.45e1839
Release: 0
Summary: DRBD deployment salt formula
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.zFw6Zp/_old 2021-05-20 19:25:49.565754055 +0200
+++ /var/tmp/diff_new_pack.zFw6Zp/_new 2021-05-20 19:25:49.565754055 +0200
@@ -4,8 +4,8 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="filename">drbd-formula</param>
- <param name="versionformat">0.4.2+git.%ct.%h</param>
- <param name="revision">1e3ab3447c27973ffd184a16b8fbfc98c9284f89</param>
+ <param name="versionformat">0.4.3+git.%ct.%h</param>
+ <param name="revision">45e183981c2a7c8c2291eab707c35c0e123a1ac2</param>
</service>
<service name="recompress" mode="disabled">
++++++ drbd-formula-0.4.2+git.1616116365.1e3ab34.tar.gz ->
drbd-formula-0.4.3+git.1621498620.45e1839.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/drbd-formula-0.4.2+git.1616116365.1e3ab34/README.md
new/drbd-formula-0.4.3+git.1621498620.45e1839/README.md
--- old/drbd-formula-0.4.2+git.1616116365.1e3ab34/README.md 2021-03-19
02:12:45.000000000 +0100
+++ new/drbd-formula-0.4.3+git.1621498620.45e1839/README.md 2021-05-20
10:17:00.000000000 +0200
@@ -4,7 +4,7 @@
# Version
-0.4.2
+0.4.3
# DRBD bootstrap salt formula
@@ -44,6 +44,12 @@
sudo zypper in drbd-formula
```
+> Note
+> In some cases it might be needed to adjust the salt minion configuration to
+use the new style of calling `module.run`.
+See
[this](https://docs.saltproject.io/en/latest/ref/states/all/salt.states.module.html)
+for more information.
+
# Available states
.. contents::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/drbd-formula-0.4.2+git.1616116365.1e3ab34/_service
new/drbd-formula-0.4.3+git.1621498620.45e1839/_service
--- old/drbd-formula-0.4.2+git.1616116365.1e3ab34/_service 2021-03-19
02:12:45.000000000 +0100
+++ new/drbd-formula-0.4.3+git.1621498620.45e1839/_service 2021-05-20
10:17:00.000000000 +0200
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="filename">drbd-formula</param>
- <param name="versionformat">0.4.2+git.%ct.%h</param>
+ <param name="versionformat">0.4.3+git.%ct.%h</param>
<param name="revision">%%VERSION%%</param>
</service>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drbd-formula-0.4.2+git.1616116365.1e3ab34/drbd/defaults.yaml
new/drbd-formula-0.4.3+git.1621498620.45e1839/drbd/defaults.yaml
--- old/drbd-formula-0.4.2+git.1616116365.1e3ab34/drbd/defaults.yaml
2021-03-19 02:12:45.000000000 +0100
+++ new/drbd-formula-0.4.3+git.1621498620.45e1839/drbd/defaults.yaml
2021-05-20 10:17:00.000000000 +0200
@@ -20,6 +20,9 @@
quorum: "off"
net:
multi_primaries: ""
+ max_buffers: "40k"
+ sndbuf_size: "5M"
+ rcvbuf_size: "5M"
fencing: ""
after_sb_0pri: ""
after_sb_1pri: ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drbd-formula-0.4.2+git.1616116365.1e3ab34/drbd/global_confs.sls
new/drbd-formula-0.4.3+git.1621498620.45e1839/drbd/global_confs.sls
--- old/drbd-formula-0.4.2+git.1616116365.1e3ab34/drbd/global_confs.sls
2021-03-19 02:12:45.000000000 +0100
+++ new/drbd-formula-0.4.3+git.1621498620.45e1839/drbd/global_confs.sls
2021-05-20 10:17:00.000000000 +0200
@@ -25,6 +25,9 @@
quorum: "off"
multi_primaries: "no"
fencing: "resource-and-stonith"
+ max_buffers: 2048
+ sndbuf_size: 0
+ rcvbuf_size: 0
after_sb_0pri: "discard-zero-changes"
after_sb_1pri: "discard-secondary"
after_sb_2pri: "disconnect"
@@ -39,6 +42,9 @@
dialog_refresh: {{ drbd.global.dialog_refresh }}
quorum: "{{ drbd.common.options.quorum }}"
multi_primaries: "{{ drbd.common.net.multi_primaries }}"
+ max_buffers: "{{ drbd.common.net.max_buffers }}"
+ sndbuf_size: "{{ drbd.common.net.sndbuf_size }}"
+ rcvbuf_size: "{{ drbd.common.net.rcvbuf_size }}"
fencing: "{{ drbd.common.net.fencing }}"
after_sb_0pri: "{{ drbd.common.net.after_sb_0pri }}"
after_sb_1pri: "{{ drbd.common.net.after_sb_1pri }}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drbd-formula-0.4.2+git.1616116365.1e3ab34/drbd/packages.sls
new/drbd-formula-0.4.3+git.1621498620.45e1839/drbd/packages.sls
--- old/drbd-formula-0.4.2+git.1616116365.1e3ab34/drbd/packages.sls
2021-03-19 02:12:45.000000000 +0100
+++ new/drbd-formula-0.4.3+git.1621498620.45e1839/drbd/packages.sls
2021-05-20 10:17:00.000000000 +0200
@@ -42,20 +42,11 @@
attempts: 3
interval: 15
-{% else %}
-
-install_nfs_packages_for_drbd:
- pkg.installed:
- - pkgs:
- - nfs-formula
- - retry:
- attempts: 3
- interval: 15
-
{% endif %}
{% endif %}
{% for res in drbd.resource %}
+{% if drbd.need_format is defined and drbd.need_format is sameas true%}
{% if res.file_system == 'xfs' %}
install_xfs_pacage_for_drbd:
pkg.installed:
@@ -65,4 +56,5 @@
attempts: 3
interval: 15
{% endif %}
+{% endif %}
{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drbd-formula-0.4.2+git.1616116365.1e3ab34/drbd/res.sls
new/drbd-formula-0.4.3+git.1621498620.45e1839/drbd/res.sls
--- old/drbd-formula-0.4.2+git.1616116365.1e3ab34/drbd/res.sls 2021-03-19
02:12:45.000000000 +0100
+++ new/drbd-formula-0.4.3+git.1621498620.45e1839/drbd/res.sls 2021-05-20
10:17:00.000000000 +0200
@@ -24,8 +24,10 @@
fixed_rate: {{ res.fixed_rate|default(True) }}
resync_rate: '{{ res.resync_rate|default("100M") }}'
c_plan_ahead: {{ res.c_plan_ahead|default(20) }}
- c_max_rate: '{{ res.c_max_rate|default("100M") }}'
+ c_delay_target: '{{ res.c_delay_target|default(1) }}'
c_fill_target: '{{ res.c_fill_target|default("10M") }}'
+ c_max_rate: '{{ res.c_max_rate|default("100M") }}'
+ c_min_rate: '{{ res.c_min_rate|default("4M") }}'
# To concate string with number, need to use join. Like
# name: '{{ ["drbd-node", loop.index + 1]|join('') }}'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drbd-formula-0.4.2+git.1616116365.1e3ab34/drbd/templates/global_common.j2
new/drbd-formula-0.4.3+git.1621498620.45e1839/drbd/templates/global_common.j2
---
old/drbd-formula-0.4.2+git.1616116365.1e3ab34/drbd/templates/global_common.j2
2021-03-19 02:12:45.000000000 +0100
+++
new/drbd-formula-0.4.3+git.1621498620.45e1839/drbd/templates/global_common.j2
2021-05-20 10:17:00.000000000 +0200
@@ -81,6 +81,15 @@
{%- if multi_primaries %}
allow-two-primaries {{ multi_primaries }};
{%- endif %}
+{%- if max_buffers %}
+ max-buffers {{ max_buffers }};
+{%- endif %}
+{%- if sndbuf_size %}
+ sndbuf-size {{ sndbuf_size }};
+{%- endif %}
+{%- if rcvbuf_size %}
+ rcvbuf-size {{ rcvbuf_size }};
+{%- endif %}
{%- if fencing %}
fencing {{ fencing }};
{%- endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drbd-formula-0.4.2+git.1616116365.1e3ab34/drbd/templates/res_single_vol_v9.j2
new/drbd-formula-0.4.3+git.1621498620.45e1839/drbd/templates/res_single_vol_v9.j2
---
old/drbd-formula-0.4.2+git.1616116365.1e3ab34/drbd/templates/res_single_vol_v9.j2
2021-03-19 02:12:45.000000000 +0100
+++
new/drbd-formula-0.4.3+git.1621498620.45e1839/drbd/templates/res_single_vol_v9.j2
2021-05-20 10:17:00.000000000 +0200
@@ -15,8 +15,10 @@
c-plan-ahead 0;
{%- else %}
c-plan-ahead {{ c_plan_ahead }};
- c-max-rate {{ c_max_rate }};
+ c-delay-target {{ c_delay_target }};
c-fill-target {{ c_fill_target }};
+ c-max-rate {{ c_max_rate }};
+ c-min-rate {{ c_min_rate }};
{%- endif %}
}
connection-mesh {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drbd-formula-0.4.2+git.1616116365.1e3ab34/drbd-formula.changes
new/drbd-formula-0.4.3+git.1621498620.45e1839/drbd-formula.changes
--- old/drbd-formula-0.4.2+git.1616116365.1e3ab34/drbd-formula.changes
2021-03-19 02:12:45.000000000 +0100
+++ new/drbd-formula-0.4.3+git.1621498620.45e1839/drbd-formula.changes
2021-05-20 10:17:00.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon May 17 05:43:52 UTC 2021 - nick wang <nw...@suse.com>
+
+- Version bump 0.4.3
+ * Support more parameters for variable rate resync
+ max_buffers, sndbuf_size, rcvbuf_size, c_delay_target, c_min_rate
+
+-------------------------------------------------------------------
Thu Mar 11 05:04:03 UTC 2021 - nick wang <nw...@suse.com>
- Version bump 0.4.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/drbd-formula-0.4.2+git.1616116365.1e3ab34/form.yml
new/drbd-formula-0.4.3+git.1621498620.45e1839/form.yml
--- old/drbd-formula-0.4.2+git.1616116365.1e3ab34/form.yml 2021-03-19
02:12:45.000000000 +0100
+++ new/drbd-formula-0.4.3+git.1621498620.45e1839/form.yml 2021-05-20
10:17:00.000000000 +0200
@@ -113,6 +113,27 @@
- "yes"
$default: "no"
+ max_buffers:
+ $visibleIf: .fixed_rate == false
+ $name: MAX buffers
+ $help: Maximal number of buffer pages allocated. Max: 128k
+ $optional: true
+ $default: 2048
+
+ sndbuf_size:
+ $visibleIf: .fixed_rate == false
+ $name: Send buffer size
+ $help: The socket send buffer to store packets. Max: 10M
+ $optional: true
+ $default: 0
+
+ rcvbuf_size:
+ $visibleIf: .fixed_rate == false
+ $name: Receive buffer size
+ $help: Packets received are stored in socket buffer. Max: 10M
+ $optional: true
+ $default: 0
+
fencing:
$optional: true
$type: select
@@ -254,12 +275,13 @@
$type: number
$default: 20
- c_max_rate:
+ c_delay_target:
$visibleIf: .fixed_rate == false
- $name: C max rate
- $help: Max rate of dynamically resync rate
+ $name: C delay target
+ $help: A constant delay time
$optional: true
- $default: "100M"
+ $type: number
+ $default: 1
c_fill_target:
$visibleIf: .fixed_rate == false
@@ -268,12 +290,26 @@
$optional: true
$default: "10M"
+ c_max_rate:
+ $visibleIf: .fixed_rate == false
+ $name: C max rate
+ $help: Max rate of dynamically resync rate
+ $optional: true
+ $default: "100M"
+
+ c_min_rate:
+ $visibleIf: .fixed_rate == false
+ $name: C min rate
+ $help: Throttle the resync when device is busy
+ $optional: true
+ $default: "4M"
+
# FIXME: drbd$need_format is not working.
#
http://docserv.nue.suse.com/documents/SUSE_Manager_develop/susemanager-best-practices/single-html/
#
https://www.suse.com/documentation/suse-manager-4/4.0/suse-manager/salt/salt-formulas.html
file_system:
$name: File system
- $help: salt format the disk after initialize
+ $help: salt format the disk after initialize, required when
"need_format" enabled
$optional: true
$type: select
$values:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drbd-formula-0.4.2+git.1616116365.1e3ab34/pillar.example
new/drbd-formula-0.4.3+git.1621498620.45e1839/pillar.example
--- old/drbd-formula-0.4.2+git.1616116365.1e3ab34/pillar.example
2021-03-19 02:12:45.000000000 +0100
+++ new/drbd-formula-0.4.3+git.1621498620.45e1839/pillar.example
2021-05-20 10:17:00.000000000 +0200
@@ -52,6 +52,12 @@
# net:
# # Optional: you may assign the primary role to both nodes.
# multi_primaries: "no"
+ # # Optional: Maximal number of buffer pages allocated. Max: 128k
+ # max_buffers: 2048
+ # # Optional: The socket send buffer to store packets. Max: 10M
+ # sndbuf_size: 0
+ # # Optional: Packets received are stored in socket buffer. Max: 10M
+ # rcvbuf_size: 0
# # Optional: preventive measures to avoid situations where both nodes
are primary and disconnected(AKA split brain)
# fencing: "resource-and-stonith"
# # Optional: split brain handler when no primary
@@ -97,12 +103,16 @@
# fixed_rate: false
# # Optional: Dynamically control the resync speed.
# c_plan_ahead: 20
- # # Optional: Max rate of dynamically resync rate.
- # c_max_rate: "100M"
+ # # Optional: A constant delay time
+ # c_delay_target: 1
# # Optional: Fill the buffers along the data path with a defined amount
of data.
# c_fill_target: "10M"
+ # # Optional: Max rate of dynamically resync rate.
+ # c_max_rate: "100M"
+ # # Optional: Throttle the resync when device is busy.
+ # c_min_rate: "4M"
- # # Optional: (salt) format the disk after initialize
+ # # Optional: (salt) format the disk after initialize, required when
"need_format" enabled
# file_system: "xfs"
# # Optional: (salt) default mount point of the resource
# mount_point: "/mnt/test1"
@@ -158,7 +168,7 @@
# # Optional: Define how much bandwidth DRBD may use for resynchronizing.
# resync_rate: "150M"
- # # Optional: (salt) format the disk after initialize
+ # # Optional: (salt) format the disk after initialize, required when
"need_format" enabled
# file_system: "ext4"
# # Optional: (salt) default mount point of the resource
# mount_point: "/mnt/test2"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drbd-formula-0.4.2+git.1616116365.1e3ab34/templates/pillar.example.drbd
new/drbd-formula-0.4.3+git.1621498620.45e1839/templates/pillar.example.drbd
--- old/drbd-formula-0.4.2+git.1616116365.1e3ab34/templates/pillar.example.drbd
2021-03-19 02:12:45.000000000 +0100
+++ new/drbd-formula-0.4.3+git.1621498620.45e1839/templates/pillar.example.drbd
2021-05-20 10:17:00.000000000 +0200
@@ -52,6 +52,12 @@
# net:
# # Optional: you may assign the primary role to both nodes.
# multi_primaries: "no"
+ # # Optional: Maximal number of buffer pages allocated. Max: 128k
+ # max_buffers: 2048
+ # # Optional: The socket send buffer to store packets. Max: 10M
+ # sndbuf_size: 0
+ # # Optional: Packets received are stored in socket buffer. Max: 10M
+ # rcvbuf_size: 0
# # Optional: preventive measures to avoid situations where both nodes
are primary and disconnected(AKA split brain)
# fencing: "resource-and-stonith"
# # Optional: split brain handler when no primary
@@ -82,8 +88,10 @@
fixed_rate: true
c_plan_ahead: 20
- c_max_rate: "100M"
+ c_delay_target: 10
c_fill_target: "10M"
+ c_max_rate: "100M"
+ c_min_rate: "4M"
# Salt specific
file_system: "xfs"
