Hello community, here is the log from the commit of package yast2-drbd for openSUSE:Factory checked in at 2019-11-01 15:14:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-drbd (Old) and /work/SRC/openSUSE:Factory/.yast2-drbd.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-drbd" Fri Nov 1 15:14:03 2019 rev:31 rq:744675 version:4.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-drbd/yast2-drbd.changes 2019-08-01 15:47:58.653744394 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-drbd.new.2990/yast2-drbd.changes 2019-11-01 15:14:05.580751532 +0100 @@ -1,0 +2,6 @@ +Thu Oct 31 10:26:12 UTC 2019 - nick wang <nwang@suse.com> + +- jsc#SLE-5498, lvmetad is removed in lvm2 since 2.03.05 +- 4.2.2 + +------------------------------------------------------------------- Old: ---- yast2-drbd-4.2.1.tar.bz2 New: ---- yast2-drbd-4.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-drbd.spec ++++++ --- /var/tmp/diff_new_pack.RatzZO/_old 2019-11-01 15:14:06.448752664 +0100 +++ /var/tmp/diff_new_pack.RatzZO/_new 2019-11-01 15:14:06.452752669 +0100 @@ -19,7 +19,7 @@ %define _fwdefdir %{_libexecdir}/firewalld/services Name: yast2-drbd -Version: 4.2.1 +Version: 4.2.2 Release: 0 Summary: YaST2 - DRBD Configuration License: GPL-2.0-or-later ++++++ yast2-drbd-4.2.1.tar.bz2 -> yast2-drbd-4.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-4.2.1/package/yast2-drbd.changes new/yast2-drbd-4.2.2/package/yast2-drbd.changes --- old/yast2-drbd-4.2.1/package/yast2-drbd.changes 2019-06-04 09:31:14.000000000 +0200 +++ new/yast2-drbd-4.2.2/package/yast2-drbd.changes 2019-11-01 09:36:08.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 31 10:26:12 UTC 2019 - nick wang <nwang@suse.com> + +- jsc#SLE-5498, lvmetad is removed in lvm2 since 2.03.05 +- 4.2.2 + +------------------------------------------------------------------- Fri May 31 12:29:27 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org> - Add metainfo (fate#319035) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-4.2.1/package/yast2-drbd.spec new/yast2-drbd-4.2.2/package/yast2-drbd.spec --- old/yast2-drbd-4.2.1/package/yast2-drbd.spec 2019-06-04 09:31:14.000000000 +0200 +++ new/yast2-drbd-4.2.2/package/yast2-drbd.spec 2019-11-01 09:36:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-drbd # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define _fwdefdir %{_libexecdir}/firewalld/services Name: yast2-drbd -Version: 4.2.1 +Version: 4.2.2 Release: 0 Summary: YaST2 - DRBD Configuration License: GPL-2.0-or-later diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-4.2.1/src/include/drbd/helps.rb new/yast2-drbd-4.2.2/src/include/drbd/helps.rb --- old/yast2-drbd-4.2.1/src/include/drbd/helps.rb 2019-06-04 09:31:14.000000000 +0200 +++ new/yast2-drbd-4.2.2/src/include/drbd/helps.rb 2019-11-01 09:36:08.000000000 +0100 @@ -126,8 +126,6 @@ "\n" + "\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Should disable the LVM cache when combined drbd with LVM.</p>\n" + "\n" + - "\t\t<p><b>LVMetad</b>: When lvmetad is enabled, the volume group metadata and PV state flags are obtained from the lvmetad instance and no scanning is done by the individual commands. Because lvmetad's cache cannot be synchronized between nodes, users are advised to disable lvmetad in cluster environments.</p>\n" + - "\n" + "\t\t" ), "global_conf" => _( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-4.2.1/src/include/drbd/lvm_conf.rb new/yast2-drbd-4.2.2/src/include/drbd/lvm_conf.rb --- old/yast2-drbd-4.2.1/src/include/drbd/lvm_conf.rb 2019-06-04 09:31:14.000000000 +0200 +++ new/yast2-drbd-4.2.2/src/include/drbd/lvm_conf.rb 2019-11-01 09:36:08.000000000 +0100 @@ -14,18 +14,11 @@ @filter = "" @cache = true - @lvmetad = false end def lvm_conf_Read @filter = Ops.get_string( Drbd.lvm_config, "filter", "" ) - lvmetad_str = Ops.get_string( Drbd.lvm_config, "use_lvmetad", "0" ) - if lvmetad_str == "0" - @lvmetad = false - else - @lvmetad = true - end cache_str = Ops.get_string( Drbd.lvm_config, "write_cache_state", "0" ) if cache_str == "0" @@ -81,37 +74,10 @@ ) ) - _Tlvmetad = Frame( - _("Use lvmetad for LVM"), - Left( - HSquash( - VBox( - VBox( - Left( - CheckBox( - Id(:LVMetad), - Opt(:notify), - _("Use LVM metad"), - @lvmetad - ) - ), - Left(Label( - _( - "Warning! Should not use lvmetad for cluster." - ) - )), - ), - ) - ) - ) - ) - VBox( _Tfilter, VSpacing(1), _Tcache, - VSpacing(1), - _Tlvmetad, VStretch() ) end @@ -126,15 +92,7 @@ cache_str = "0" end - @lvmetad = UI.QueryWidget(Id(:LVMetad), :Value) - if @lvmetad - lvmetad_str = "1" - else - lvmetad_str = "0" - end - Ops.set(Drbd.lvm_config, "write_cache_state", cache_str) - Ops.set(Drbd.lvm_config, "use_lvmetad", lvmetad_str) Ops.set(Drbd.lvm_config, "filter", @filter) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-4.2.1/src/modules/Drbd.rb new/yast2-drbd-4.2.2/src/modules/Drbd.rb --- old/yast2-drbd-4.2.1/src/modules/Drbd.rb 2019-06-04 09:31:14.000000000 +0200 +++ new/yast2-drbd-4.2.2/src/modules/Drbd.rb 2019-11-01 09:36:08.000000000 +0100 @@ -299,16 +299,6 @@ end #read LVM configs via /etc/lvm/lvm.conf - #Disable use_lvmetad when using yast drbd to avoid lvmetad - #in cluster environment, but it may also effect regular usage - #Manually enable use_lvmetad in this case - val = Convert.to_string( - SCR.Read(Builtins.topath(Builtins.sformat(".drbd_lvm.value.global.%1", - "use_lvmetad"))) - ) - Ops.set(@lvm_config, "use_lvmetad", val) - y2debug("drbd_lvm.global.%1 is %2", "use_lvmetad", val) - #All of them under "devices" section ["filter", "write_cache_state", "cache_dir"].each do |key| val = Convert.to_string( @@ -710,13 +700,6 @@ end end - if Ops.get(@lvm_config, "use_lvmetad") != nil - SCR.Write( - Builtins.topath(Builtins.sformat(".drbd_lvm.value.global.%1", "use_lvmetad")), - Ops.get(@lvm_config, "use_lvmetad") - ) - end - if Ops.get(@lvm_config, "write_cache_state") == "0" SCR.Execute( path(".target.bash"),