rage-iodine 3.0.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af7a9d60835bf9e95bf426fd9adf7fd2375af632dd39bb35d57a83f2441d8318
-  data.tar.gz: d13e31e81ca1a8764252d8dbf1fca4aed45bc291e661e5f5c322bdb8a0551089
+  metadata.gz: ef4ff042834d322d1a1eba37963ac373146345da2f167b75b421dbf6449f4060
+  data.tar.gz: 8ca3321bfd60e376ecb10017b118295f82d1ddf9897869f84aefad13909f3dfc
 SHA512:
-  metadata.gz: 65287e0a103dacf4b4b52dbb493e2cd42ffe6b23b47e5a1b022c9b1b21601128517663ed9c7de61f4350587865c27d4af7a25d27ee170164c06040d0026cd8b7
-  data.tar.gz: 75f0102920b0b8f090998f7bafe210ee0918b583ce35595e1a17e1b3c43577bbce9d531e0fd829dfad193c26c3a032db03c1b5d1bd298213ee6f244def4637a2
+  metadata.gz: e55be44f50f6a779d9d1457a61dcc9c005055a52c1560dde62fb84d73226b78084a431571af0d3fb24388100236fd39dac0c624a73fab624e0529a20286d0500
+  data.tar.gz: 74e9602b4822a05b2b25f87a0685ed8311afc79dd7e266b1e032906d18e15f0ba186870ea3617682c3939bdd2155e64759193504d8b83d4942ddabe3669c50bb

data/CHANGELOG.md

@@ -6,6 +6,14 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ## Changes:
 
+#### Change log v.3.1.0 (2024-05-01)
+
+**Update**: Implement graceful shutdown.
+
+#### Change log v.3.0.8 (2024-04-12)
+
+**Fix**: Correctly generate request tags in cluster mode.
+
 #### Change log v.3.0.7 (2024-04-10)
 
 **Fix**: Fix excessive CPU usage when using `run_every` on kqueue systems.

data/ext/iodine/fio.c

@@ -386,6 +386,8 @@ typedef struct {
   uint32_t capa;
   /* connections counted towards shutdown (NOT while running) */
   uint32_t connection_count;
+  /* number of currently paused connections */
+  uint32_t async_connection_count;
   /* thread list */
   fio_ls_s thread_ids;
   /* active workers */
@@ -1294,6 +1296,18 @@ static void fio_defer_on_fork(void) {
 #endif
 }
 
+void fio_graceful_stop(void) {
+  static uint8_t stop_requested;
+
+  if (!fio_data->async_connection_count) {
+    fio_stop();
+  } else if (!stop_requested) {
+    stop_requested = 1;
+    FIO_LOG_INFO("(%d) Waiting for up to 15 seconds to allow active requests to finish...", (int)getpid());
+    fio_run_every(500, 30, (void (*)(void *))fio_graceful_stop, NULL, (void (*)(void *))fio_stop);
+  }
+}
+
 /* *****************************************************************************
 External Task API
 ***************************************************************************** */
@@ -1695,7 +1709,12 @@ static void sig_int_handler(int sig) {
 #else
       old = &fio_old_sig_term;
 #endif
-    fio_stop();
+    if (fio_data->is_worker) {
+      FIO_LOG_INFO("(%d) detected exit signal.", (int)getpid());
+    } else {
+      FIO_LOG_INFO("Server Detected exit signal.");
+    }
+    fio_graceful_stop();
     break;
 #ifndef __MINGW32__
   case SIGPIPE:
@@ -2788,6 +2807,16 @@ void fio_suspend(intptr_t uuid) {
     fio_trylock(&uuid_data(uuid).scheduled);
 }
 
+void fio_pause(intptr_t uuid) {
+  fio_atomic_add(&fio_data->async_connection_count, 1);
+  fio_suspend(uuid);
+}
+
+void fio_resume(intptr_t uuid) {
+  fio_atomic_sub(&fio_data->async_connection_count, 1);
+  fio_force_event(uuid, FIO_EVENT_ON_DATA);
+}
+
 /* *****************************************************************************
 Section Start Marker
 
@@ -4641,6 +4670,9 @@ static void fio_worker_startup(void) {
     fio_state_callback_clear(FIO_CALL_ON_START);
   }
 
+  /* used in `gen_request_tag` */
+  srand(time(0) + (getpid() << 8));
+
   if (fio_data->workers == 1) {
     /* Single Process - the root is also a worker */
     fio_data->is_worker = 1;
@@ -4669,10 +4701,6 @@ static void fio_worker_startup(void) {
 /* performs all clean-up / shutdown requirements except for the exit sequence */
 static void fio_worker_cleanup(void) {
   /* switch to winding down */
-  if (fio_data->is_worker)
-    FIO_LOG_INFO("(%d) detected exit signal.", (int)getpid());
-  else
-    FIO_LOG_INFO("Server Detected exit signal.");
   fio_state_callback_force(FIO_CALL_ON_SHUTDOWN);
   for (size_t i = 0; i <= fio_data->max_protocol_fd; ++i) {
     if (fd_data(i).protocol) {
@@ -7208,7 +7236,7 @@ static void fio_cluster_client_handler(struct cluster_pr_s *pr) {
     fio_publish2process(fio_msg_internal_dup(pr->msg));
     break;
   case FIO_CLUSTER_MSG_SHUTDOWN:
-    fio_stop();
+    fio_graceful_stop();
   case FIO_CLUSTER_MSG_ERROR:         /* fallthrough */
   case FIO_CLUSTER_MSG_PING:          /* fallthrough */
   case FIO_CLUSTER_MSG_ROOT:          /* fallthrough */

data/ext/iodine/fio.h

@@ -707,6 +707,18 @@ void fio_force_event(intptr_t uuid, enum fio_io_event);
  */
 void fio_suspend(intptr_t uuid);
 
+/**
+ * Temporarily prevents `on_data` events from firing and increases the number
+ * of currently active connections.
+ */
+void fio_pause(intptr_t uuid);
+
+/**
+ * Schedules the `on_data` event and decreases the number of currently active
+ * connections.
+ */
+void fio_resume(intptr_t uuid);
+
 /* *****************************************************************************
 Listening to Incoming Connections
 ***************************************************************************** */

data/ext/iodine/http1.c

@@ -251,7 +251,7 @@ static int http1_push_file(http_s *h, FIOBJ filename, FIOBJ mime_type) {
  */
 static void http1_on_pause(http_s *h, http_fio_protocol_s *pr) {
   ((http1pr_s *)pr)->stop = 1;
-  fio_suspend(pr->uuid);
+  fio_pause(pr->uuid);
   (void)h;
 }
 
@@ -260,7 +260,7 @@ static void http1_on_pause(http_s *h, http_fio_protocol_s *pr) {
  */
 static void http1_on_resume(http_s *h, http_fio_protocol_s *pr) {
   if (!((http1pr_s *)pr)->stop) {
-    fio_force_event(pr->uuid, FIO_EVENT_ON_DATA);
+    fio_resume(pr->uuid);
   }
   (void)h;
 }

data/ext/iodine/iodine_helpers.c

@@ -563,6 +563,4 @@ include non-patched methods as well.
   rb_define_singleton_method(tmp, "rfc2109", iodine_rfc2109, 1);
   rb_define_singleton_method(tmp, "rfc2822", iodine_rfc2822, 1);
   // rb_define_module_function(IodineUtils, "time2str", date_str, -1);
-
-  srand(time(0));
 }

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '3.0.7'.freeze
+  VERSION = '3.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rage-iodine
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.1.0
 platform: ruby
 authors:
 - Boaz Segev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-10 00:00:00.000000000 Z
+date: 2024-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake