diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/ruby-pg-fix-connect-timeout.patch | 176 | ||||
| -rw-r--r-- | gnu/packages/ruby-xyz.scm | 46 |
3 files changed, 21 insertions, 202 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index a2c2ef46aa5..ed29bd10413 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2377,7 +2377,6 @@ dist_patch_DATA = \ %D%/packages/patches/ruby-flores-fix-deprecations.patch \ %D%/packages/patches/ruby-latex-decode-fix-test.patch \ %D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \ - %D%/packages/patches/ruby-pg-fix-connect-timeout.patch \ %D%/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch \ %D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch \ %D%/packages/patches/rust-1.70-fix-rustix-build.patch \ diff --git a/gnu/packages/patches/ruby-pg-fix-connect-timeout.patch b/gnu/packages/patches/ruby-pg-fix-connect-timeout.patch deleted file mode 100644 index 16fa10707d6..00000000000 --- a/gnu/packages/patches/ruby-pg-fix-connect-timeout.patch +++ /dev/null @@ -1,176 +0,0 @@ -From: "Alexander J. Maidak" <amaidak@equinix.com> -https://github.com/ged/ruby-pg/pull/619 - ---- - lib/pg/connection.rb | 16 ++++++++++- - spec/helpers.rb | 13 +++++++++ - spec/pg/connection_spec.rb | 57 +++++++++++++++++++++++++------------- - 3 files changed, 65 insertions(+), 21 deletions(-) - -diff --git a/lib/pg/connection.rb b/lib/pg/connection.rb -index 2c9ecd8..572a2bf 100644 ---- a/lib/pg/connection.rb -+++ b/lib/pg/connection.rb -@@ -680,6 +680,7 @@ class PG::Connection - host_count = conninfo_hash[:host].to_s.count(",") + 1 - stop_time = timeo * host_count + Process.clock_gettime(Process::CLOCK_MONOTONIC) - end -+ connection_errors = [] - - poll_status = PG::PGRES_POLLING_WRITING - until poll_status == PG::PGRES_POLLING_OK || -@@ -720,7 +721,13 @@ class PG::Connection - else - connhost = "at \"#{host}\", port #{port}" - end -- raise PG::ConnectionBad.new("connection to server #{connhost} failed: timeout expired", connection: self) -+ connection_errors << "connection to server #{connhost} failed: timeout expired" -+ if connection_errors.count < host_count.to_i -+ new_conninfo_hash = rotate_hosts(conninfo_hash.compact) -+ send(:reset_start2, self.class.send(:parse_connect_args, new_conninfo_hash)) -+ else -+ raise PG::ConnectionBad.new(connection_errors.join("\n"), connection: self) -+ end - end - - # Check to see if it's finished or failed yet -@@ -733,6 +740,13 @@ class PG::Connection - raise PG::ConnectionBad.new(msg, connection: self) - end - end -+ -+ private def rotate_hosts(conninfo_hash) -+ conninfo_hash[:host] = conninfo_hash[:host].split(",").rotate.join(",") if conninfo_hash[:host] -+ conninfo_hash[:port] = conninfo_hash[:port].split(",").rotate.join(",") if conninfo_hash[:port] -+ conninfo_hash[:hostaddr] = conninfo_hash[:hostaddr].split(",").rotate.join(",") if conninfo_hash[:hostaddr] -+ conninfo_hash -+ end - end - - include Pollable -diff --git a/spec/helpers.rb b/spec/helpers.rb -index 7214ec1..bd546f5 100644 ---- a/spec/helpers.rb -+++ b/spec/helpers.rb -@@ -475,6 +475,19 @@ EOT - end - end - -+ class ListenSocket -+ attr_reader :port -+ def initialize(host = 'localhost', accept: true) -+ TCPServer.open( host, 0 ) do |serv| -+ if accept -+ Thread.new { begin loop do serv.accept end rescue nil end } -+ end -+ @port = serv.local_address.ip_port -+ yield self -+ end -+ end -+ end -+ - def check_for_lingering_connections( conn ) - conn.exec( "SELECT * FROM pg_stat_activity" ) do |res| - conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid && ["client backend", nil].include?(row["backend_type"]) } -diff --git a/spec/pg/connection_spec.rb b/spec/pg/connection_spec.rb -index 63d3585..8a5645a 100644 ---- a/spec/pg/connection_spec.rb -+++ b/spec/pg/connection_spec.rb -@@ -369,24 +369,38 @@ describe PG::Connection do - end - end - -- it "times out after connect_timeout seconds" do -- TCPServer.open( 'localhost', 54320 ) do |serv| -+ it "times out after 2 * connect_timeout seconds on two connections" do -+ PG::TestingHelpers::ListenSocket.new do |sock| - start_time = Time.now - expect { - described_class.connect( -- host: 'localhost', -- port: 54320, -- connect_timeout: 1, -- dbname: "test") -+ host: 'localhost,localhost', -+ port: sock.port, -+ connect_timeout: 1, -+ dbname: "test") - }.to raise_error do |error| - expect( error ).to be_an( PG::ConnectionBad ) -- expect( error.message ).to match( /timeout expired/ ) -+ expect( error.message ).to match( /timeout expired.*timeout expired/m ) - if PG.library_version >= 120000 -- expect( error.message ).to match( /\"localhost\"/ ) -- expect( error.message ).to match( /port 54320/ ) -+ expect( error.message ).to match( /\"localhost\".*\"localhost\"/m ) -+ expect( error.message ).to match( /port #{sock.port}/ ) - end - end - -+ expect( Time.now - start_time ).to be_between(1.9, 10).inclusive -+ end -+ end -+ -+ it "succeeds with second host after connect_timeout" do -+ PG::TestingHelpers::ListenSocket.new do |sock| -+ start_time = Time.now -+ conn = described_class.connect( -+ host: 'localhost,localhost,localhost', -+ port: "#{sock.port},#{@port},#{sock.port}", -+ connect_timeout: 1, -+ dbname: "test") -+ -+ expect( conn.port ).to eq( @port ) - expect( Time.now - start_time ).to be_between(0.9, 10).inclusive - end - end -@@ -768,7 +782,8 @@ describe PG::Connection do - end - - it "raises proper error when sending fails" do -- conn = described_class.connect_start( '127.0.0.1', 54320, "", "", "me", "xxxx", "somedb" ) -+ sock = PG::TestingHelpers::ListenSocket.new('127.0.0.1', accept: false){ } -+ conn = described_class.connect_start( '127.0.0.1', sock.port, "", "", "me", "xxxx", "somedb" ) - expect{ conn.exec 'SELECT 1' }.to raise_error(PG::UnableToSend, /no connection/){|err| expect(err).to have_attributes(connection: conn) } - end - -@@ -1650,11 +1665,12 @@ describe PG::Connection do - - - it "handles server close while asynchronous connect" do -- serv = TCPServer.new( '127.0.0.1', 54320 ) -- conn = described_class.connect_start( '127.0.0.1', 54320, "", "", "me", "xxxx", "somedb" ) -- expect( [PG::PGRES_POLLING_WRITING, PG::CONNECTION_OK] ).to include conn.connect_poll -- select( nil, [conn.socket_io], nil, 0.2 ) -- serv.close -+ conn = nil -+ PG::TestingHelpers::ListenSocket.new('127.0.0.1', accept: false)do |sock| -+ conn = described_class.connect_start( '127.0.0.1', sock.port, "", "", "me", "xxxx", "somedb" ) -+ expect( [PG::PGRES_POLLING_WRITING, PG::CONNECTION_OK] ).to include conn.connect_poll -+ select( nil, [conn.socket_io], nil, 0.2 ) -+ end - if conn.connect_poll == PG::PGRES_POLLING_READING - select( [conn.socket_io], nil, nil, 0.2 ) - end -@@ -1778,12 +1794,13 @@ describe PG::Connection do - end - - it "consume_input should raise ConnectionBad for a closed connection" do -- serv = TCPServer.new( '127.0.0.1', 54320 ) -- conn = described_class.connect_start( '127.0.0.1', 54320, "", "", "me", "xxxx", "somedb" ) -- while [PG::CONNECTION_STARTED, PG::CONNECTION_MADE].include?(conn.connect_poll) -- sleep 0.1 -+ conn = nil -+ PG::TestingHelpers::ListenSocket.new '127.0.0.1', accept: false do |sock| -+ conn = described_class.connect_start( '127.0.0.1', sock.port, "", "", "me", "xxxx", "somedb" ) -+ while [PG::CONNECTION_STARTED, PG::CONNECTION_MADE].include?(conn.connect_poll) -+ sleep 0.1 -+ end - end -- serv.close - expect{ conn.consume_input }.to raise_error(PG::ConnectionBad, /server closed the connection unexpectedly/){|err| expect(err).to have_attributes(connection: conn) } - expect{ conn.consume_input }.to raise_error(PG::ConnectionBad, /can't get socket descriptor|connection not open/){|err| expect(err).to have_attributes(connection: conn) } - end --- -2.47.1 - diff --git a/gnu/packages/ruby-xyz.scm b/gnu/packages/ruby-xyz.scm index cb6eb157153..2ea950f5a21 100644 --- a/gnu/packages/ruby-xyz.scm +++ b/gnu/packages/ruby-xyz.scm @@ -7970,50 +7970,46 @@ alternative to Marshal for Object serialization.") (license license:expat))) (define-public ruby-pg - (let ((commit "378b7a35c12292625460ef2f33373de7114bf255") - (revision "0")) (package (name "ruby-pg") - (version (git-version "1.5.9" revision commit)) + (version "1.6.2") (home-page "https://github.com/ged/ruby-pg") (source (origin (method git-fetch) (uri (git-reference - (url home-page) - (commit commit))) + (url home-page) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1aq6kakyghgbb4yykxxl9ziaaa7jbdbyc7vz6avyxhlby1jkj0m8")) - (patches - (search-patches "ruby-pg-fix-connect-timeout.patch")))) + (base32 "14164l86xjla4sbaw8flnd2krc2n61l6gjvmmy31v07w5ys4xyjj")))) (build-system ruby-build-system) (arguments (list #:test-target "spec" #:phases #~(modify-phases %standard-phases - (add-before 'build 'compile - (lambda _ - (invoke "rake" "compile"))) - ;; Some tests rely on postgresql_lib_path.rb, but it is not - ;; available until the gem is installed. Run tests after - ;; installing to work around it. - (delete 'check) - (add-after 'install 'check - (lambda* (#:key tests? #:allow-other-keys) - (let ((new-gem (string-append #$output - "/lib/ruby/vendor_ruby"))) - (setenv "GEM_PATH" - (string-append (getenv "GEM_PATH") ":" new-gem)) - (when tests? - (invoke "rspec")))))))) + (add-before 'build 'compile + (lambda _ + (invoke "rake" "compile"))) + ;; Some tests rely on postgresql_lib_path.rb, but it is not + ;; available until the gem is installed. Run tests after + ;; installing to work around it. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (let ((new-gem (string-append #$output + "/lib/ruby/vendor_ruby"))) + (setenv "GEM_PATH" + (string-append (getenv "GEM_PATH") ":" new-gem)) + (when tests? + (invoke "rspec")))))))) (native-inputs (list ruby-rake-compiler ruby-hoe ruby-rspec)) (inputs (list postgresql)) (synopsis "Ruby interface to PostgreSQL") (description "Pg is the Ruby interface to the PostgreSQL RDBMS. It works -with PostgreSQL 9.3 and later.") - (license license:ruby)))) +with PostgreSQL 10 and later.") + (license license:ruby))) (define-public ruby-byebug (package |