Merge branch 'refs/heads/t/shadow-fix'

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index 08a9f4c5767918c9226b51d721d11dc83de0e07f..a50a3dedd9235274ae380ad6272279ba8ba6ada8 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -303,7 +303,7 @@ static int64_t compute_next_snapshot_time(void)
        int64_t x = 0, now = get_current_time(), unit_interval
                = 24 * 3600 * conf.unit_interval_arg, ret;
        unsigned wanted = desired_number_of_snapshots(0, conf.num_intervals_arg),
-               num_complete_snapshots = 0;
+               num_complete = 0;
        int i;
        struct snapshot *s = NULL;
        struct snapshot_list sl;
@@ -312,15 +312,15 @@ static int64_t compute_next_snapshot_time(void)
        FOR_EACH_SNAPSHOT(s, i, &sl) {
                if (!(s->flags & SS_COMPLETE))
                        continue;
-               num_complete_snapshots++;
+               num_complete++;
                x += s->completion_time - s->creation_time;
        }
        assert(x >= 0);
 
        ret = now;
-       if (num_complete_snapshots == 0)
+       if (num_complete == 0)
                goto out;
-       x /= num_complete_snapshots; /* avg time to create one snapshot */
+       x /= num_complete; /* avg time to create one snapshot */
        if (unit_interval < x * wanted) /* oops, no sleep at all */
                goto out;
        ret = s->completion_time + unit_interval / wanted - x;
@@ -862,6 +862,10 @@ static int handle_rsync_exit(int status)
        if (es != 0 && es != 24) {
                DSS_WARNING_LOG(("rsync exit code %d, error count %d\n",
                        es, ++num_consecutive_rsync_errors));
+               if (conf.create_given) {
+                       ret = -E_BAD_EXIT_CODE;
+                       goto out;
+               }
                if (num_consecutive_rsync_errors > conf.max_rsync_errors_arg) {
                        ret = -E_TOO_MANY_RSYNC_ERRORS;
                        snapshot_creation_status = HS_READY;
@@ -1489,12 +1493,6 @@ static int setup_signal_handling(void)
        return install_sighandler(SIGCHLD);
 }
 
-/**
- * The main function of dss.
- *
- * \param argc Usual argument count.
- * \param argv Usual argument vector.
- */
 int main(int argc, char **argv)
 {
        int ret;