Merge remote-tracking branch 'origin/4.18' into 4.19

Author: yadvr

server/src/main/java/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java

@@ -417,6 +417,13 @@ public Date scheduleNextSnapshotJob(final SnapshotPolicyVO policy) {
         if (policyId == Snapshot.MANUAL_POLICY_ID) {
             return null;
         }
+
+        if (_volsDao.findById(policy.getVolumeId()) == null) {
+            s_logger.warn("Found snapshot policy ID: " + policyId + " for volume ID: " + policy.getVolumeId() + " that does not exist or has been removed");
+            removeSchedule(policy.getVolumeId(), policy.getId());
+            return null;
+        }
+
         final Date nextSnapshotTimestamp = getNextScheduledTime(policyId, _currentTimestamp);
         SnapshotScheduleVO spstSchedVO = _snapshotScheduleDao.findOneByVolumePolicy(policy.getVolumeId(), policy.getId());
         if (spstSchedVO == null) {

systemvm/debian/opt/cloud/bin/setup/postinit.sh

@@ -26,6 +26,19 @@ log_it() {
 # Restart journald for setting changes to apply
 systemctl restart systemd-journald
 
+# Restore the persistent iptables nat, rules and filters for IPv4 and IPv6 if they exist
+ipv4="/etc/iptables/rules.v4"
+if [ -e $ipv4 ]
+then
+  iptables-restore < $ipv4
+fi
+
+ipv6="/etc/iptables/rules.v6"
+if [ -e $ipv6 ]
+then
+  ip6tables-restore < $ipv6
+fi
+
 CMDLINE=/var/cache/cloud/cmdline
 TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
 if [ "$TYPE" == "router" ] || [ "$TYPE" == "vpcrouter" ] || [ "$TYPE" == "dhcpsrvr" ]
@@ -52,17 +65,4 @@ do
   systemctl disable --now --no-block $svc
 done
 
-# Restore the persistent iptables nat, rules and filters for IPv4 and IPv6 if they exist
-ipv4="/etc/iptables/rules.v4"
-if [ -e $ipv4 ]
-then
-  iptables-restore < $ipv4
-fi
-
-ipv6="/etc/iptables/rules.v6"
-if [ -e $ipv6 ]
-then
-  ip6tables-restore < $ipv6
-fi
-
 date > /var/cache/cloud/boot_up_done