shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-09 01:18:19 +03:00
Code

Merge pull request #33833 from YHNdnzj/manager-reload-assert

Browse Source 
core/manager: do not re-init Manager.lookup_paths when manager_reload(), minor assorted cleanups
This commit is contained in:
Mike Yuan 2024-09-09 14:21:57 +02:00 committed by GitHub
commit 4ec630bfba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/basic/chattr-util.c
View File

@ -6,6 +6,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <linux/fs.h> #include <linux/fs.h>
#include "bitfield.h"
#include "chattr-util.h" #include "chattr-util.h"
#include "errno-util.h" #include "errno-util.h"
#include "fd-util.h" #include "fd-util.h"
@ -93,11 +94,9 @@ int chattr_full(
* supported, and we can ignore it too */ * supported, and we can ignore it too */
unsigned current_attr = old_attr; unsigned current_attr = old_attr;
for (unsigned i = 0; i < sizeof(unsigned) * 8; i++) {
unsigned new_one, mask_one = 1u << i;
if (!FLAGS_SET(mask, mask_one)) BIT_FOREACH(i, mask) {
continue; unsigned new_one, mask_one = 1u << i;
new_one = UPDATE_FLAG(current_attr, mask_one, FLAGS_SET(value, mask_one)); new_one = UPDATE_FLAG(current_attr, mask_one, FLAGS_SET(value, mask_one));
if (new_one == current_attr) if (new_one == current_attr)
@ -138,6 +137,7 @@ int read_attr_fd(int fd, unsigned *ret) {
struct stat st; struct stat st;
assert(fd >= 0); assert(fd >= 0);
assert(ret);
if (fstat(fd, &st) < 0) if (fstat(fd, &st) < 0)
return -errno; return -errno;
@ -156,7 +156,7 @@ int read_attr_at(int dir_fd, const char *path, unsigned *ret) {
assert(ret); assert(ret);
if (isempty(path)) { if (isempty(path)) {
fd = fd_reopen_condition(dir_fd, O_RDONLY|O_CLOEXEC, O_PATH, &fd_close); /* drop O_PATH if it is set */ fd = fd_reopen_condition(dir_fd, O_RDONLY|O_CLOEXEC|O_NOCTTY, O_PATH, &fd_close); /* drop O_PATH if it is set */
if (fd < 0) if (fd < 0)
return fd; return fd;
} else { } else {

19
src/core/manager.c
View File

@ -101,8 +101,8 @@
#include "virt.h" #include "virt.h"
#include "watchdog.h" #include "watchdog.h"
#define NOTIFY_RCVBUF_SIZE (8*1024*1024) /* Make sure clients notifying us don't block */
#define CGROUPS_AGENT_RCVBUF_SIZE (8*1024*1024) #define MANAGER_SOCKET_RCVBUF_SIZE (8*U64_MB)
/* Initial delay and the interval for printing status messages about running jobs */ /* Initial delay and the interval for printing status messages about running jobs */
#define JOBS_IN_PROGRESS_WAIT_USEC (2*USEC_PER_SEC) #define JOBS_IN_PROGRESS_WAIT_USEC (2*USEC_PER_SEC)
@ -1081,7 +1081,7 @@ static int manager_setup_notify(Manager *m) {
if (fd < 0) if (fd < 0)
return log_error_errno(errno, "Failed to allocate notification socket: %m"); return log_error_errno(errno, "Failed to allocate notification socket: %m");
(void) fd_increase_rxbuf(fd, NOTIFY_RCVBUF_SIZE); (void) fd_increase_rxbuf(fd, MANAGER_SOCKET_RCVBUF_SIZE);
m->notify_socket = path_join(m->prefix[EXEC_DIRECTORY_RUNTIME], "systemd/notify"); m->notify_socket = path_join(m->prefix[EXEC_DIRECTORY_RUNTIME], "systemd/notify");
if (!m->notify_socket) if (!m->notify_socket)
@ -1174,7 +1174,7 @@ static int manager_setup_cgroups_agent(Manager *m) {
if (fd < 0) if (fd < 0)
return log_error_errno(errno, "Failed to allocate cgroups agent socket: %m"); return log_error_errno(errno, "Failed to allocate cgroups agent socket: %m");
fd_increase_rxbuf(fd, CGROUPS_AGENT_RCVBUF_SIZE); (void) fd_increase_rxbuf(fd, MANAGER_SOCKET_RCVBUF_SIZE);
(void) sockaddr_un_unlink(&sa.un); (void) sockaddr_un_unlink(&sa.un);
@ -1238,7 +1238,7 @@ static int manager_setup_user_lookup_fd(Manager *m) {
if (socketpair(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0, m->user_lookup_fds) < 0) if (socketpair(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0, m->user_lookup_fds) < 0)
return log_error_errno(errno, "Failed to allocate user lookup socket: %m"); return log_error_errno(errno, "Failed to allocate user lookup socket: %m");
(void) fd_increase_rxbuf(m->user_lookup_fds[0], NOTIFY_RCVBUF_SIZE); (void) fd_increase_rxbuf(m->user_lookup_fds[0], MANAGER_SOCKET_RCVBUF_SIZE);
} }
if (!m->user_lookup_event_source) { if (!m->user_lookup_event_source) {
@ -1274,7 +1274,7 @@ static int manager_setup_handoff_timestamp_fd(Manager *m) {
return log_error_errno(errno, "Failed to allocate handoff timestamp socket: %m"); return log_error_errno(errno, "Failed to allocate handoff timestamp socket: %m");
/* Make sure children never have to block */ /* Make sure children never have to block */
(void) fd_increase_rxbuf(m->handoff_timestamp_fds[0], NOTIFY_RCVBUF_SIZE); (void) fd_increase_rxbuf(m->handoff_timestamp_fds[0], MANAGER_SOCKET_RCVBUF_SIZE);
r = setsockopt_int(m->handoff_timestamp_fds[0], SOL_SOCKET, SO_PASSCRED, true); r = setsockopt_int(m->handoff_timestamp_fds[0], SOL_SOCKET, SO_PASSCRED, true);
if (r < 0) if (r < 0)
@ -3707,21 +3707,14 @@ int manager_reload(Manager *m) {
manager_clear_jobs_and_units(m); manager_clear_jobs_and_units(m);
lookup_paths_flush_generator(&m->lookup_paths); lookup_paths_flush_generator(&m->lookup_paths);
lookup_paths_done(&m->lookup_paths);
exec_shared_runtime_vacuum(m); exec_shared_runtime_vacuum(m);
dynamic_user_vacuum(m, false); dynamic_user_vacuum(m, false);
m->uid_refs = hashmap_free(m->uid_refs); m->uid_refs = hashmap_free(m->uid_refs);
m->gid_refs = hashmap_free(m->gid_refs); m->gid_refs = hashmap_free(m->gid_refs);
r = lookup_paths_init_or_warn(&m->lookup_paths, m->runtime_scope, 0, NULL);
if (r < 0)
return r;
(void) manager_run_environment_generators(m); (void) manager_run_environment_generators(m);
(void) manager_run_generators(m); (void) manager_run_generators(m);
lookup_paths_log(&m->lookup_paths);
/* We flushed out generated files, for which we don't watch mtime, so we should flush the old map. */ /* We flushed out generated files, for which we don't watch mtime, so we should flush the old map. */
manager_free_unit_name_maps(m); manager_free_unit_name_maps(m);
m->unit_file_state_outdated = false; m->unit_file_state_outdated = false;

2
src/varlinkctl/varlinkctl.c
View File

@ -247,7 +247,7 @@ static int varlink_connect_auto(sd_varlink **ret, const char *where) {
if (arg_timeout != 0) { if (arg_timeout != 0) {
r = sd_varlink_set_relative_timeout(vl, arg_timeout); r = sd_varlink_set_relative_timeout(vl, arg_timeout);
if (r < 0) if (r < 0)
log_error_errno(r, "Failed to set Varlink timeout: %m"); log_warning_errno(r, "Failed to set Varlink timeout, ignoring: %m");
} }
*ret = TAKE_PTR(vl); *ret = TAKE_PTR(vl);