Check /proc/uptime while waiting for systemd services to restart

yast · Feb 24, 2016 · 1fe1eb9 · 1fe1eb9
1 parent e32ca03
commit 1fe1eb9
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 3 deletions.
diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -214,6 +214,7 @@ rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast
 %dir %{yast_scrconfdir}
 %{yast_scrconfdir}/autoinstall.scr
 %{yast_scrconfdir}/cfg_autoinstall.scr
+%{yast_scrconfdir}/proc_uptime.scr
 # DTD files
 %dir /usr/share/autoinstall
 #%dir /usr/share/autoinstall/dtd

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -77,7 +77,8 @@ ylib_DATA = \
 scrconf_DATA = \
   scrconf/cfg_autoinstall.scr \
   scrconf/autoinstall.scr \
-  scrconf/ksimport.scr
+  scrconf/ksimport.scr \
+  scrconf/proc_uptime.scr
 
 agent_SCRIPTS = \
   servers_non_y2/ag_ksimport

diff --git a/src/clients/inst_autoconfigure.rb b/src/clients/inst_autoconfigure.rb
@@ -458,7 +458,7 @@ def wait_systemd_finished(max_wait, ser_ignore)
         max_wait,
         ser_ignore
       )
-      st_time = Builtins.time
+      st_time = SCR.Read(path(".proc.uptime"))["uptime"]
       cur_time = st_time
       last_busy = st_time
       cmd = "systemctl --full list-jobs"
@@ -484,7 +484,7 @@ def wait_systemd_finished(max_wait, ser_ignore)
         Builtins.y2milestone("size ll=%1 ll:%2", cnt, ll)
         last_busy = cur_time if Ops.greater_than(cnt, 0)
         Builtins.sleep(500)
-        cur_time = Builtins.time
+        cur_time = SCR.Read(path(".proc.uptime"))["uptime"]
         Builtins.y2milestone(
           "wait_systemd_finished time:%1 idle:%2",
           Ops.subtract(cur_time, st_time),

diff --git a/src/scrconf/proc_uptime.scr b/src/scrconf/proc_uptime.scr
@@ -0,0 +1,35 @@
+/**
+ * File:
+ *   proc_uptime.scr
+ * Summary:
+ *   SCR Agent for reading /proc/uptime
+ * Access:
+ *   read
+ * Authors:
+ *   Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+ *
+ * Example: /proc/uptime
+ *   684141.86 683056.34
+ *
+ *     ...
+ **
+ *   Read(.proc.uptime)
+ *   ([ $["uptime": 684141.86, "idle": 683056.34] ])
+ */
+
+.proc.uptime
+
+`ag_anyagent(
+  `Description(
+      (`File("/proc/uptime")), // filename
+      "#\n",                   // Comment
+      true,                    // Read-only
+      (
+        `Tuple(
+          `uptime(`Float()),   // Wall clock since boot
+          `Whitespace(),
+          `idle(`Float())      // Combined idle time of all cpus
+        )
+      )
+  )
+)