X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=mdmon.c;h=5d5ae94e372105f7f4a3c2879b87143b5b38c6df;hb=80bf913592c8ba29d3afa6eb60223a7d04415b4c;hp=c590fb20f8a6ddc52a5236d706932419f0a25c07;hpb=b5c727dc1a55323f02e5f60a50bcecb866dd51ea;p=thirdparty%2Fmdadm.git diff --git a/mdmon.c b/mdmon.c index c590fb20..5d5ae94e 100644 --- a/mdmon.c +++ b/mdmon.c @@ -58,8 +58,11 @@ #include #include #include - +#ifdef USE_PTHREADS +#include +#else #include +#endif #include "mdadm.h" #include "mdmon.h" @@ -71,7 +74,39 @@ int mon_tid, mgr_tid; int sigterm; -int run_child(void *v) +#ifdef USE_PTHREADS +static void *run_child(void *v) +{ + struct supertype *c = v; + + mon_tid = syscall(SYS_gettid); + do_monitor(c); + return 0; +} + +static int clone_monitor(struct supertype *container) +{ + pthread_attr_t attr; + pthread_t thread; + int rc; + + mon_tid = -1; + pthread_attr_init(&attr); + pthread_attr_setstacksize(&attr, 4096); + pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); + rc = pthread_create(&thread, &attr, run_child, container); + if (rc) + return rc; + while (mon_tid == -1) + usleep(10); + pthread_attr_destroy(&attr); + + mgr_tid = syscall(SYS_gettid); + + return mon_tid; +} +#else /* USE_PTHREADS */ +static int run_child(void *v) { struct supertype *c = v; @@ -85,7 +120,7 @@ int __clone2(int (*fn)(void *), int flags, void *arg, ... /* pid_t *pid, struct user_desc *tls, pid_t *ctid */ ); #endif - int clone_monitor(struct supertype *container) +static int clone_monitor(struct supertype *container) { static char stack[4096]; @@ -103,24 +138,19 @@ int __clone2(int (*fn)(void *), return mon_tid; } +#endif /* USE_PTHREADS */ -static struct superswitch *find_metadata_methods(char *vers) -{ - if (strcmp(vers, "ddf") == 0) - return &super_ddf; - if (strcmp(vers, "imsm") == 0) - return &super_imsm; - return NULL; -} - -int make_pidfile(char *devname) +static int make_pidfile(char *devname) { char path[100]; char pid[10]; int fd; int n; - sprintf(path, "%s/%s.pid", pid_dir, devname); + if (mkdir(MDMON_DIR, 0755) < 0 && + errno != EEXIST) + return -errno; + sprintf(path, "%s/%s.pid", MDMON_DIR, devname); fd = open(path, O_RDWR|O_CREAT|O_EXCL, 0600); if (fd < 0) @@ -133,18 +163,6 @@ int make_pidfile(char *devname) return 0; } -int is_container_member(struct mdstat_ent *mdstat, char *container) -{ - if (mdstat->metadata_version == NULL || - strncmp(mdstat->metadata_version, "external:", 9) != 0 || - !is_subarray(mdstat->metadata_version+9) || - strncmp(mdstat->metadata_version+10, container, strlen(container)) != 0 || - mdstat->metadata_version[10+strlen(container)] != '/') - return 0; - - return 1; -} - static void try_kill_monitor(pid_t pid, char *devname, int sock) { char buf[100]; @@ -166,33 +184,40 @@ static void try_kill_monitor(pid_t pid, char *devname, int sock) buf[sizeof(buf)-1] = 0; close(fd); - if (n < 0 || !strstr(buf, "mdmon")) + /* Note that if started with --offroot, the name + * might be "@dmon" + */ + if (n < 0 || !(strstr(buf, "mdmon") || + strstr(buf, "@dmon"))) return; kill(pid, SIGTERM); + if (sock < 0) + return; + /* Wait for monitor to exit by reading from the socket, after * clearing the non-blocking flag */ fl = fcntl(sock, F_GETFL, 0); fl &= ~O_NONBLOCK; fcntl(sock, F_SETFL, fl); - read(sock, buf, 100); + n = read(sock, buf, 100); + /* Ignore result, it is just the wait that + * matters + */ } void remove_pidfile(char *devname) { char buf[100]; - sprintf(buf, "%s/%s.pid", pid_dir, devname); + sprintf(buf, "%s/%s.pid", MDMON_DIR, devname); unlink(buf); - sprintf(buf, "%s/%s.sock", pid_dir, devname); + sprintf(buf, "%s/%s.sock", MDMON_DIR, devname); unlink(buf); - if (strcmp(pid_dir, ALT_RUN) == 0) - /* try to clean up when we are finished with this dir */ - rmdir(pid_dir); } -int make_control_sock(char *devname) +static int make_control_sock(char *devname) { char path[100]; int sfd; @@ -202,7 +227,7 @@ int make_control_sock(char *devname) if (sigterm) return -1; - sprintf(path, "%s/%s.sock", pid_dir, devname); + sprintf(path, "%s/%s.sock", MDMON_DIR, devname); unlink(path); sfd = socket(PF_LOCAL, SOCK_STREAM, 0); if (sfd < 0) @@ -221,12 +246,6 @@ int make_control_sock(char *devname) return sfd; } -int socket_hup_requested; -static void hup(int sig) -{ - socket_hup_requested = 1; -} - static void term(int sig) { sigterm = 1; @@ -250,7 +269,18 @@ static int do_fork(void) void usage(void) { - fprintf(stderr, "Usage: mdmon /device/name/for/container [target_dir]\n"); + fprintf(stderr, +"Usage: mdmon [options] CONTAINER\n" +"\n" +"Options are:\n" +" --help -h : This message\n" +" --all : All devices\n" +" --takeover -t : Takeover container\n" +" --offroot : Set first character of argv[0] to @ to indicate the\n" +" application was launched from initrd/initramfs and\n" +" should not be shutdown by systemd as part of the\n" +" regular shutdown process.\n" +); exit(2); } @@ -262,36 +292,66 @@ int main(int argc, char *argv[]) int devnum; char *devname; int status = 0; - int arg; + int opt; int all = 0; int takeover = 0; - - for (arg = 1; arg < argc; arg++) { - if (strcmp(argv[arg], "--all") == 0 || - strcmp(argv[arg], "/proc/mdstat") == 0) + static struct option options[] = { + {"all", 0, NULL, 'a'}, + {"takeover", 0, NULL, 't'}, + {"help", 0, NULL, 'h'}, + {"offroot", 0, NULL, OffRootOpt}, + {NULL, 0, NULL, 0} + }; + + while ((opt = getopt_long(argc, argv, "tha", options, NULL)) != -1) { + switch (opt) { + case 'a': + container_name = argv[optind-1]; all = 1; - else if (strcmp(argv[arg], "--takeover") == 0) + break; + case 't': takeover = 1; - else if (container_name == NULL) - container_name = argv[arg]; - else + break; + case OffRootOpt: + argv[0][0] = '@'; + break; + case 'h': + default: usage(); + break; + } + } + + if (all == 0 && container_name == NULL) { + if (argv[optind]) + container_name = argv[optind]; } + if (container_name == NULL) + usage(); + + if (argc - optind > 1) + usage(); + + if (strcmp(container_name, "/proc/mdstat") == 0) + all = 1; + if (all) { struct mdstat_ent *mdstat, *e; + int container_len = strlen(container_name); /* launch an mdmon instance for each container found */ mdstat = mdstat_read(0, 0); for (e = mdstat; e; e = e->next) { - if (strncmp(e->metadata_version, "external:", 9) == 0 && + if (e->metadata_version && + strncmp(e->metadata_version, "external:", 9) == 0 && !is_subarray(&e->metadata_version[9])) { devname = devnum2devname(e->devnum); /* update cmdline so this mdmon instance can be * distinguished from others in a call to ps(1) */ - if (strlen(devname) <= strlen(container_name)) { - memset(container_name, 0, strlen(container_name)); + if (strlen(devname) <= (unsigned)container_len) { + memset(container_name, 0, container_len); sprintf(container_name, "%s", devname); } status |= mdmon(devname, e->devnum, 1, @@ -378,11 +438,10 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) } else pfd[0] = pfd[1] = -1; - container = calloc(1, sizeof(*container)); + container = xcalloc(1, sizeof(*container)); container->devnum = devnum; container->devname = devname; container->arrays = NULL; - container->subarray[0] = 0; container->sock = -1; if (!container->devname) { @@ -390,8 +449,7 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) exit(3); } - mdi = sysfs_read(mdfd, container->devnum, - GET_VERSION|GET_LEVEL|GET_DEVS|SKIP_GONE_DEVS); + mdi = sysfs_read(mdfd, container->devnum, GET_VERSION|GET_LEVEL|GET_DEVS); if (!mdi) { fprintf(stderr, "mdmon: failed to load sysfs info for %s\n", @@ -410,16 +468,16 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) exit(3); } - container->ss = find_metadata_methods(mdi->text_version); + container->ss = version_to_superswitch(mdi->text_version); if (container->ss == NULL) { - fprintf(stderr, "mdmon: %s uses unknown metadata: %s\n", + fprintf(stderr, "mdmon: %s uses unsupported metadata: %s\n", devname, mdi->text_version); exit(3); } container->devs = NULL; for (di = mdi->devs; di; di = di->next) { - struct mdinfo *cd = malloc(sizeof(*cd)); + struct mdinfo *cd = xmalloc(sizeof(*cd)); *cd = *di; cd->next = container->devs; container->devs = cd; @@ -431,37 +489,31 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) */ sigemptyset(&set); sigaddset(&set, SIGUSR1); - sigaddset(&set, SIGHUP); - sigaddset(&set, SIGALRM); sigaddset(&set, SIGTERM); sigprocmask(SIG_BLOCK, &set, NULL); act.sa_handler = wake_me; act.sa_flags = 0; sigaction(SIGUSR1, &act, NULL); - sigaction(SIGALRM, &act, NULL); - act.sa_handler = hup; - sigaction(SIGHUP, &act, NULL); act.sa_handler = term; sigaction(SIGTERM, &act, NULL); act.sa_handler = SIG_IGN; sigaction(SIGPIPE, &act, NULL); - if (takeover) { - victim = mdmon_pid(container->devnum); + victim = mdmon_pid(container->devnum); + if (victim >= 0) victim_sock = connect_monitor(container->devname); - } ignore = chdir("/"); - if (victim < 0) { - if (ping_monitor(container->devname) == 0) { + if (!takeover && victim > 0 && victim_sock >= 0) { + if (fping_monitor(victim_sock) == 0) { fprintf(stderr, "mdmon: %s already managed\n", container->devname); exit(3); } - /* if there is a pid file, kill whoever is there just in case */ - victim = mdmon_pid(container->devnum); + close(victim_sock); + victim_sock = -1; } - if (container->ss->load_super(container, mdfd, devname)) { + if (container->ss->load_container(container, mdfd, devname)) { fprintf(stderr, "mdmon: Cannot load metadata for %s\n", devname); exit(3); @@ -470,6 +522,13 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) /* Ok, this is close enough. We can say goodbye to our parent now. */ + if (victim > 0) + remove_pidfile(devname); + if (make_pidfile(devname) < 0) { + exit(3); + } + container->sock = make_control_sock(devname); + status = 0; if (write(pfd[1], &status, sizeof(status)) < 0) fprintf(stderr, "mdmon: failed to notify our parent: %d\n", @@ -484,9 +543,10 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) exit(2); } - if (victim > -1) { + if (victim > 0) { try_kill_monitor(victim, container->devname, victim_sock); - close(victim_sock); + if (victim_sock >= 0) + close(victim_sock); } setsid(); @@ -499,7 +559,45 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) ignore = dup(0); #endif + /* This silliness is to stop the compiler complaining + * that we ignore 'ignore' + */ + if (ignore) + ignore++; + do_manager(container); exit(0); } + +/* Some stub functions so super-* can link with us */ +int child_monitor(int afd, struct mdinfo *sra, struct reshape *reshape, + struct supertype *st, unsigned long blocks, + int *fds, unsigned long long *offsets, + int dests, int *destfd, unsigned long long *destoffsets) +{ + return 0; +} + +int restore_stripes(int *dest, unsigned long long *offsets, + int raid_disks, int chunk_size, int level, int layout, + int source, unsigned long long read_offset, + unsigned long long start, unsigned long long length, + char *src_buf) +{ + return 1; +} + +void abort_reshape(struct mdinfo *sra) +{ + return; +} + +int save_stripes(int *source, unsigned long long *offsets, + int raid_disks, int chunk_size, int level, int layout, + int nwrites, int *dest, + unsigned long long start, unsigned long long length, + char *buf) +{ + return 0; +}