Merge lp:~brianaker/gearmand/1196552 into lp:gearmand

[Brian Aker]

=== modified file 'libgearman-server/gearmand_con.cc'
--- libgearman-server/gearmand_con.cc	2013-07-22 21:18:42 +0000
+++ libgearman-server/gearmand_con.cc	2013-08-11 02:45:20 +0000
@@ -44,6 +44,7 @@
 #include "gear_config.h"
 #include "libgearman-server/common.h"
 #include <libgearman-server/gearmand.h>
+#include <libgearman-server/queue.h>
 #include <cstring>
 
 #include <cerrno>
@@ -253,10 +254,11 @@
   return NULL;
 }
 
-bool gearman_server_job_cancel(gearman_server_st& server,
-                               const char *job_handle,
-                               const size_t job_handle_length)
+gearmand_error_t gearman_server_job_cancel(gearman_server_st& server,
+                                           const char *job_handle,
+                                           const size_t job_handle_length)
 {
+  gearmand_error_t ret= GEARMAND_NO_JOBS;
   uint32_t key= _server_job_hash(job_handle, job_handle_length);
 
   gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM, "cancel: %.*s", int(job_handle_length), job_handle);
@@ -268,14 +270,44 @@
     if (server_job->job_handle_key == key and
         strncmp(server_job->job_handle, job_handle, GEARMAND_JOB_HANDLE_SIZE) == 0)
     {
+      /* Queue the fail packet for all clients. */
+      for (gearman_server_client_st* client= server_job->client_list; client != NULL; client= client->job_next)
+      {
+        ret= gearman_server_io_packet_add(client->con, false,
+                                          GEARMAN_MAGIC_RESPONSE,
+                                          GEARMAN_COMMAND_WORK_FAIL,
+                                          server_job->job_handle,
+                                          (size_t)strlen(server_job->job_handle),
+                                          NULL);
+        if (gearmand_failed(ret))
+        {
+          gearmand_log_gerror_warn(GEARMAN_DEFAULT_LOG_PARAM, ret, "Failed to send WORK_FAIL packet to %s:%s", client->con->host(), client->con->port());
+        }
+      }
+
+      /* Remove from persistent queue if one exists. */
+      if (server_job->job_queued)
+      {
+        ret= gearman_queue_done(Server,
+                                server_job->unique,
+                                server_job->unique_length,
+                                server_job->function->function_name,
+                                server_job->function->function_name_size);
+        if (gearmand_failed(ret))
+        {
+          gearmand_gerror("Remove from persistent queue", ret);
+          return ret;
+        }
+      }
+
       server_job->ignore_job= true;
       server_job->job_queued= false;
 
-      return true;
+      return GEARMAND_SUCCESS;
     }
   }
 
-  return false;
+  return ret;
 }
 
 gearman_server_job_st * gearman_server_job_peek(gearman_server_con_st *server_con)

=== modified file 'libgearman-server/gearmand_con.h'
--- libgearman-server/gearmand_con.h	2013-07-07 00:16:26 +0000
+++ libgearman-server/gearmand_con.h	2013-08-11 02:45:20 +0000
@@ -78,9 +78,10 @@
                                      const char *host, const char*,
                                      struct gearmand_port_st*);
 
-bool gearman_server_job_cancel(gearman_server_st& server,
-                               const char *job_handle,
-                               const size_t job_handle_length);
+GEARMAN_API
+gearmand_error_t gearman_server_job_cancel(gearman_server_st& server,
+                                           const char *job_handle,
+                                           const size_t job_handle_length);
 
 /**
  * Free resources used by a connection.

=== modified file 'libgearman-server/job.cc'
--- libgearman-server/job.cc	2013-08-07 22:23:36 +0000
+++ libgearman-server/job.cc	2013-08-11 02:45:20 +0000
@@ -403,8 +403,7 @@
                                                            GEARMAN_COMMAND_NOOP, NULL);
         if (gearmand_failed(ret))
         {
-          gearmand_gerror("gearman_server_io_packet_add", ret);
-          return ret;
+          gearmand_log_gerror_warn(GEARMAN_DEFAULT_LOG_PARAM, ret, "Failed to send NOOP packet to %s:%s", worker->con->host(), worker->con->port());
         }
 
         worker->con->is_noop_sent= true;

=== modified file 'libgearman-server/text.cc'
--- libgearman-server/text.cc	2013-07-22 21:18:42 +0000
+++ libgearman-server/text.cc	2013-08-11 02:45:20 +0000
@@ -144,10 +144,16 @@
     if (packet->argc == 3
         and strcasecmp("job", (char *)(packet->arg[1])) == 0)
     {
-      if (gearman_server_job_cancel(Gearmand()->server, packet->arg[2], strlen(packet->arg[2])))
+      gearmand_error_t ret= gearman_server_job_cancel(Gearmand()->server, packet->arg[2], strlen(packet->arg[2]));
+
+      if (ret == GEARMAND_SUCCESS)
       {
         data.vec_printf(TEXT_SUCCESS);
       }
+      else if (ret != GEARMAND_NO_JOBS)
+      {
+        data.vec_printf(TEXT_ERROR_INTERNAL_ERROR);
+      }
       else
       {
         data.vec_printf(TEXT_ERROR_UNKNOWN_JOB);

=== modified file 'libtest/client.hpp'
--- libtest/client.hpp	2013-08-07 22:23:36 +0000
+++ libtest/client.hpp	2013-08-11 02:45:20 +0000
@@ -38,6 +38,10 @@
 
 #include "libgearman/ssl.h"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpragmas"
+#pragma GCC diagnostic ignored "-Wunused-private-field"
+
 namespace libtest {
 
 class SimpleClient {
@@ -107,3 +111,4 @@
 };
 
 } // namespace libtest
+#pragma GCC diagnostic pop

=== modified file 'util/instance.hpp'
--- util/instance.hpp	2013-08-07 22:23:36 +0000
+++ util/instance.hpp	2013-08-11 02:45:20 +0000
@@ -52,6 +52,10 @@
 
 struct addrinfo;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpragmas"
+#pragma GCC diagnostic ignored "-Wunused-private-field"
+
 namespace datadifferential {
 namespace util {
 
@@ -163,3 +167,5 @@
 
 } /* namespace util */
 } /* namespace datadifferential */
+
+#pragma GCC diagnostic pop