r12434: implement database scavenging, the only missing part is the verifying of...

[samba.git] / source / wrepl_server / wrepl_periodic.c

diff --git a/source/wrepl_server/wrepl_periodic.c b/source/wrepl_server/wrepl_periodic.c
index 4ba047d3a00c7413ec0003853546ae4c45ff68f1..09554d1659afa69988ac0621cb7e36129f70cfb8 100644 (file)
--- a/source/wrepl_server/wrepl_periodic.c
+++ b/source/wrepl_server/wrepl_periodic.c
@@ -35,48 +35,90 @@
 #include "libcli/wrepl/winsrepl.h"
 #include "wrepl_server/wrepl_out_helpers.h"
 
-static uint32_t wreplsrv_periodic_run(struct wreplsrv_service *service, uint32_t next_interval)
+static NTSTATUS wreplsrv_periodic_run(struct wreplsrv_service *service)
 {
-       DEBUG(2,("wreplsrv_periodic_run: next in %u secs\n", next_interval));
-       return next_interval;
+       NTSTATUS status;
+
+       status = wreplsrv_scavenging_run(service);
+       NT_STATUS_NOT_OK_RETURN(status);
+
+       status = wreplsrv_out_pull_run(service);
+       NT_STATUS_NOT_OK_RETURN(status);
+
+       status = wreplsrv_out_push_run(service);
+       NT_STATUS_NOT_OK_RETURN(status);
+
+       return NT_STATUS_OK;
 }
 
 static void wreplsrv_periodic_handler_te(struct event_context *ev, struct timed_event *te,
                                         struct timeval t, void *ptr)
 {
        struct wreplsrv_service *service = talloc_get_type(ptr, struct wreplsrv_service);
-       uint32_t next_interval;
+       NTSTATUS status;
 
        service->periodic.te = NULL;
 
-       next_interval = wreplsrv_periodic_run(service, service->config.periodic_interval);
-
-       service->periodic.next_event = timeval_current_ofs(next_interval, 0);
-       service->periodic.te = event_add_timed(service->task->event_ctx, service,
-                                              service->periodic.next_event,
-                                              wreplsrv_periodic_handler_te, service);
-       if (!service->periodic.te) {
-               task_server_terminate(service->task,"event_add_timed() failed! no memory!\n");
+       status = wreplsrv_periodic_schedule(service, service->config.periodic_interval);
+       if (!NT_STATUS_IS_OK(status)) {
+               task_server_terminate(service->task, nt_errstr(status));
                return;
        }
+
+       status = wreplsrv_periodic_run(service);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("wresrv_periodic_run() failed: %s\n", nt_errstr(status)));
+       }
+}
+
+NTSTATUS wreplsrv_periodic_schedule(struct wreplsrv_service *service, uint32_t next_interval)
+{
+       TALLOC_CTX *tmp_mem;
+       struct timed_event *new_te;
+       struct timeval next_time;
+
+       /* prevent looping */
+       if (next_interval == 0) next_interval = 1;
+
+       next_time = timeval_current_ofs(next_interval, 5000);
+
+       if (service->periodic.te) {
+               /*
+                * if the timestamp of the new event is higher,
+                * as current next we don't need to reschedule
+                */
+               if (timeval_compare(&next_time, &service->periodic.next_event) > 0) {
+                       return NT_STATUS_OK;
+               }
+       }
+
+       /* reset the next scheduled timestamp */
+       service->periodic.next_event = next_time;
+
+       new_te = event_add_timed(service->task->event_ctx, service,
+                                service->periodic.next_event,
+                                wreplsrv_periodic_handler_te, service);
+       NT_STATUS_HAVE_NO_MEMORY(new_te);
+
+       tmp_mem = talloc_new(service);
+       DEBUG(4,("wreplsrv_periodic_schedule(%u) %sscheduled for: %s\n",
+               next_interval,
+               (service->periodic.te?"re":""),
+               nt_time_string(tmp_mem, timeval_to_nttime(&next_time))));
+       talloc_free(tmp_mem);
+
+       talloc_free(service->periodic.te);
+       service->periodic.te = new_te;
+
+       return NT_STATUS_OK;
 }
 
 NTSTATUS wreplsrv_setup_periodic(struct wreplsrv_service *service)
 {
        NTSTATUS status;
 
-       /*
-        * TODO: this should go away, and we should do everything
-        *        within the wreplsrv_periodic_run()
-        */
-       status = wreplsrv_setup_out_connections(service);
+       status = wreplsrv_periodic_schedule(service, 0);
        NT_STATUS_NOT_OK_RETURN(status);
 
-       service->periodic.next_event = timeval_current();
-       service->periodic.te = event_add_timed(service->task->event_ctx, service,
-                                              service->periodic.next_event,
-                                              wreplsrv_periodic_handler_te, service);
-       NT_STATUS_HAVE_NO_MEMORY(service->periodic.te);
-
        return NT_STATUS_OK;
 }