Hello community, here is the log from the commit of package yast2-cluster for openSUSE:Factory checked in at 2015-07-02 22:51:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-cluster (Old) and /work/SRC/openSUSE:Factory/.yast2-cluster.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-cluster" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-cluster/yast2-cluster.changes 2014-12-05 21:04:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-cluster.new/yast2-cluster.changes 2015-07-03 00:24:26.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jul 2 07:16:47 UTC 2015 - [email protected] + +- FATE#318190. Add a warning in corosync.conf to warn users + manually changes may get lost when reconfigured by Yast. +- Version 3.1.17 + +------------------------------------------------------------------- +Mon Jun 29 07:08:17 UTC 2015 - [email protected] + +- BNC#936352. Remove threads in security tab since it is + abandoned in corosync 2.0 +- Version 3.1.16 + +------------------------------------------------------------------- Old: ---- yast2-cluster-3.1.16.tar.bz2 New: ---- yast2-cluster-3.1.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-cluster.spec ++++++ --- /var/tmp/diff_new_pack.1U3Mcb/_old 2015-07-03 00:24:26.000000000 +0200 +++ /var/tmp/diff_new_pack.1U3Mcb/_new 2015-07-03 00:24:26.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-cluster # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # 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 @@ Name: yast2-cluster %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services -Version: 3.1.16 +Version: 3.1.17 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-cluster-3.1.16.tar.bz2 -> yast2-cluster-3.1.17.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.16/CONTRIBUTING.md new/yast2-cluster-3.1.17/CONTRIBUTING.md --- old/yast2-cluster-3.1.16/CONTRIBUTING.md 2014-12-04 10:57:46.000000000 +0100 +++ new/yast2-cluster-3.1.17/CONTRIBUTING.md 2015-07-02 09:21:37.000000000 +0200 @@ -12,13 +12,13 @@ ----------- If you find a problem, please report it either using -[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +[Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) or [GitHub issues](../../issues). (For Bugzilla, use the [simplified registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) if you don't have an account yet.) If you find a problem, please report it either using -[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee that every bug will be fixed, but we'll try. When creating a bug report, please follow our [bug reporting @@ -71,7 +71,7 @@ [widely used conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). -If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +If your commit is related to a bug in Bugzilla or an issue on GitHub, make sure you mention it in the commit message for cross-reference. Use format like bnc#775814 or gh#yast/yast-foo#42. See also [GitHub autolinking](https://help.github.com/articles/github-flavored-markdown#references) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.16/package/yast2-cluster.changes new/yast2-cluster-3.1.17/package/yast2-cluster.changes --- old/yast2-cluster-3.1.16/package/yast2-cluster.changes 2014-12-04 10:57:46.000000000 +0100 +++ new/yast2-cluster-3.1.17/package/yast2-cluster.changes 2015-07-02 09:21:37.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Thu Jul 2 07:16:47 UTC 2015 - [email protected] + +- FATE#318190. Add a warning in corosync.conf to warn users + manually changes may get lost when reconfigured by Yast. +- Version 3.1.17 + +------------------------------------------------------------------- +Mon Jun 29 07:08:17 UTC 2015 - [email protected] + +- BNC#936352. Remove threads in security tab since it is + abandoned in corosync 2.0 +- Version 3.1.16 + +------------------------------------------------------------------- Thu Dec 4 09:49:43 UTC 2014 - [email protected] - remove X-KDE-Library from desktop file (bnc#899104) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.16/package/yast2-cluster.spec new/yast2-cluster-3.1.17/package/yast2-cluster.spec --- old/yast2-cluster-3.1.16/package/yast2-cluster.spec 2014-12-04 10:57:46.000000000 +0100 +++ new/yast2-cluster-3.1.17/package/yast2-cluster.spec 2015-07-02 09:21:37.000000000 +0200 @@ -18,7 +18,7 @@ Name: yast2-cluster %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services -Version: 3.1.16 +Version: 3.1.17 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.16/src/include/cluster/dialogs.rb new/yast2-cluster-3.1.17/src/include/cluster/dialogs.rb --- old/yast2-cluster-3.1.16/src/include/cluster/dialogs.rb 2014-11-14 16:46:13.000000000 +0100 +++ new/yast2-cluster-3.1.17/src/include/cluster/dialogs.rb 2015-07-02 09:21:37.000000000 +0200 @@ -683,34 +683,14 @@ def ValidateSecurity ret = true - if UI.QueryWidget(Id(:secauth), :Value) == true - thr = Convert.to_string(UI.QueryWidget(Id(:threads), :Value)) - s = Builtins.regexpmatch(thr, "^[0-9]+$") - if !s - Popup.Message(_("Number of threads must be integer")) - UI.SetFocus(Id(:threads)) - ret = false - end - i = Builtins.tointeger(thr) - if i == 0 - Popup.Message(_("Number of threads must larger then 0")) - UI.SetFocus(Id(:threads)) - ret = false - end - end ret end def SaveSecurityToConf if UI.QueryWidget(Id(:secauth), :Value) == true SCR.Write(path(".openais.totem.secauth"), "on") - SCR.Write( - path(".openais.totem.threads"), - Convert.to_string(UI.QueryWidget(Id(:threads), :Value)) - ) else SCR.Write(path(".openais.totem.secauth"), "off") - SCR.Write(path(".openais.totem.threads"), "") end nil @@ -718,7 +698,6 @@ def SaveSecurity Cluster.secauth = Convert.to_boolean(UI.QueryWidget(Id(:secauth), :Value)) - Cluster.threads = Convert.to_string(UI.QueryWidget(Id(:threads), :Value)) nil end @@ -734,8 +713,6 @@ _("Enable Security Auth"), true, VBox( - InputField(Id(:threads), Opt(:hstretch), _("Threads:")), - VSpacing(1), Label( _( "For a newly created cluster, push the button below to generate /etc/corosync/authkey." @@ -756,8 +733,6 @@ UI.ChangeWidget(Id(:secauth), :Value, Cluster.secauth) - UI.ChangeWidget(Id(:threads), :Value, Cluster.threads) - while true ret = UI.UserInput @@ -779,20 +754,6 @@ if ret == :secauth if UI.QueryWidget(Id(:secauth), :Value) == true - thr = Convert.to_string(UI.QueryWidget(Id(:threads), :Value)) - if thr == "" || thr == "0" - result = {} - t = 0 - result = Convert.to_map( - SCR.Execute( - path(".target.bash_output"), - "grep processor /proc/cpuinfo | wc -l" - ) - ) - t = Builtins.tointeger(Ops.get_string(result, "stdout", "")) - t = 0 if t == nil - UI.ChangeWidget(Id(:threads), :Value, Builtins.sformat("%1", t)) - end next end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.16/src/include/cluster/helps.rb new/yast2-cluster-3.1.17/src/include/cluster/helps.rb --- old/yast2-cluster-3.1.16/src/include/cluster/helps.rb 2014-11-14 16:46:13.000000000 +0100 +++ new/yast2-cluster-3.1.17/src/include/cluster/helps.rb 2015-07-02 09:21:37.000000000 +0200 @@ -44,7 +44,6 @@ ), "security" => _( "\n" + - "<p><b><big>Threads</big></b><br>This directive controls how many threads are used to encrypt and send multicast messages. If secauth is off, the protocol will never use threaded sending. If secauth is on, this directive allows systems to be configured to use multiple threads to encrypt and send multicast messages. A thread directive of 0 indicates that no threaded send should be used. This mode offers best performance for non-SMP systems. The default is 0. <br></p>\n" + "<p><b><big>Enable Security Auth</big></b><br>This specifies that HMAC/SHA1 authentication should be used to authenticate all messages. It further specifies that all data should be encrypted with the sober128 encryption algorithm to protect data from eavesdropping. Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput. Encryption and authentication consume 75% of CPU cycles in aisexec as measured with gprof when enabled. For 100Mbit networks with 1500 MTU frame transmissions: A throughput of 9Mb/s is possible with 100% cpu utilization when this option is enabled on 3GHz cpus. A throughput of 10Mb/s is possible wth 20% cpu utilization when this option is disabled on 3GHz cpus. For gig-e networks with large frame transmissions: A throughput of 20Mb/s is possible when this option is enabled on 3GHz cpus. A throughput of 60Mb/s is possible when this option is disabled on 3GHz cpus. The default is on. <br></p>\n" ), "service" => _( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.16/src/modules/Cluster.rb new/yast2-cluster-3.1.17/src/modules/Cluster.rb --- old/yast2-cluster-3.1.16/src/modules/Cluster.rb 2014-11-14 16:46:13.000000000 +0100 +++ new/yast2-cluster-3.1.17/src/modules/Cluster.rb 2015-07-02 09:21:37.000000000 +0200 @@ -66,7 +66,6 @@ # Settings: Define all variables needed for configuration of cluster @secauth = false - @threads = "" @cluster_name = "" @expected_votes = "" @two_node = "0" @@ -161,8 +160,6 @@ @secauth = false end - @threads = Convert.to_string(SCR.Read(path(".openais.totem.threads"))) - @cluster_name = SCR.Read(path(".openais.totem.cluster_name")) @expected_votes = SCR.Read(path(".openais.quorum.expected_votes")).to_s @@ -270,10 +267,8 @@ if @secauth == true SCR.Write(path(".openais.totem.secauth"), "on") - SCR.Write(path(".openais.totem.threads"), @threads) else SCR.Write(path(".openais.totem.secauth"), "off") - SCR.Write(path(".openais.totem.threads"), "") end SCR.Write(path(".openais.totem.transport"), @transport) @@ -617,7 +612,6 @@ def Import(settings) settings = deep_copy(settings) @secauth = Ops.get_boolean(settings, "secauth", false) - @threads = Ops.get_string(settings, "threads", "") @transport = Ops.get_string(settings, "transport", "udp") @bindnetaddr1 = Ops.get_string(settings, "bindnetaddr1", "") @memberaddr = Ops.get_list(settings, "memberaddr", []) @@ -650,7 +644,6 @@ def Export result = {} Ops.set(result, "secauth", @secauth) - Ops.set(result, "threads", @threads) Ops.set(result, "transport", @transport) Ops.set(result, "bindnetaddr1", @bindnetaddr1) Ops.set(result, "memberaddr", @memberaddr) @@ -744,7 +737,6 @@ publish :function => :SetWriteOnly, :type => "void (boolean)" publish :function => :SetAbortFunction, :type => "void (boolean ())" publish :variable => :secauth, :type => "boolean" - publish :variable => :threads, :type => "string" publish :variable => :bindnetaddr1, :type => "string" publish :variable => :mcastaddr1, :type => "string" publish :variable => :cluster_name, :type => "string" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.16/src/servers_non_y2/ag_openais new/yast2-cluster-3.1.17/src/servers_non_y2/ag_openais --- old/yast2-cluster-3.1.16/src/servers_non_y2/ag_openais 2014-11-14 16:46:13.000000000 +0100 +++ new/yast2-cluster-3.1.17/src/servers_non_y2/ag_openais 2015-07-02 09:21:37.000000000 +0200 @@ -64,8 +64,6 @@ "rrp_mode":{"doc":"The mode for redundant ring. None is used when only 1 interface specified, otherwise, only active or passive may be choosen", "type":"select[none,active,passive]", "default_value":"none"}, "netmtu":{"doc":"Size of MTU", "type":"int", "default_value":1500}, - "threads":{"doc":"How many threads should be used to encypt and sending message. Only have meanings when secauth is turned on", - "type":"int", "default_value":0}, "vsftype":{"doc":"The virtual synchrony filter type used to indentify a primary component. Change with care.", "default_value":"ykd", "suggested_value":"none"}, @@ -470,7 +468,7 @@ return '["quorum", "totem", "nodelist"]' elif path_arr[0] == 'totem': if len(path_arr) == 1: - return '["crypto_cipher","crypto_hash","secauth", "autoid", "threads", "rrpmode", "transport", "interface", "cluster_name"]' + return '["crypto_cipher","crypto_hash","secauth", "autoid", "rrpmode", "transport", "interface", "cluster_name"]' else: if path_arr[1] == 'interface': if len(path_arr) == 2: @@ -521,8 +519,6 @@ if i.has_key('nodeid'): return '"no"' return '"%s"' % totem_options.get("clear_node_high_bit", "yes") - elif path[1] == "threads": - return '"%d"' % totem_options.get("threads", 0) elif path[1] == "rrpmode": return '"%s"' % totem_options.get("rrp_mode", "none") elif path[1] == "transport": @@ -590,6 +586,8 @@ fulfill_suggested_quorum_options() f = open("/etc/corosync/corosync.conf.YaST2", "w") + f.write("# /etc/corosync/corosync.conf file autogenerated by YaST2.\n") + f.write("# Manually changed configurations may get lost when reconfigured by YaST2.\n") print_totem_options(f) print_nodelist_options(f) print_logging_options(f) @@ -628,16 +626,6 @@ elif path[1] == "secauth": totem_options["secauth"] = args return "true" - elif path[1] == "threads": - if args == "": - if totem_options.get("threads", None) != None: - del totem_options["threads"] - return "true" - try: - totem_options["threads"] = int(args) - return "true" - except ValueError: - return "false" elif path[1] == "rrpmode": totem_options["rrp_mode"] = args return "true"
