Changeset 989 for vendor/current/ctdb/server/eventscript.c

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/ctdb/server/eventscript.c (modified) (4 diffs)

vendor/current/ctdb/server/eventscript.c

@@ -697 +697 @@
 {
         DLIST_REMOVE(callback->ctdb->script_callbacks, callback);
+        return 0;
+}
+
+struct schedule_callback_state {
+        struct ctdb_context *ctdb;
+        void (*callback)(struct ctdb_context *, int, void *);
+        void *private_data;
+        int status;
+        struct tevent_immediate *im;
+};
+
+static void schedule_callback_handler(struct tevent_context *ctx,
+                                      struct tevent_immediate *im,
+                                      void *private_data)
+{
+        struct schedule_callback_state *state =
+                talloc_get_type_abort(private_data,
+                                      struct schedule_callback_state);
+
+        if (state->callback != NULL) {
+                state->callback(state->ctdb, state->status,
+                                state->private_data);
+        }
+        talloc_free(state);
+}
+
+static int
+schedule_callback_immediate(struct ctdb_context *ctdb,
+                            void (*callback)(struct ctdb_context *,
+                                             int, void *),
+                            void *private_data,
+                            int status)
+{
+        struct schedule_callback_state *state;
+        struct tevent_immediate *im;
+
+        state = talloc_zero(ctdb, struct schedule_callback_state);
+        if (state == NULL) {
+                DEBUG(DEBUG_ERR, (__location__ " out of memory\n"));
+                return -1;
+        }
+        im = tevent_create_immediate(state);
+        if (im == NULL) {
+                DEBUG(DEBUG_ERR, (__location__ " out of memory\n"));
+                talloc_free(state);
+                return -1;
+        }
+
+        state->ctdb = ctdb;
+        state->callback = callback;
+        state->private_data = private_data;
+        state->status = status;
+        state->im = im;
+
+        tevent_schedule_immediate(im, ctdb->ev,
+                                  schedule_callback_handler, state);
         return 0;
 }
@@ -808 +864 @@
         state->child = 0;
 
+        /* Nothing to do? */
+        if (state->scripts->num_scripts == 0) {
+                int ret = schedule_callback_immediate(ctdb, callback,
+                                                      private_data, 0);
+                talloc_free(state);
+                if (ret != 0) {
+                        DEBUG(DEBUG_ERR,
+                              ("Unable to schedule callback for 0 scripts\n"));
+                        return 1;
+                }
+                return 0;
+        }
+
+        state->scripts->scripts[0].status = fork_child_for_script(ctdb, state);
+        if (state->scripts->scripts[0].status != 0) {
+                talloc_free(state);
+                return -1;
+        }
+
         if (call == CTDB_EVENT_MONITOR) {
                 ctdb->current_monitor = state;
         }
 
+        ctdb->active_events++;
+
         talloc_set_destructor(state, event_script_destructor);
-
-        ctdb->active_events++;
-
-        /* Nothing to do? */
-        if (state->scripts->num_scripts == 0) {
-                callback(ctdb, 0, private_data);
-                talloc_free(state);
-                return 0;
-        }
-
-        state->scripts->scripts[0].status = fork_child_for_script(ctdb, state);
-        if (state->scripts->scripts[0].status != 0) {
-                /* Callback is called from destructor, with fail result. */
-                talloc_free(state);
-                return 0;
-        }
 
         if (!timeval_is_zero(&state->timeout)) {
@@ -1008 +1069 @@
         CTDB_NO_MEMORY(ctdb, state);
 
-        state->c = talloc_steal(state, c);
+        state->c = NULL;
 
         DEBUG(DEBUG_NOTICE,("Running eventscripts with arguments %s\n", indata.dptr));
@@ -1024 +1085 @@
         /* tell ctdb_control.c that we will be replying asynchronously */
         *async_reply = true;
-
+        state->c = talloc_steal(state, c);
         return 0;
 }