Include reboot required indication for non-Suse distros

java/code/src/com/redhat/rhn/domain/server/MinionServer.java

@@ -24,6 +24,7 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
@@ -39,14 +40,7 @@ public class MinionServer extends Server implements SaltConfigurable {
     private Integer sshPushPort;
     private Set<AccessToken> accessTokens = new HashSet<>();
     private Set<Pillar> pillars = new HashSet<>();
-    /**
-       We typically look at the packages installed on a system to identify whether a reboot is necessary.
-       This property initially only works for transactional systems, but the idea is that gradually the
-       other types of systems also provide this information directly to be stored here so we no longer rely
-       on package related inference to determine whether a reboot is necessary. Even because this
-       information does not always depend only on the packages.
-    */
-    private Boolean rebootNeeded;
+    private Date rebootRequiredAfter;
 
     /**
      * Constructs a MinionServer instance.
@@ -325,11 +319,15 @@ private boolean updateServerPaths(Optional<Server> proxy, Optional<String> hostn
         return changed;
     }
 
-    public Boolean isRebootNeeded() {
-        return rebootNeeded;
+    public boolean isRebootNeeded() {
+        return getLastBoot() != null && rebootRequiredAfter != null && getLastBootAsDate().before(rebootRequiredAfter);
+    }
+
+    public Date getRebootRequiredAfter() {
+        return rebootRequiredAfter;
     }
 
-    public void setRebootNeeded(Boolean rebootNeededIn) {
-        this.rebootNeeded = rebootNeededIn;
+    public void setRebootRequiredAfter(Date rebootRequiredAfterIn) {
+        rebootRequiredAfter = rebootRequiredAfterIn;
     }
 }

java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml

@@ -184,14 +184,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
                          table="suseMinionInfo">
             <key column="server_id"/>
             <property name="minionId" column="minion_id" />
-            <!--
-            We typically look at the packages installed on a system to identify whether a reboot is necessary.
-            This property initially only works for transactional systems, but the idea is that gradually the
-            other types of systems also provide this information directly to be stored here so we no longer rely
-            on package related inference to determine whether a reboot is necessary. Even because this
-            information does not always depend only on the packages.
-            -->
-            <property name="rebootNeeded" column="reboot_needed" type="yes_no" />
+            <property name="rebootRequiredAfter" column="reboot_required_after" type="timestamp" />
             <property name="osFamily" column="os_family"  type="string" length="32" />
             <property name="kernelLiveVersion" column="kernel_live_version"  type="string" length="255" />
             <property name="sshPushPort" column="ssh_push_port" access="field"/>

java/code/src/com/redhat/rhn/manager/satellite/UpgradeCommand.java

@@ -78,6 +78,8 @@ public class UpgradeCommand extends BaseTransactionCommand {
             UPGRADE_TASK_NAME + "refresh_custom_sls_files";
     public static final String REFRESH_VIRTHOST_PILLARS =
             UPGRADE_TASK_NAME + "virthost_pillar_refresh";
+    public static final String REFRESH_ALL_SYSTEMS_PILLARS =
+            UPGRADE_TASK_NAME + "all_systems_pillar_refresh";
     public static final String SYSTEM_THRESHOLD_FROM_CONFIG =
             UPGRADE_TASK_NAME + "system_threshold_conf";
 
@@ -152,6 +154,9 @@ public void upgrade() {
                     case SYSTEM_THRESHOLD_FROM_CONFIG:
                         convertSystemThresholdFromConfig();
                         break;
+                    case REFRESH_ALL_SYSTEMS_PILLARS:
+                        refreshAllSystemsPillar();
+                        break;
                     default:
                 }
                 // always run this
@@ -359,6 +364,22 @@ private void refreshVirtHostPillar() {
         }
     }
 
+    /**
+     * Regenerate pillar data for every registered system.
+     */
+    private void refreshAllSystemsPillar() {
+        try {
+            List<MinionServer> hosts = MinionServerFactory.listMinions();
+            hosts.forEach(MinionPillarManager.INSTANCE::generatePillar);
+            List<String> minionIds = hosts.stream().map(MinionServer::getMinionId).collect(Collectors.toList());
+            GlobalInstanceHolder.SALT_API.refreshPillar(new MinionList(minionIds));
+            log.info("Refreshed hosts pillar");
+        }
+        catch (Exception e) {
+            log.error("Error refreshing hosts pillar. Ignoring.", e);
+        }
+    }
+
     private void convertSystemThresholdFromConfig() {
         log.warn("Converting web.system_checkin_threshold to DB config");
         SatConfigFactory.setSatConfigValue(SatConfigFactory.SYSTEM_CHECKIN_THRESHOLD,

java/code/src/com/suse/manager/reactor/SaltReactor.java

@@ -76,6 +76,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.util.Date;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -326,7 +327,9 @@ else if (beaconEvent.getBeacon().equals("reboot_info")) {
             Optional<MinionServer> minion = MinionServerFactory.findByMinionId(beaconEvent.getMinionId());
             minion.ifPresent(
                 m -> {
-                    m.setRebootNeeded((Boolean) beaconEvent.getData().get("reboot_needed"));
+                    Boolean rebootRequired = (Boolean) beaconEvent.getData().get("reboot_needed");
+                    Date rebootRequiredAfter = rebootRequired ? new Date() : null;
+                    m.setRebootRequiredAfter(rebootRequiredAfter);
                     SystemManager.updateSystemOverview(m);
                 }
             );

java/code/src/com/suse/manager/reactor/test/RebootInfoBeaconTest.java

@@ -76,11 +76,13 @@ public void setUp() {
     public void testRebootInfoEvent() throws Exception {
         MinionServer minion1 = MinionServerFactoryTest.createTestMinionServer(user);
         minion1.setMinionId("slemicro100001");
-        minion1.setRebootNeeded(false);
+        minion1.setLastBoot(System.currentTimeMillis() / 1000);
+        minion1.setRebootRequiredAfter(null);
 
         MinionServer minion2 = MinionServerFactoryTest.createTestMinionServer(user);
         minion2.setMinionId("slemicro100002");
-        minion2.setRebootNeeded(false);
+        minion1.setLastBoot(System.currentTimeMillis() / 1000);
+        minion2.setRebootRequiredAfter(null);
 
         // Event indicating that reboot is needed for minion 1
         BeaconEvent event = buildRebootInfoEvent(minion1.getMinionId(), true);

java/code/src/com/suse/manager/utils/SaltUtils.java

@@ -1485,6 +1485,10 @@ else if ("debian".equalsIgnoreCase(grains.getValueAsString("os"))) {
                 .map(n -> n.longValue())
                 .orElse(null));
 
+        result.getRebootRequired()
+                .map(flag -> (Boolean) flag.getChanges().getRet().get("reboot_required"))
+                .ifPresent(flag -> server.setRebootRequiredAfter(flag ? new Date() : null));
+
         // Update live patching version
         server.setKernelLiveVersion(result.getKernelLiveVersionInfo()
                 .map(klv -> klv.getChanges().getRet()).filter(Objects::nonNull)

java/code/src/com/suse/manager/webui/services/pillar/MinionGeneralPillarGenerator.java

@@ -43,10 +43,14 @@ public class MinionGeneralPillarGenerator extends MinionPillarGeneratorBase {
     public static final String CATEGORY = "general";
 
     private static final int PKGSET_INTERVAL = 5;
+    private static final Integer REBOOT_INFO_INTERVAL = 10;
 
     private static final Map<String, Object> PKGSET_BEACON_PROPS = new HashMap<>();
+    private static final Map<String, Object> REBOOT_INFO_BEACON_PROPS = new HashMap<>();
+
     static {
         PKGSET_BEACON_PROPS.put("interval", PKGSET_INTERVAL);
+        REBOOT_INFO_BEACON_PROPS.put("interval", REBOOT_INFO_INTERVAL);
     }
 
     /**
@@ -91,6 +95,7 @@ public Optional<Pillar> generatePillarData(MinionServer minion) {
                 minion.getOsFamily().toLowerCase().equals("redhat") ||
                 minion.getOsFamily().toLowerCase().equals("debian")) {
             beaconConfig.put("pkgset", PKGSET_BEACON_PROPS);
+            beaconConfig.put("reboot_info", REBOOT_INFO_BEACON_PROPS);
         }
         if (!beaconConfig.isEmpty()) {
             pillar.add("beacons", beaconConfig);

java/code/src/com/suse/manager/webui/utils/salt/custom/PkgProfileUpdateSlsResult.java

@@ -56,6 +56,9 @@ public class PkgProfileUpdateSlsResult {
     @SerializedName("mgrcompat_|-status_uptime_|-status.uptime_|-module_run")
     private Optional<StateApplyResult<Ret<Map<String, Object>>>> upTime = Optional.empty();
 
+    @SerializedName("mgrcompat_|-reboot_required_|-reboot_info.reboot_required_|-module_run")
+    private Optional<StateApplyResult<Ret<Map<String, Object>>>> rebootRequired = Optional.empty();
+
     @SerializedName("mgrcompat_|-kernel_live_version_|-sumautil.get_kernel_live_version_|-module_run")
     private Optional<StateApplyResult<Ret<KernelLiveVersionInfo>>> kernelLiveVersionInfo = Optional.empty();
 
@@ -103,6 +106,14 @@ public Optional<StateApplyResult<Ret<Map<String, Object>>>> getUpTime() {
         return upTime;
     }
 
+    /**
+     * Gets the reboot required indication
+     * @return optional of reboot required flag
+     */
+    public Optional<StateApplyResult<Ret<Map<String, Object>>>> getRebootRequired() {
+        return rebootRequired;
+    }
+
     /**
      * Gets live patching info.
      *

java/spacewalk-java.changes.welder.reboot-required-any-distro

@@ -0,0 +1 @@
+- Include reboot required indication for non-Suse distros

schema/spacewalk/common/tables/suseMinionInfo.sql

@@ -15,15 +15,15 @@
 
 CREATE TABLE suseMinionInfo
 (
-    server_id           NUMERIC NOT NULL
-                            CONSTRAINT suse_minion_info_sid_fk
-                                REFERENCES rhnServer (id)
-                                ON DELETE CASCADE,
-    minion_id           VARCHAR(256) NOT NULL,
-    os_family           VARCHAR(32),
-    kernel_live_version VARCHAR(255),
-    ssh_push_port       NUMERIC,
-    reboot_needed       CHAR(1),
+    server_id             NUMERIC NOT NULL
+                              CONSTRAINT suse_minion_info_sid_fk
+                                  REFERENCES rhnServer (id)
+                                  ON DELETE CASCADE,
+    minion_id             VARCHAR(256) NOT NULL,
+    os_family             VARCHAR(32),
+    kernel_live_version   VARCHAR(255),
+    ssh_push_port         NUMERIC,
+    reboot_required_after TIMESTAMPTZ,
     created   TIMESTAMPTZ
                   DEFAULT (current_timestamp) NOT NULL,
     modified  TIMESTAMPTZ

schema/spacewalk/postgres/procs/update_system_overview.sql

@@ -216,9 +216,10 @@ begin
                (SELECT 1
                 FROM suseMinionInfo smi
                 WHERE smi.server_id = S.id
-                AND smi.reboot_needed = 'Y'
+                AND to_date('1970-01-01', 'YYYY-MM-DD')
+                       + numtodsinterval(S.last_boot, 'second') < smi.reboot_required_after at time zone 'UTC'
                )
-        );
+    );
 
     SELECT TRUE into new_kickstarting
     FROM rhnKickstartSession KSS, rhnKickstartSessionState KSSS

schema/spacewalk/upgrade/susemanager-schema-4.4.9-to-susemanager-schema-4.4.10/200-reboot-required-any-distro.sql

@@ -0,0 +1,19 @@
+ALTER TABLE suseMinionInfo ADD COLUMN IF NOT EXISTS
+    reboot_required_after TIMESTAMPTZ;
+
+DO $$ 
+BEGIN 
+    IF EXISTS (
+        SELECT column_name 
+        FROM information_schema.columns 
+        WHERE table_name = 'suseminioninfo' AND column_name = 'reboot_needed'
+    ) THEN
+        UPDATE suseMinionInfo
+        SET reboot_required_after = CASE
+            WHEN reboot_needed = 'Y' THEN CURRENT_TIMESTAMP
+            ELSE NULL
+        END;
+    END IF;
+END $$;
+
+ALTER TABLE suseMinionInfo DROP COLUMN IF EXISTS reboot_needed;