be0c12
From 3674514b7220a136dcfd464c205d41609f0c99a7 Mon Sep 17 00:00:00 2001
be0c12
From: Michal Sekletar <msekleta@redhat.com>
be0c12
Date: Mon, 4 Oct 2021 17:51:52 +0200
be0c12
Subject: [PATCH] core: rename/generalize UNIT(u)->test_start_limit() hook
be0c12
be0c12
Up until now the main reason why we didn't proceed with starting the
be0c12
unit was exceed start limit burst. However, for unit types like mounts
be0c12
the other reason could be effective ratelimit on /proc/self/mountinfo
be0c12
event source. That means our mount unit state may not reflect current
be0c12
kernel state. Hence, we need to attempt to re-run the start job again
be0c12
after ratelimit on event source expires.
be0c12
be0c12
As we will be introducing another reason than start limit let's rename
be0c12
the virtual function that implements the check.
be0c12
be0c12
(cherry picked from commit 705578c3b9d794097233aa66010cf67b2a444716)
be0c12
be0c12
Related: #2036608
be0c12
---
be0c12
 src/core/automount.c | 6 +++---
be0c12
 src/core/mount.c     | 6 +++---
be0c12
 src/core/path.c      | 6 +++---
be0c12
 src/core/service.c   | 6 +++---
be0c12
 src/core/socket.c    | 6 +++---
be0c12
 src/core/swap.c      | 6 +++---
be0c12
 src/core/timer.c     | 6 +++---
be0c12
 src/core/unit.c      | 6 +++---
be0c12
 src/core/unit.h      | 2 +-
be0c12
 9 files changed, 25 insertions(+), 25 deletions(-)
be0c12
be0c12
diff --git a/src/core/automount.c b/src/core/automount.c
be0c12
index 5e16adabb5..f212620c8f 100644
be0c12
--- a/src/core/automount.c
be0c12
+++ b/src/core/automount.c
be0c12
@@ -1071,7 +1071,7 @@ static bool automount_supported(void) {
be0c12
         return supported;
be0c12
 }
be0c12
 
be0c12
-static int automount_test_start_limit(Unit *u) {
be0c12
+static int automount_can_start(Unit *u) {
be0c12
         Automount *a = AUTOMOUNT(u);
be0c12
         int r;
be0c12
 
be0c12
@@ -1083,7 +1083,7 @@ static int automount_test_start_limit(Unit *u) {
be0c12
                 return r;
be0c12
         }
be0c12
 
be0c12
-        return 0;
be0c12
+        return 1;
be0c12
 }
be0c12
 
be0c12
 static const char* const automount_result_table[_AUTOMOUNT_RESULT_MAX] = {
be0c12
@@ -1145,5 +1145,5 @@ const UnitVTable automount_vtable = {
be0c12
                 },
be0c12
         },
be0c12
 
be0c12
-        .test_start_limit = automount_test_start_limit,
be0c12
+        .can_start = automount_can_start,
be0c12
 };
be0c12
diff --git a/src/core/mount.c b/src/core/mount.c
be0c12
index 22848847e5..032a2ca156 100644
be0c12
--- a/src/core/mount.c
be0c12
+++ b/src/core/mount.c
be0c12
@@ -1951,7 +1951,7 @@ static int mount_control_pid(Unit *u) {
be0c12
         return m->control_pid;
be0c12
 }
be0c12
 
be0c12
-static int mount_test_start_limit(Unit *u) {
be0c12
+static int mount_can_start(Unit *u) {
be0c12
         Mount *m = MOUNT(u);
be0c12
         int r;
be0c12
 
be0c12
@@ -1963,7 +1963,7 @@ static int mount_test_start_limit(Unit *u) {
be0c12
                 return r;
be0c12
         }
be0c12
 
be0c12
-        return 0;
be0c12
+        return 1;
be0c12
 }
be0c12
 
be0c12
 static const char* const mount_exec_command_table[_MOUNT_EXEC_COMMAND_MAX] = {
be0c12
@@ -2058,5 +2058,5 @@ const UnitVTable mount_vtable = {
be0c12
                 },
be0c12
         },
be0c12
 
be0c12
-        .test_start_limit = mount_test_start_limit,
be0c12
+        .can_start = mount_can_start,
be0c12
 };
be0c12
diff --git a/src/core/path.c b/src/core/path.c
be0c12
index 1e69a1f05f..58f490589d 100644
be0c12
--- a/src/core/path.c
be0c12
+++ b/src/core/path.c
be0c12
@@ -724,7 +724,7 @@ static void path_reset_failed(Unit *u) {
be0c12
         p->result = PATH_SUCCESS;
be0c12
 }
be0c12
 
be0c12
-static int path_test_start_limit(Unit *u) {
be0c12
+static int path_can_start(Unit *u) {
be0c12
         Path *p = PATH(u);
be0c12
         int r;
be0c12
 
be0c12
@@ -736,7 +736,7 @@ static int path_test_start_limit(Unit *u) {
be0c12
                 return r;
be0c12
         }
be0c12
 
be0c12
-        return 0;
be0c12
+        return 1;
be0c12
 }
be0c12
 
be0c12
 static const char* const path_type_table[_PATH_TYPE_MAX] = {
be0c12
@@ -792,5 +792,5 @@ const UnitVTable path_vtable = {
be0c12
         .bus_vtable = bus_path_vtable,
be0c12
         .bus_set_property = bus_path_set_property,
be0c12
 
be0c12
-        .test_start_limit = path_test_start_limit,
be0c12
+        .can_start = path_can_start,
be0c12
 };
be0c12
diff --git a/src/core/service.c b/src/core/service.c
be0c12
index c5f408d817..e8ae1a5772 100644
be0c12
--- a/src/core/service.c
be0c12
+++ b/src/core/service.c
be0c12
@@ -4074,7 +4074,7 @@ static bool service_needs_console(Unit *u) {
be0c12
                       SERVICE_FINAL_SIGKILL);
be0c12
 }
be0c12
 
be0c12
-static int service_test_start_limit(Unit *u) {
be0c12
+static int service_can_start(Unit *u) {
be0c12
         Service *s = SERVICE(u);
be0c12
         int r;
be0c12
 
be0c12
@@ -4087,7 +4087,7 @@ static int service_test_start_limit(Unit *u) {
be0c12
                 return r;
be0c12
         }
be0c12
 
be0c12
-        return 0;
be0c12
+        return 1;
be0c12
 }
be0c12
 
be0c12
 static const char* const service_restart_table[_SERVICE_RESTART_MAX] = {
be0c12
@@ -4232,5 +4232,5 @@ const UnitVTable service_vtable = {
be0c12
                 },
be0c12
         },
be0c12
 
be0c12
-        .test_start_limit = service_test_start_limit,
be0c12
+        .can_start = service_can_start,
be0c12
 };
be0c12
diff --git a/src/core/socket.c b/src/core/socket.c
be0c12
index 36d2e4f823..3589300e68 100644
be0c12
--- a/src/core/socket.c
be0c12
+++ b/src/core/socket.c
be0c12
@@ -3261,7 +3261,7 @@ static int socket_control_pid(Unit *u) {
be0c12
         return s->control_pid;
be0c12
 }
be0c12
 
be0c12
-static int socket_test_start_limit(Unit *u) {
be0c12
+static int socket_can_start(Unit *u) {
be0c12
         Socket *s = SOCKET(u);
be0c12
         int r;
be0c12
 
be0c12
@@ -3273,7 +3273,7 @@ static int socket_test_start_limit(Unit *u) {
be0c12
                 return r;
be0c12
         }
be0c12
 
be0c12
-        return 0;
be0c12
+        return 1;
be0c12
 }
be0c12
 
be0c12
 static const char* const socket_exec_command_table[_SOCKET_EXEC_COMMAND_MAX] = {
be0c12
@@ -3369,5 +3369,5 @@ const UnitVTable socket_vtable = {
be0c12
                 },
be0c12
         },
be0c12
 
be0c12
-        .test_start_limit = socket_test_start_limit,
be0c12
+        .can_start = socket_can_start,
be0c12
 };
be0c12
diff --git a/src/core/swap.c b/src/core/swap.c
be0c12
index 90fcd69300..498c5a6d69 100644
be0c12
--- a/src/core/swap.c
be0c12
+++ b/src/core/swap.c
be0c12
@@ -1452,7 +1452,7 @@ static int swap_control_pid(Unit *u) {
be0c12
         return s->control_pid;
be0c12
 }
be0c12
 
be0c12
-static int swap_test_start_limit(Unit *u) {
be0c12
+static int swap_can_start(Unit *u) {
be0c12
         Swap *s = SWAP(u);
be0c12
         int r;
be0c12
 
be0c12
@@ -1464,7 +1464,7 @@ static int swap_test_start_limit(Unit *u) {
be0c12
                 return r;
be0c12
         }
be0c12
 
be0c12
-        return 0;
be0c12
+        return 1;
be0c12
 }
be0c12
 
be0c12
 static const char* const swap_exec_command_table[_SWAP_EXEC_COMMAND_MAX] = {
be0c12
@@ -1557,5 +1557,5 @@ const UnitVTable swap_vtable = {
be0c12
                 },
be0c12
         },
be0c12
 
be0c12
-        .test_start_limit = swap_test_start_limit,
be0c12
+        .can_start = swap_can_start,
be0c12
 };
be0c12
diff --git a/src/core/timer.c b/src/core/timer.c
be0c12
index fb9ae17990..684180bf99 100644
be0c12
--- a/src/core/timer.c
be0c12
+++ b/src/core/timer.c
be0c12
@@ -823,7 +823,7 @@ static void timer_timezone_change(Unit *u) {
be0c12
         timer_enter_waiting(t, false);
be0c12
 }
be0c12
 
be0c12
-static int timer_test_start_limit(Unit *u) {
be0c12
+static int timer_can_start(Unit *u) {
be0c12
         Timer *t = TIMER(u);
be0c12
         int r;
be0c12
 
be0c12
@@ -835,7 +835,7 @@ static int timer_test_start_limit(Unit *u) {
be0c12
                 return r;
be0c12
         }
be0c12
 
be0c12
-        return 0;
be0c12
+        return 1;
be0c12
 }
be0c12
 
be0c12
 static const char* const timer_base_table[_TIMER_BASE_MAX] = {
be0c12
@@ -893,5 +893,5 @@ const UnitVTable timer_vtable = {
be0c12
         .bus_set_property = bus_timer_set_property,
be0c12
 
be0c12
         .can_transient = true,
be0c12
-        .test_start_limit = timer_test_start_limit,
be0c12
+        .can_start = timer_can_start,
be0c12
 };
be0c12
diff --git a/src/core/unit.c b/src/core/unit.c
be0c12
index f0df7452fa..4de218feac 100644
be0c12
--- a/src/core/unit.c
be0c12
+++ b/src/core/unit.c
be0c12
@@ -1728,9 +1728,9 @@ int unit_start(Unit *u) {
be0c12
 
be0c12
         assert(u);
be0c12
 
be0c12
-        /* Check start rate limiting early so that failure conditions don't cause us to enter a busy loop. */
be0c12
-        if (UNIT_VTABLE(u)->test_start_limit) {
be0c12
-                int r = UNIT_VTABLE(u)->test_start_limit(u);
be0c12
+        /* Check our ability to start early so that failure conditions don't cause us to enter a busy loop. */
be0c12
+        if (UNIT_VTABLE(u)->can_start) {
be0c12
+                int r = UNIT_VTABLE(u)->can_start(u);
be0c12
                 if (r < 0)
be0c12
                         return r;
be0c12
         }
be0c12
diff --git a/src/core/unit.h b/src/core/unit.h
be0c12
index 9e6f1bcf81..0cd259411f 100644
be0c12
--- a/src/core/unit.h
be0c12
+++ b/src/core/unit.h
be0c12
@@ -569,7 +569,7 @@ typedef struct UnitVTable {
be0c12
 
be0c12
         /* If this function is set, it's invoked first as part of starting a unit to allow start rate
be0c12
          * limiting checks to occur before we do anything else. */
be0c12
-        int (*test_start_limit)(Unit *u);
be0c12
+        int (*can_start)(Unit *u);
be0c12
 
be0c12
         /* The strings to print in status messages */
be0c12
         UnitStatusMessageFormats status_message_formats;