From e14934396bb2261ec89e67316477f75cb59c5038 Mon Sep 17 00:00:00 2001
From: onenhansen <92747003+onenhansen@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:57:07 -0600
Subject: [PATCH] F #5328: Update logrotate behavior to avoid long restarts
 (#2275)

(cherry picked from commit 6b1127f180bcc4416bec3b7226629b392dd18737)
---
 share/pkgs/logrotate/opennebula                          | 1 +
 share/pkgs/logrotate/opennebula-fireedge                 | 1 +
 share/pkgs/logrotate/opennebula-flow                     | 1 +
 share/pkgs/logrotate/opennebula-gate                     | 1 +
 share/pkgs/logrotate/opennebula-hem                      | 1 +
 share/pkgs/logrotate/opennebula-novnc                    | 1 +
 share/pkgs/logrotate/opennebula-scheduler                | 1 +
 share/pkgs/logrotate/opennebula-sunstone                 | 1 +
 share/pkgs/services/legacy/ubuntu/opennebula             | 2 --
 share/pkgs/services/legacy/ubuntu/opennebula-flow        | 1 -
 share/pkgs/services/legacy/ubuntu/opennebula-gate        | 1 -
 share/pkgs/services/legacy/ubuntu/opennebula-novnc       | 1 -
 share/pkgs/services/legacy/ubuntu/opennebula-sunstone    | 1 -
 share/pkgs/services/systemd/opennebula-fireedge.service  | 1 -
 share/pkgs/services/systemd/opennebula-flow.service      | 1 -
 share/pkgs/services/systemd/opennebula-gate.service      | 1 -
 share/pkgs/services/systemd/opennebula-hem.service       | 1 -
 share/pkgs/services/systemd/opennebula-novnc.service     | 1 -
 share/pkgs/services/systemd/opennebula-scheduler.service | 1 -
 share/pkgs/services/systemd/opennebula-sunstone.service  | 1 -
 share/pkgs/services/systemd/opennebula.service           | 1 -
 21 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/share/pkgs/logrotate/opennebula b/share/pkgs/logrotate/opennebula
index 248389e01c..4aefad0474 100644
--- a/share/pkgs/logrotate/opennebula
+++ b/share/pkgs/logrotate/opennebula
@@ -3,6 +3,7 @@
     dateext
     dateformat -%Y%m%d-%s
     compress
+    maxsize 100M
     weekly
     rotate 52
     missingok
diff --git a/share/pkgs/logrotate/opennebula-fireedge b/share/pkgs/logrotate/opennebula-fireedge
index 588613e420..1457ebec25 100644
--- a/share/pkgs/logrotate/opennebula-fireedge
+++ b/share/pkgs/logrotate/opennebula-fireedge
@@ -3,6 +3,7 @@
     dateext
     dateformat -%Y%m%d-%s
     compress
+    maxsize 100M
     weekly
     rotate 52
     missingok
diff --git a/share/pkgs/logrotate/opennebula-flow b/share/pkgs/logrotate/opennebula-flow
index 7767a322b3..11c503b1c6 100644
--- a/share/pkgs/logrotate/opennebula-flow
+++ b/share/pkgs/logrotate/opennebula-flow
@@ -3,6 +3,7 @@
     dateext
     dateformat -%Y%m%d-%s
     compress
+    maxsize 100M
     weekly
     rotate 52
     missingok
diff --git a/share/pkgs/logrotate/opennebula-gate b/share/pkgs/logrotate/opennebula-gate
index c15e4ee4f4..20d58543f2 100644
--- a/share/pkgs/logrotate/opennebula-gate
+++ b/share/pkgs/logrotate/opennebula-gate
@@ -3,6 +3,7 @@
     dateext
     dateformat -%Y%m%d-%s
     compress
+    maxsize 100M
     weekly
     rotate 52
     missingok
diff --git a/share/pkgs/logrotate/opennebula-hem b/share/pkgs/logrotate/opennebula-hem
index eac069ae0a..9839d4c667 100644
--- a/share/pkgs/logrotate/opennebula-hem
+++ b/share/pkgs/logrotate/opennebula-hem
@@ -3,6 +3,7 @@
     dateext
     dateformat -%Y%m%d-%s
     compress
+    maxsize 100M
     weekly
     rotate 52
     missingok
diff --git a/share/pkgs/logrotate/opennebula-novnc b/share/pkgs/logrotate/opennebula-novnc
index 9ac1d567af..2f9334d5b5 100644
--- a/share/pkgs/logrotate/opennebula-novnc
+++ b/share/pkgs/logrotate/opennebula-novnc
@@ -3,6 +3,7 @@
     dateext
     dateformat -%Y%m%d-%s
     compress
+    maxsize 100M
     weekly
     rotate 52
     missingok
diff --git a/share/pkgs/logrotate/opennebula-scheduler b/share/pkgs/logrotate/opennebula-scheduler
index 9bdf4d26a9..404336919c 100644
--- a/share/pkgs/logrotate/opennebula-scheduler
+++ b/share/pkgs/logrotate/opennebula-scheduler
@@ -3,6 +3,7 @@
     dateext
     dateformat -%Y%m%d-%s
     compress
+    maxsize 100M
     weekly
     rotate 52
     missingok
diff --git a/share/pkgs/logrotate/opennebula-sunstone b/share/pkgs/logrotate/opennebula-sunstone
index 84eb47b111..1ff2b656ef 100644
--- a/share/pkgs/logrotate/opennebula-sunstone
+++ b/share/pkgs/logrotate/opennebula-sunstone
@@ -3,6 +3,7 @@
     dateext
     dateformat -%Y%m%d-%s
     compress
+    maxsize 100M
     weekly
     rotate 52
     missingok
diff --git a/share/pkgs/services/legacy/ubuntu/opennebula b/share/pkgs/services/legacy/ubuntu/opennebula
index 758fa89fcc..85aa4246f8 100755
--- a/share/pkgs/services/legacy/ubuntu/opennebula
+++ b/share/pkgs/services/legacy/ubuntu/opennebula
@@ -38,7 +38,6 @@ do_start()
 {
     mkdir -p /var/run/one /var/lock/one
     chown oneadmin /var/run/one /var/lock/one
-    logrotate -f /etc/logrotate.d/opennebula /etc/logrotate.d/opennebula-scheduler
     su oneadmin -s /bin/sh -c 'one start'
     ONE_START=$?
 
@@ -66,7 +65,6 @@ do_stop()
 
 do_start_sched()
 {
-    logrotate -f /etc/logrotate.d/opennebula-scheduler
     su oneadmin -s /bin/sh -c 'one start-sched'
 }
 
diff --git a/share/pkgs/services/legacy/ubuntu/opennebula-flow b/share/pkgs/services/legacy/ubuntu/opennebula-flow
index da821c138b..b670b8b05b 100755
--- a/share/pkgs/services/legacy/ubuntu/opennebula-flow
+++ b/share/pkgs/services/legacy/ubuntu/opennebula-flow
@@ -36,7 +36,6 @@ do_start()
 {
     mkdir -p /var/run/one /var/lock/one /var/log/one
     chown oneadmin /var/run/one /var/lock/one /var/log/one
-    logrotate -f /etc/logrotate.d/opennebula-flow
     su oneadmin -s /bin/sh -c "$DAEMON start"
 }
 
diff --git a/share/pkgs/services/legacy/ubuntu/opennebula-gate b/share/pkgs/services/legacy/ubuntu/opennebula-gate
index 7b03dae32f..f4d7471df2 100755
--- a/share/pkgs/services/legacy/ubuntu/opennebula-gate
+++ b/share/pkgs/services/legacy/ubuntu/opennebula-gate
@@ -36,7 +36,6 @@ do_start()
 {
     mkdir -p /var/run/one /var/lock/one /var/log/one
     chown oneadmin /var/run/one /var/lock/one /var/log/one
-    logrotate -f /etc/logrotate.d/opennebula-gate
     su oneadmin -s /bin/sh -c "$DAEMON start"
 }
 
diff --git a/share/pkgs/services/legacy/ubuntu/opennebula-novnc b/share/pkgs/services/legacy/ubuntu/opennebula-novnc
index 2bff30a69c..f583a5fe1c 100755
--- a/share/pkgs/services/legacy/ubuntu/opennebula-novnc
+++ b/share/pkgs/services/legacy/ubuntu/opennebula-novnc
@@ -35,7 +35,6 @@ do_start()
 {
     mkdir -p /var/lock/one /var/log/one
     chown oneadmin /var/lock/one /var/log/one
-    logrotate -f /etc/logrotate.d/opennebula-novnc
     su oneadmin -s /bin/sh -c "$DAEMON start"
 }
 
diff --git a/share/pkgs/services/legacy/ubuntu/opennebula-sunstone b/share/pkgs/services/legacy/ubuntu/opennebula-sunstone
index d769427078..34e9e1fbfb 100755
--- a/share/pkgs/services/legacy/ubuntu/opennebula-sunstone
+++ b/share/pkgs/services/legacy/ubuntu/opennebula-sunstone
@@ -37,7 +37,6 @@ do_start()
     service opennebula-novnc start
     mkdir -p /var/run/one /var/lock/one /var/log/one
     chown oneadmin /var/run/one /var/lock/one /var/log/one
-    logrotate -f /etc/logrotate.d/opennebula-sunstone
     su oneadmin -s /bin/sh -c "$DAEMON start-sunstone"
 }
 
diff --git a/share/pkgs/services/systemd/opennebula-fireedge.service b/share/pkgs/services/systemd/opennebula-fireedge.service
index 627789c384..e1c82a5ea6 100644
--- a/share/pkgs/services/systemd/opennebula-fireedge.service
+++ b/share/pkgs/services/systemd/opennebula-fireedge.service
@@ -10,7 +10,6 @@ AssertFileNotEmpty=/var/lib/one/.one/sunstone_auth
 Type=simple
 Group=oneadmin
 User=oneadmin
-ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula-fireedge -s /var/lib/one/.logrotate.status
 ExecStart=/bin/sh -c 'exec node /usr/lib/one/fireedge/dist/index.js >>/var/log/one/fireedge.log 2>>/var/log/one/fireedge.error'
 StartLimitInterval=60
 StartLimitBurst=3
diff --git a/share/pkgs/services/systemd/opennebula-flow.service b/share/pkgs/services/systemd/opennebula-flow.service
index a1f26cb242..3cb8268860 100644
--- a/share/pkgs/services/systemd/opennebula-flow.service
+++ b/share/pkgs/services/systemd/opennebula-flow.service
@@ -8,7 +8,6 @@ AssertFileNotEmpty=/var/lib/one/.one/oneflow_auth
 Type=simple
 Group=oneadmin
 User=oneadmin
-ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula-flow -s /var/lib/one/.logrotate.status
 ExecStart=/usr/bin/ruby /usr/lib/one/oneflow/oneflow-server.rb
 StartLimitInterval=60
 StartLimitBurst=3
diff --git a/share/pkgs/services/systemd/opennebula-gate.service b/share/pkgs/services/systemd/opennebula-gate.service
index 4a37592bec..c3e5abd807 100644
--- a/share/pkgs/services/systemd/opennebula-gate.service
+++ b/share/pkgs/services/systemd/opennebula-gate.service
@@ -8,7 +8,6 @@ AssertFileNotEmpty=/var/lib/one/.one/onegate_auth
 Type=simple
 Group=oneadmin
 User=oneadmin
-ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula-gate -s /var/lib/one/.logrotate.status
 ExecStart=/usr/bin/ruby /usr/lib/one/onegate/onegate-server.rb
 StartLimitInterval=60
 StartLimitBurst=3
diff --git a/share/pkgs/services/systemd/opennebula-hem.service b/share/pkgs/services/systemd/opennebula-hem.service
index 9762ba4263..a36a127b50 100644
--- a/share/pkgs/services/systemd/opennebula-hem.service
+++ b/share/pkgs/services/systemd/opennebula-hem.service
@@ -8,7 +8,6 @@ Type=simple
 Group=oneadmin
 User=oneadmin
 EnvironmentFile=-/var/run/one/ssh-agent.env
-ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula-hem -s /var/lib/one/.logrotate.status
 ExecStart=/usr/bin/ruby /usr/lib/one/onehem/onehem-server.rb
 StartLimitInterval=60
 StartLimitBurst=3
diff --git a/share/pkgs/services/systemd/opennebula-novnc.service b/share/pkgs/services/systemd/opennebula-novnc.service
index e738627ea8..ccd804e393 100644
--- a/share/pkgs/services/systemd/opennebula-novnc.service
+++ b/share/pkgs/services/systemd/opennebula-novnc.service
@@ -6,7 +6,6 @@ After=syslog.target network.target
 Type=forking
 Group=oneadmin
 User=oneadmin
-ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula-novnc -s /var/lib/one/.logrotate.status
 ExecStart=/usr/bin/novnc-server start
 PIDFile=/var/lock/one/.novnc.lock
 StartLimitInterval=60
diff --git a/share/pkgs/services/systemd/opennebula-scheduler.service b/share/pkgs/services/systemd/opennebula-scheduler.service
index 83e723ff72..3d64481fc3 100644
--- a/share/pkgs/services/systemd/opennebula-scheduler.service
+++ b/share/pkgs/services/systemd/opennebula-scheduler.service
@@ -8,7 +8,6 @@ AssertFileNotEmpty=/var/lib/one/.one/one_auth
 Type=simple
 Group=oneadmin
 User=oneadmin
-ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula-scheduler -s /var/lib/one/.logrotate.status
 ExecStart=/usr/bin/mm_sched
 StartLimitInterval=60
 StartLimitBurst=3
diff --git a/share/pkgs/services/systemd/opennebula-sunstone.service b/share/pkgs/services/systemd/opennebula-sunstone.service
index ff7c710279..d3d975681c 100644
--- a/share/pkgs/services/systemd/opennebula-sunstone.service
+++ b/share/pkgs/services/systemd/opennebula-sunstone.service
@@ -10,7 +10,6 @@ Type=simple
 Group=oneadmin
 User=oneadmin
 AmbientCapabilities=CAP_NET_BIND_SERVICE
-ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula-sunstone -s /var/lib/one/.logrotate.status
 ExecStart=/usr/bin/ruby /usr/lib/one/sunstone/sunstone-server.rb
 ReadWriteDirectories=/var/lib/one /var/log/one/
 ReadOnlyDirectories=-/var/lib/one/remotes
diff --git a/share/pkgs/services/systemd/opennebula.service b/share/pkgs/services/systemd/opennebula.service
index e58c1223da..da505218ea 100644
--- a/share/pkgs/services/systemd/opennebula.service
+++ b/share/pkgs/services/systemd/opennebula.service
@@ -14,7 +14,6 @@ Group=oneadmin
 User=oneadmin
 Environment="PATH=/usr/lib/one/sh/override:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 EnvironmentFile=-/var/run/one/ssh-agent.env
-ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula -s /var/lib/one/.logrotate.status
 ExecStart=/usr/bin/oned -f
 ExecStopPost=/usr/share/one/follower_cleanup
 PIDFile=/var/lock/one/one