#include "fd.h"
#include "exec.h"
#include "daemon.h"
+#include "signal.h"
+#include "df.h"
struct gengetopt_args_info conf;
char *dss_error_txt = NULL;
static FILE *logfile;
+int signal_pipe;
DEFINE_DSS_ERRLIST;
va_end(argp);
}
-__printf_1_2 void msg(const char* fmt,...)
+/**
+ * Print a message either to stdout or to the log file.
+ */
+__printf_1_2 void dss_msg(const char* fmt,...)
{
FILE *outfd = conf.daemon_given? logfile : stdout;
va_list argp;
DSS_DEBUG_LOG("Waiting for process %d to terminate\n", (int)pid);
for (;;) {
- ret = waitpid(pid, status, 0);
- if (ret >= 0 || errno != EINTR)
+ pause();
+ ret = next_signal();
+ if (ret < 0)
break;
+ if (!ret)
+ continue;
+ if (ret == SIGCHLD) {
+ ret = waitpid(pid, status, 0);
+ if (ret >= 0)
+ break;
+ if (errno != EINTR) /* error */
+ break;
+ }
+ DSS_WARNING_LOG("sending SIGTERM to pid %d\n", (int)pid);
+ kill(pid, SIGTERM);
}
if (ret < 0) {
ret = -ERRNO_TO_DSS_ERROR(errno);
return ret;
}
-int remove_redundant_snapshot(struct snapshot_list *sl,
- int dry_run, pid_t *pid)
+int remove_redundant_snapshot(struct snapshot_list *sl, pid_t *pid)
{
int ret, i, interval;
struct snapshot *s;
prev = s;
}
assert(victim);
- if (dry_run) {
- msg("%s would be removed (interval = %i)\n",
+ if (conf.dry_run_given) {
+ dss_msg("%s would be removed (interval = %i)\n",
victim->name, victim->interval);
continue;
}
return 0;
}
-int remove_old_snapshot(struct snapshot_list *sl, int dry_run, pid_t *pid)
+int remove_old_snapshot(struct snapshot_list *sl, pid_t *pid)
{
int i, ret;
struct snapshot *s;
FOR_EACH_SNAPSHOT(s, i, sl) {
if (s->interval <= conf.num_intervals_arg)
continue;
- if (dry_run) {
- msg("%s would be removed (interval = %i)\n",
+ if (conf.dry_run_given) {
+ dss_msg("%s would be removed (interval = %i)\n",
s->name, s->interval);
continue;
}
int com_run(void)
{
+ int ret;
+
+ if (conf.dry_run_given) {
+ make_err_msg("dry_run not supported by this command");
+ return -E_SYNTAX;
+ }
+ ret = install_sighandler(SIGHUP);
+ if (ret < 0)
+ return ret;
return 42;
}
+void log_disk_space(struct disk_space *ds)
+{
+ DSS_INFO_LOG("free: %uM/%uM (%u%%), %u%% inodes unused\n",
+ ds->free_mb, ds->total_mb, ds->percent_free,
+ ds->percent_free_inodes);
+}
+
int com_prune(void)
{
- int ret, dry_run = 0;
+ int ret;
struct snapshot_list sl;
pid_t pid;
+ struct disk_space ds;
+ ret = get_disk_space(".", &ds);
+ if (ret < 0)
+ return ret;
+ log_disk_space(&ds);
for (;;) {
get_snapshot_list(&sl);
- ret = remove_old_snapshot(&sl, dry_run, &pid);
+ ret = remove_old_snapshot(&sl, &pid);
free_snapshot_list(&sl);
if (ret < 0)
return ret;
}
for (;;) {
get_snapshot_list(&sl);
- ret = remove_redundant_snapshot(&sl, dry_run, &pid);
+ ret = remove_redundant_snapshot(&sl, &pid);
free_snapshot_list(&sl);
if (ret < 0)
return ret;
pid_t pid;
create_rsync_argv(&rsync_argv, &snapshot_num);
+ if (conf.dry_run_given) {
+ int i;
+ char *msg = NULL;
+ for (i = 0; rsync_argv[i]; i++) {
+ char *tmp = msg;
+ msg = make_message("%s%s%s", tmp? tmp : "",
+ tmp? " " : "", rsync_argv[i]);
+ free(tmp);
+ }
+ dss_msg("%s\n", msg);
+ free(msg);
+ return 1;
+ }
DSS_NOTICE_LOG("creating snapshot %lli\n", (long long)snapshot_num);
ret = create_snapshot(rsync_argv, &pid);
if (ret < 0)
struct snapshot *s;
get_snapshot_list(&sl);
FOR_EACH_SNAPSHOT(s, i, &sl)
- msg("%u\t%s\n", s->interval, s->name);
+ dss_msg("%u\t%s\n", s->interval, s->name);
free_snapshot_list(&sl);
return 1;
}
return 1;
}
+static void setup_signal_handling(void)
+{
+ int ret;
+
+ DSS_NOTICE_LOG("setting up signal handlers\n");
+ signal_pipe = signal_init(); /* always successful */
+ ret = install_sighandler(SIGINT);
+ if (ret < 0)
+ goto err;
+ ret = install_sighandler(SIGTERM);
+ if (ret < 0)
+ goto err;
+ ret = install_sighandler(SIGCHLD);
+ if (ret < 0)
+ goto err;
+ return;
+err:
+ DSS_EMERG_LOG("could not install signal handlers\n");
+ exit(EXIT_FAILURE);
+}
+
+
int main(int argc, char **argv)
{
int ret;
logfile = open_log(conf.logfile_arg);
log_welcome(conf.loglevel_arg);
}
- if (conf.daemon_given)
- daemon_init();
ret = dss_chdir(conf.dest_dir_arg);
if (ret < 0)
goto out;
+ if (conf.daemon_given)
+ daemon_init();
+ setup_signal_handling();
ret = call_command_handler();
out:
if (ret < 0)