Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-iscsi-client -> sle12 ## BNC# 867378 : "yast iscsi-client fails to start iscsid automatically" (NEW/) ## BNC# 853300 : "yast2 iscsi-client can not automatically login" (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-iscsi-client/yast2-iscsi-client.changes 2014-01-27 12:50:48.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-iscsi-client/yast2-iscsi-client.changes 2014-03-14 11:11:23.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 14 10:47:43 CET 2014 - gs@suse.de + +- start iscsid socket and iscsi service correctly + (bnc #867378, bnc #853300) +- 3.1.4 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-iscsi-client - yast2-schema ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-iscsi-client (Old) and /mounts/work_src_done/SLE12/yast2-iscsi-client (BS:build ID:34442 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-iscsi-client", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-iscsi-client-3.1.3.tar.bz2 New: ---- yast2-iscsi-client-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.4a54m5/_old 2014-03-17 12:25:41.000000000 +0100 +++ /var/tmp/diff_new_pack.4a54m5/_new 2014-03-17 12:25:41.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,7 +40,7 @@ BuildArchitectures: noarch -Requires: yast2-ruby-bindings >= 1.0.0 +Requires: yast2-ruby-bindings >= 3.1.7 Summary: YaST2 - iSCSI Client Configuration ++++++ yast2-iscsi-client-3.1.3.tar.bz2 -> yast2-iscsi-client-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.3/MAINTAINER new/yast2-iscsi-client-3.1.4/MAINTAINER --- old/yast2-iscsi-client-3.1.3/MAINTAINER 2014-01-27 11:37:31.000000000 +0100 +++ new/yast2-iscsi-client-3.1.4/MAINTAINER 2014-03-17 09:34:16.000000000 +0100 @@ -1 +1 @@ -Thomas Fehr <fehr@suse.de> +Gabriele Mohr <gs@suse.de> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.3/package/yast2-iscsi-client.changes new/yast2-iscsi-client-3.1.4/package/yast2-iscsi-client.changes --- old/yast2-iscsi-client-3.1.3/package/yast2-iscsi-client.changes 2014-01-27 11:37:31.000000000 +0100 +++ new/yast2-iscsi-client-3.1.4/package/yast2-iscsi-client.changes 2014-03-17 09:34:16.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 14 10:47:43 CET 2014 - gs@suse.de + +- start iscsid socket and iscsi service correctly + (bnc #867378, bnc #853300) +- 3.1.4 + +------------------------------------------------------------------- Wed Jan 22 14:16:37 CET 2014 - gs@suse.de - detect persistent portal correctly (bnc#856494) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.3/package/yast2-iscsi-client.spec new/yast2-iscsi-client-3.1.4/package/yast2-iscsi-client.spec --- old/yast2-iscsi-client-3.1.3/package/yast2-iscsi-client.spec 2014-01-27 11:37:31.000000000 +0100 +++ new/yast2-iscsi-client-3.1.4/package/yast2-iscsi-client.spec 2014-03-17 09:34:16.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,7 +40,7 @@ BuildArchitectures: noarch -Requires: yast2-ruby-bindings >= 1.0.0 +Requires: yast2-ruby-bindings >= 3.1.7 Summary: YaST2 - iSCSI Client Configuration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.3/src/clients/iscsi-client_finish.rb new/yast2-iscsi-client-3.1.4/src/clients/iscsi-client_finish.rb --- old/yast2-iscsi-client-3.1.3/src/clients/iscsi-client_finish.rb 2014-01-27 11:37:31.000000000 +0100 +++ new/yast2-iscsi-client-3.1.4/src/clients/iscsi-client_finish.rb 2014-03-17 09:34:16.000000000 +0100 @@ -41,6 +41,7 @@ Yast.import "String" Yast.import "IscsiClientLib" Yast.import "Service" + Yast.import "SystemdSocket" Yast.include self, "installation/misc.rb" @ret = nil @@ -87,9 +88,10 @@ ) ) if Ops.greater_than(Builtins.size(IscsiClientLib.sessions), 0) - Service.Enable("boot.iscsid-early") - Service.Enable("iscsid") - Builtins.y2milestone("iscsid service enabled") + socket = SystemdSocket.find("iscsid") + socket.enable if socket + Service.Enable("iscsi") + Builtins.y2milestone("iscsi service and iscsid socket enabled") end else Builtins.y2error("unknown function: %1", @func) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.3/src/modules/IscsiClientLib.rb new/yast2-iscsi-client-3.1.4/src/modules/IscsiClientLib.rb --- old/yast2-iscsi-client-3.1.3/src/modules/IscsiClientLib.rb 2014-01-27 11:37:31.000000000 +0100 +++ new/yast2-iscsi-client-3.1.4/src/modules/IscsiClientLib.rb 2014-03-17 09:34:16.000000000 +0100 @@ -26,6 +26,9 @@ module Yast class IscsiClientLibClass < Module + + include Yast::Logger + def main textdomain "iscsi-client" @@ -37,6 +40,7 @@ Yast.import "Mode" Yast.import "String" Yast.import "Arch" + Yast.import "SystemdSocket" @sessions = [] @discovered = [] @@ -45,8 +49,10 @@ @iface_file = {} @iface_eth = [] - # status of rciscsid service + # status of iscsi.service @serviceStatus = false + # status of iscsid.socket + @socketStatus = false # main configuration file (/etc/iscsi/iscsid.conf) @config = {} # iBFT (iSCSI Boot Firmware Table) @@ -76,6 +82,71 @@ ] @offload_valid = nil + + @iscsid_socket = nil + end + + def iscsidSocketActive? + if @iscsid_socket + @iscsid_socket.active? + else + log.error("iscsid.socket not found") + false + end + end + + def iscsidSocketStart + if @iscsid_socket + @iscsid_socket.start + else + log.error("iscsid.socket not found") + false + end + end + + def iscsidSocketStop + if @iscsid_socket + @iscsid_socket.stop + else + log.error("iscsid.socket not found") + false + end + end + + def iscsidSocketEnabled? + if @iscsid_socket + @iscsid_socket.enabled? + else + log.error("iscsid.socket not found") + false + end + end + + def iscsidSocketDisabled? + if @iscsid_socket + @iscsid_socket.disabled? + else + log.error("iscsid.socket not found") + false + end + end + + def iscsidSocketEnable + if @iscsid_socket + @iscsid_socket.enable + else + log.error("iscsid.socket not found") + false + end + end + + def iscsidSocketDisable + if @iscsid_socket + @iscsid_socket.disable + else + log.error("iscsid.socket not found") + false + end end def GetOffloadCard @@ -160,20 +231,22 @@ # get accessor for service status def GetStartService - status = Service.Enabled("iscsid") - Builtins.y2milestone("Status of iscsid %1", status) - status + status_d = iscsidSocketEnabled? + status = Service.Enabled("iscsi") + Builtins.y2milestone("Start at boot enabled for iscsid.socket: %1, iscsi: %2", status_d, status) + return status_d && status end # set accessor for service status def SetStartService(status) - Builtins.y2milestone("Set status of iscsid to %1", status) + Builtins.y2milestone("Set start at boot for iscsid.socket and iscsi.service to %1", + status) if status == true - Service.Enable("boot.iscsid-early") - Service.Enable("iscsid") + Service.Enable("iscsi") + iscsidSocketEnable else - Service.Disable("boot.iscsid-early") - Service.Disable("iscsid") + Service.Disable("iscsi") + iscsidSocketDisable end nil @@ -495,7 +568,8 @@ Builtins.y2milestone("Initiatorname %1 written", @initiatorname) end # reload service when initiatorname is changed to re-read new value (bnc#482429) - Service.Reload("iscsid") + # restart the daemon (reload not supported with systemd) + Service.Restart("iscsid") ret end @@ -921,13 +995,25 @@ ret = true if Stage.initial ModuleLoading.Load("iscsi_tcp", "", "", "", false, true) - # start daemon before + # start daemon manually (systemd not available in inst-sys) startIScsid else - @serviceStatus = true if Service.Status("iscsid") == 0 - Builtins.y2milestone("Service status = %1", @serviceStatus) - # if not enabled, start it manually - Service.Start("iscsid") if !@serviceStatus + # find socket (only in installed system) + # raise exception if socket isn't available + @iscsid_socket = SystemdSocket.find!("iscsid") + + @serviceStatus = true if Service.Status("iscsi") == 0 + @socketStatus = true if iscsidSocketActive? + Builtins.y2milestone("Status of iscsi.service = %1 iscsid.socket = %2", + @serviceStatus, @socketStatus) + # if not running, start iscsi.service and iscsid.socket + if !@socketStatus + Service.Stop("iscsid") if Service.Status("iscsid") == 0 + Builtins.y2error("Cannot start iscsid.socket") if !iscsidSocketStart + end + if !@serviceStatus && !Service.Start("iscsi") + Builtins.y2error("Cannot start iscsi.service") + end end ret end @@ -935,13 +1021,20 @@ # set startup status of iscsid def setServiceStatus ret = true - # if disabled and no connected targets - stop it - # otherwise keep it running - if !GetStartService() - readSessions - if Builtins.size(@sessions) == 0 - Builtins.y2milestone("No active sessions - stopping service") - Service.Stop("iscsid") + # only makes sense in installed system + if !Stage.initial + # if disabled and no connected targets - stop it + # otherwise keep it running + if !GetStartService() + readSessions + if Builtins.size(@sessions) == 0 + Builtins.y2milestone("No active sessions - stopping iscsi + service and iscsid service/socket") + # stop iscsid.socket and iscsid.service + iscsidSocketStop + Service.Stop("iscsid") + Service.Stop("iscsi") + end end end Builtins.y2milestone("Status service for iscsid: %1", ret) continue with "q"... Checked in at Mon Mar 17 12:25:56 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org