semian 0.21.3 → 0.22.0.RC.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86eb12415dc2e681f9a24df85bc1b8b6498da3833e50d217bc1e69e2c8696cf0
-  data.tar.gz: c919fbbf5eb02a44ac38c914187215559a794f007f8ea5e33ff91a9ebd13b3f9
+  metadata.gz: afd87705b68966cef884eeeb1d5df4d052eeb86f2ff7d43c9499435795341461
+  data.tar.gz: 911a0772662b81e21dcb475c9b981ceb0fbaeadf26edbbca70ab8adbf5be4068
 SHA512:
-  metadata.gz: 5cebfd79bbaad7b77f17399c745674dd1b850fd8742e5a87af320326bf77273979c2cceec2fef292f6779f6100b088aab22d7aed9be80f46a7b5eadb2c6790c6
-  data.tar.gz: 1d093b46109d85c20ace2570e652608f6cba7cb3d18a79443f9dbca002f479c208d2ab45026355b6637ac0b506c906ea9d0379eaee62fe1f2eff5a14152be5c5
+  metadata.gz: 8edb70d967cb15e12b919b3a7e6585f98848e2d569683d590d2d37e32eb57b65cd9f425931a3bf1575d91fc6c50e9d43901340cb33a34a671a585956b947514f
+  data.tar.gz: b880f4f52891cbc4fd3d97221053bddc741aa72a98b986826b8ca08454c73ccbe714cff311966387f40b83e2f48a6d2db4ddf23407ff275e55bfb8c1730b5673

data/ext/semian/resource.c

@@ -63,6 +63,8 @@ semian_resource_acquire(int argc, VALUE *argv, VALUE self)
   if (res.error != 0) {
     if (res.error == EAGAIN) {
       rb_raise(eTimeout, "timed out waiting for resource '%s'", res.name);
+    } else if (res.error == EINVAL && get_semaphore(res.sem_id) == -1 && errno == ENOENT) {
+      rb_raise(eSemaphoreMissing, "semaphore array '%s' no longer exists", res.name);
     } else {
       raise_semian_syscall_error("semop()", res.error);
     }

data/ext/semian/semian.c

@@ -1,6 +1,6 @@
 #include "semian.h"
 
-VALUE eSyscall, eTimeout, eInternal;
+VALUE eSyscall, eTimeout, eInternal, eSemaphoreMissing;
 
 void Init_semian()
 {
@@ -46,6 +46,17 @@ void Init_semian()
   eInternal = rb_const_get(cSemian, rb_intern("InternalError"));
   rb_global_variable(&eInternal);
 
+  /* Document-class: Semian::SemaphoreMissingError
+   *
+   * Indicates that some time after initialization, a semaphore array was no longer
+   * present when we tried to access it. This can happen because semaphores were
+   * deleted using the <code>ipcrm</code> command line tool, the
+   * <code>semctl(..., IPC_RMID)</code> syscall, or systemd's <code>RemoveIPC</code>
+   * feature.
+   */
+  eSemaphoreMissing = rb_const_get(cSemian, rb_intern("SemaphoreMissingError"));
+  rb_global_variable(&eSemaphoreMissing);
+
   rb_define_alloc_func(cResource, semian_resource_alloc);
   rb_define_method(cResource, "initialize_semaphore", semian_resource_initialize, 5);
   rb_define_method(cResource, "acquire", semian_resource_acquire, -1);

data/ext/semian/sysv_semaphores.h

@@ -66,7 +66,7 @@ enum SEMINDEX_ENUM {
     FOREACH_SEMINDEX(GENERATE_ENUM)
 };
 
-extern VALUE eSyscall, eTimeout, eInternal;
+extern VALUE eSyscall, eTimeout, eInternal, eSemaphoreMissing;
 
 // Helper for syscall verbose debugging
 void

data/lib/semian/mysql2.rb

@@ -28,6 +28,8 @@ module Semian
       /Too many connections/i,
       /closed MySQL connection/i,
       /Timeout waiting for a response/i,
+      /No matching servers with free connections/i,
+      /Max connect timeout reached while reaching hostgroup/i,
     )
 
     ResourceBusyError = ::Mysql2::ResourceBusyError
@@ -136,7 +138,8 @@ module Semian
 
     def raw_semian_options
       return query_options[:semian] if query_options.key?(:semian)
-      return query_options["semian"] if query_options.key?("semian")
+
+      query_options["semian"] if query_options.key?("semian")
     end
   end
 end

data/lib/semian/redis.rb

@@ -151,7 +151,8 @@ module Semian
 
     def raw_semian_options
       return options[:semian] if options.key?(:semian)
-      return options["semian"] if options.key?("semian")
+
+      options["semian"] if options.key?("semian")
     end
 
     def raise_if_out_of_memory(reply)

data/lib/semian/redis_client.rb

@@ -33,19 +33,25 @@ class RedisClient
   CircuitOpenError = Class.new(SemianError)
 
   module SemianConfig
-    attr_reader :raw_semian_options
-
     def initialize(semian: nil, **kwargs)
       super(**kwargs)
 
       @raw_semian_options = semian
     end
 
+    def raw_semian_options
+      @raw_semian_options.respond_to?(:call) ? @raw_semian_options.call(host, port) : @raw_semian_options
+    end
+
     def semian_identifier
-      @semian_identifier ||= begin
+      return @semian_identifier if @semian_identifier
+
+      identifier = begin
         name = (semian_options && semian_options[:name]) || "#{host}:#{port}/#{db}"
         :"redis_#{name}"
       end
+      @semian_identifier = identifier unless semian_options && semian_options[:dynamic]
+      identifier
     end
 
     define_method(:semian_options, Semian::Adapter.instance_method(:semian_options))

data/lib/semian/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Semian
-  VERSION = "0.21.3"
+  VERSION = "0.22.0.RC.1"
 end

data/lib/semian.rb

@@ -100,6 +100,7 @@ module Semian
   TimeoutError = Class.new(BaseError)
   InternalError = Class.new(BaseError)
   OpenCircuitError = Class.new(BaseError)
+  SemaphoreMissingError = Class.new(BaseError)
 
   attr_accessor :maximum_lru_size, :minimum_lru_time, :default_permissions, :namespace
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.21.3
+  version: 0.22.0.RC.1
 platform: ruby
 authors:
 - Scott Francis
 - Simon Eskildsen
 - Dale Hamel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies: []
 description: |2
       A Ruby C extention that is used to control access to shared resources
@@ -64,7 +64,7 @@ metadata:
   documentation_uri: https://github.com/Shopify/semian
   homepage_uri: https://github.com/Shopify/semian
   source_code_uri: https://github.com/Shopify/semian
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -72,15 +72,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
-signing_key: 
+rubygems_version: 3.5.14
+signing_key:
 specification_version: 4
 summary: Bulkheading for Ruby with SysV semaphores
 test_files: []