Rename hook_status enum.

We'd like to use only one set of states for both creation/removal.

diff --git a/dss.c b/dss.c
index 6dbe11f6ba7e5fd3541a0364228b6fc81562b793..12ad11cfdfc22e9707cb340a291785bfbfc2bf87 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -53,9 +53,9 @@ static int64_t current_snapshot_creation_time;
 /** Needed by the post-create hook. */
 static char *path_to_last_complete_snapshot;
 /** \sa \ref snap.h for details. */
 /** Needed by the post-create hook. */
 static char *path_to_last_complete_snapshot;
 /** \sa \ref snap.h for details. */

-static unsigned snapshot_creation_status;
+enum hook_status snapshot_creation_status;

 /** \sa \ref snap.h for details. */
 /** \sa \ref snap.h for details. */

-static unsigned snapshot_removal_status;
+enum hook_status snapshot_removal_status;

 
 
 DEFINE_DSS_ERRLIST;
 
 
 DEFINE_DSS_ERRLIST;


@@ -157,7 +157,7 @@ static void compute_next_snapshot_time(void)
        struct snapshot *s = NULL;
        struct snapshot_list sl;
 
        struct snapshot *s = NULL;
        struct snapshot_list sl;
 

-       assert(snapshot_creation_status == SCS_READY);
+       assert(snapshot_creation_status == HS_READY);

        current_snapshot_creation_time = 0;
        dss_get_snapshot_list(&sl);
        FOR_EACH_SNAPSHOT(s, i, &sl) {
        current_snapshot_creation_time = 0;
        dss_get_snapshot_list(&sl);
        FOR_EACH_SNAPSHOT(s, i, &sl) {


@@ -366,7 +366,7 @@ static int pre_create_hook(void)
        int ret, fds[3] = {0, 0, 0};
 
        if (!conf.pre_create_hook_given) {
        int ret, fds[3] = {0, 0, 0};
 
        if (!conf.pre_create_hook_given) {

-               snapshot_creation_status = SCS_PRE_HOOK_SUCCESS;
+               snapshot_creation_status = HS_PRE_SUCCESS;

                return 0;
        }
        DSS_DEBUG_LOG("executing %s\n", conf.pre_create_hook_arg);
                return 0;
        }
        DSS_DEBUG_LOG("executing %s\n", conf.pre_create_hook_arg);


@@ -374,7 +374,7 @@ static int pre_create_hook(void)
                conf.pre_create_hook_arg, fds);
        if (ret < 0)
                return ret;
                conf.pre_create_hook_arg, fds);
        if (ret < 0)
                return ret;

-       snapshot_creation_status = SCS_PRE_HOOK_RUNNING;
+       snapshot_creation_status = HS_PRE_RUNNING;

        return ret;
 }
 
        return ret;
 }
 


@@ -384,7 +384,7 @@ static int post_create_hook(void)
        char *cmd;
 
        if (!conf.post_create_hook_given) {
        char *cmd;
 
        if (!conf.post_create_hook_given) {

-               snapshot_creation_status = SCS_READY;
+               snapshot_creation_status = HS_READY;

                compute_next_snapshot_time();
                return 0;
        }
                compute_next_snapshot_time();
                return 0;
        }


@@ -395,7 +395,7 @@ static int post_create_hook(void)
        free(cmd);
        if (ret < 0)
                return ret;
        free(cmd);
        if (ret < 0)
                return ret;

-       snapshot_creation_status = SCS_POST_HOOK_RUNNING;
+       snapshot_creation_status = HS_POST_RUNNING;

        return ret;
 }
 
        return ret;
 }
 


@@ -500,7 +500,7 @@ static int handle_rsync_exit(int status)
        if (!WIFEXITED(status)) {
                DSS_ERROR_LOG("rsync process %d died involuntary\n", (int)create_pid);
                ret = -E_INVOLUNTARY_EXIT;
        if (!WIFEXITED(status)) {
                DSS_ERROR_LOG("rsync process %d died involuntary\n", (int)create_pid);
                ret = -E_INVOLUNTARY_EXIT;

-               snapshot_creation_status = SCS_READY;
+               snapshot_creation_status = HS_READY;

                compute_next_snapshot_time();
                goto out;
        }
                compute_next_snapshot_time();
                goto out;
        }


@@ -508,7 +508,7 @@ static int handle_rsync_exit(int status)
        if (es == 13) { /* Errors with program diagnostics */
                DSS_WARNING_LOG("rsync process %d returned %d -- restarting\n",
                        (int)create_pid, es);
        if (es == 13) { /* Errors with program diagnostics */
                DSS_WARNING_LOG("rsync process %d returned %d -- restarting\n",
                        (int)create_pid, es);

-               snapshot_creation_status = SCS_RSYNC_NEEDS_RESTART;
+               snapshot_creation_status = HS_NEEDS_RESTART;

                gettimeofday(&next_snapshot_time, NULL);
                next_snapshot_time.tv_sec += 60;
                ret = 1;
                gettimeofday(&next_snapshot_time, NULL);
                next_snapshot_time.tv_sec += 60;
                ret = 1;


@@ -517,14 +517,14 @@ static int handle_rsync_exit(int status)
        if (es != 0 && es != 23 && es != 24) {
                DSS_ERROR_LOG("rsync process %d returned %d\n", (int)create_pid, es);
                ret = -E_BAD_EXIT_CODE;
        if (es != 0 && es != 23 && es != 24) {
                DSS_ERROR_LOG("rsync process %d returned %d\n", (int)create_pid, es);
                ret = -E_BAD_EXIT_CODE;

-               snapshot_creation_status = SCS_READY;
+               snapshot_creation_status = HS_READY;

                compute_next_snapshot_time();
                goto out;
        }
        ret = rename_incomplete_snapshot(current_snapshot_creation_time);
        if (ret < 0)
                goto out;
                compute_next_snapshot_time();
                goto out;
        }
        ret = rename_incomplete_snapshot(current_snapshot_creation_time);
        if (ret < 0)
                goto out;

-       snapshot_creation_status = SCS_RSYNC_SUCCESS;
+       snapshot_creation_status = HS_SUCCESS;

 out:
        create_pid = 0;
        create_process_stopped = 0;
 out:
        create_pid = 0;
        create_process_stopped = 0;


@@ -537,7 +537,7 @@ static int handle_pre_create_hook_exit(int status)
        static int warn_count;
 
        if (!WIFEXITED(status)) {
        static int warn_count;
 
        if (!WIFEXITED(status)) {

-               snapshot_creation_status = SCS_READY;
+               snapshot_creation_status = HS_READY;

                compute_next_snapshot_time();
                ret = -E_INVOLUNTARY_EXIT;
                goto out;
                compute_next_snapshot_time();
                ret = -E_INVOLUNTARY_EXIT;
                goto out;


@@ -550,13 +550,13 @@ static int handle_pre_create_hook_exit(int status)
                        DSS_NOTICE_LOG("deferring snapshot creation...\n");
                        warn_count = 60; /* warn only once per hour */
                }
                        DSS_NOTICE_LOG("deferring snapshot creation...\n");
                        warn_count = 60; /* warn only once per hour */
                }

-               snapshot_creation_status = SCS_READY;
+               snapshot_creation_status = HS_READY;

                compute_next_snapshot_time();
                ret = 0;
                goto out;
        }
        warn_count = 0;
                compute_next_snapshot_time();
                ret = 0;
                goto out;
        }
        warn_count = 0;

-       snapshot_creation_status = SCS_PRE_HOOK_SUCCESS;
+       snapshot_creation_status = HS_PRE_SUCCESS;

        ret = 1;
 out:
        create_pid = 0;
        ret = 1;
 out:
        create_pid = 0;


@@ -573,12 +573,12 @@ static int handle_sigchld(void)
 
        if (pid == create_pid) {
                switch (snapshot_creation_status) {
 
        if (pid == create_pid) {
                switch (snapshot_creation_status) {

-               case SCS_PRE_HOOK_RUNNING:
+               case HS_PRE_RUNNING:

                        return handle_pre_create_hook_exit(status);
                        return handle_pre_create_hook_exit(status);

-               case SCS_RSYNC_RUNNING:
+               case HS_RUNNING:

                        return handle_rsync_exit(status);
                        return handle_rsync_exit(status);

-               case SCS_POST_HOOK_RUNNING:
-                       snapshot_creation_status = SCS_READY;
+               case HS_POST_RUNNING:
+                       snapshot_creation_status = HS_READY;

                        compute_next_snapshot_time();
                        return 1;
                default:
                        compute_next_snapshot_time();
                        return 1;
                default:


@@ -801,7 +801,7 @@ static int create_snapshot(char **argv)
        ret = dss_exec(&create_pid, argv[0], argv, fds);
        if (ret < 0)
                return ret;
        ret = dss_exec(&create_pid, argv[0], argv, fds);
        if (ret < 0)
                return ret;

-       snapshot_creation_status = SCS_RSYNC_RUNNING;
+       snapshot_creation_status = HS_RUNNING;

        return ret;
 }
 
        return ret;
 }
 


@@ -853,33 +853,33 @@ static int select_loop(void)
                if (tv_diff(&next_snapshot_time, &now, NULL) > 0)
                        continue;
                switch (snapshot_creation_status) {
                if (tv_diff(&next_snapshot_time, &now, NULL) > 0)
                        continue;
                switch (snapshot_creation_status) {

-               case SCS_READY:
+               case HS_READY:

                        ret = pre_create_hook();
                        if (ret < 0)
                                goto out;
                        continue;
                        ret = pre_create_hook();
                        if (ret < 0)
                                goto out;
                        continue;

-               case SCS_PRE_HOOK_RUNNING:
+               case HS_PRE_RUNNING:

                        continue;
                        continue;

-               case SCS_RSYNC_NEEDS_RESTART:
+               case HS_NEEDS_RESTART:

                        ret = create_snapshot(rsync_argv);
                        if (ret < 0)
                                goto out;
                        continue;
                        ret = create_snapshot(rsync_argv);
                        if (ret < 0)
                                goto out;
                        continue;

-               case SCS_PRE_HOOK_SUCCESS:
+               case HS_PRE_SUCCESS:

                        free_rsync_argv(rsync_argv);
                        create_rsync_argv(&rsync_argv, &current_snapshot_creation_time);
                        ret = create_snapshot(rsync_argv);
                        if (ret < 0)
                                goto out;
                        continue;
                        free_rsync_argv(rsync_argv);
                        create_rsync_argv(&rsync_argv, &current_snapshot_creation_time);
                        ret = create_snapshot(rsync_argv);
                        if (ret < 0)
                                goto out;
                        continue;

-               case SCS_RSYNC_RUNNING:
+               case HS_RUNNING:

                        continue;
                        continue;

-               case SCS_RSYNC_SUCCESS:
+               case HS_SUCCESS:

                        ret = post_create_hook();
                        if (ret < 0)
                                goto out;
                        continue;
                        ret = post_create_hook();
                        if (ret < 0)
                                goto out;
                        continue;

-               case SCS_POST_HOOK_RUNNING:
+               case HS_POST_RUNNING:

                        continue;
                }
        }
                        continue;
                }
        }

diff --git a/snap.h b/snap.h
index 7ac951fc313adb9f0867bc90463d4773f215adb9..508bbf9312d9f2a343ac2af265799677a372c6a0 100644 (file)
--- a/snap.h
+++ b/snap.h
@@ -4,36 +4,22 @@
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 

-/** The state of snapshot creation. */
-enum {
+/** The possible states for snapshot creation/removal. */
+enum hook_status {

        /** We are ready to take the next snapshot. */
        /** We are ready to take the next snapshot. */

-       SCS_READY,
-       /** The pre-creation hook has been started. */
-       SCS_PRE_HOOK_RUNNING,
-       /** The pre-creation hook exited successfully. */
-       SCS_PRE_HOOK_SUCCESS,
-       /** The rsync process is running. */
-       SCS_RSYNC_RUNNING,
-       /** The rsync process exited successfully. */
-       SCS_RSYNC_SUCCESS,
-       /** The rsync process needs to be restarted. */
-       SCS_RSYNC_NEEDS_RESTART,
-       /** The post-create hook has been started. */
-       SCS_POST_HOOK_RUNNING,
-};
-
-/** The state of snapshot removal. */
-enum {
-       /** No snapshot is currently being removed. */
-       SRS_READY,
-       /** The pre-removal hook has been started. */
-       SRS_PRE_HOOK_RUNNING,
-       /** The pre-remove hook failed, we're waiting to execute it again. */
-       SRS_PRE_HOOK_FAILURE,
-       /** The rm command is currently executing. */
-       SRS_RM_RUNNING,
-       /** The post-remove hook ist running. */
-       SRS_POST_HOOK_RUNNING,
+       HS_READY,
+       /** The pre-create/pre-remove hook has been started. */
+       HS_PRE_RUNNING,
+       /** The pre-create/pre-remove hook exited successfully. */
+       HS_PRE_SUCCESS,
+       /** The rsync/rm process is running. */
+       HS_RUNNING,
+       /** The rsync/rm process exited successfully. */
+       HS_SUCCESS,
+       /** The rsync/rm process needs to be restarted. */
+       HS_NEEDS_RESTART,
+       /** The post-create/post-remove hook has been started. */
+       HS_POST_RUNNING,

 };
 
 /**
 };
 
 /**