return NULL;
}
-int make_pidfile(char *devname)
+static int make_pidfile(char *devname)
{
char path[100];
char pid[10];
int fd;
int n;
+ if (mkdir(pid_dir, 0600) < 0 &&
+ errno != EEXIST)
+ return -errno;
sprintf(path, "%s/%s.pid", pid_dir, devname);
fd = open(path, O_RDWR|O_CREAT|O_EXCL, 0600);
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)
rmdir(pid_dir);
}
-int make_control_sock(char *devname)
+static int make_control_sock(char *devname)
{
char path[100];
int sfd;
return sfd;
}
-int socket_hup_requested;
-static void hup(int sig)
-{
- socket_hup_requested = 1;
-}
-
static void term(int sig)
{
sigterm = 1;
void usage(void)
{
- fprintf(stderr, "Usage: mdmon /device/name/for/container [target_dir]\n");
+ fprintf(stderr, "Usage: mdmon [--all] [--takeover] CONTAINER\n");
exit(2);
}
int takeover = 0;
for (arg = 1; arg < argc; arg++) {
- if (strcmp(argv[arg], "--all") == 0 ||
- strcmp(argv[arg], "/proc/mdstat") == 0)
+ if (strncmp(argv[arg], "--all",5) == 0 ||
+ strcmp(argv[arg], "/proc/mdstat") == 0) {
+ container_name = argv[arg];
all = 1;
- else if (strcmp(argv[arg], "--takeover") == 0)
+ } else if (strcmp(argv[arg], "--takeover") == 0)
takeover = 1;
else if (container_name == NULL)
container_name = argv[arg];
else
usage();
}
+ if (container_name == NULL)
+ usage();
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);
/* 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) <= container_len) {
+ memset(container_name, 0, container_len);
sprintf(container_name, "%s", devname);
}
status |= mdmon(devname, e->devnum, 1,
*/
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) {
+ pid_dir = VAR_RUN;
+ victim = mdmon_pid(container->devnum);
+ if (victim < 0) {
+ pid_dir = ALT_RUN;
victim = mdmon_pid(container->devnum);
- victim_sock = connect_monitor(container->devname);
}
+ 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);
}
if (container->ss->load_super(container, mdfd, devname)) {
fprintf(stderr, "mdmon: Cannot load metadata for %s\n",
/* Ok, this is close enough. We can say goodbye to our parent now.
*/
+ if (victim > 0)
+ remove_pidfile(devname);
+ pid_dir = VAR_RUN;
+ if (make_pidfile(devname) < 0) {
+ /* Try the alternate */
+ pid_dir = ALT_RUN;
+ if (make_pidfile(devname) < 0) {
+ fprintf(stderr, "mdmon: Neither %s nor %s are writable\n"
+ " cannot create .pid or .sock files. Aborting\n",
+ VAR_RUN, ALT_RUN);
+ 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",
exit(2);
}
- if (victim > -1) {
+ if (victim > 0) {
try_kill_monitor(victim, container->devname, victim_sock);
close(victim_sock);
}