solrb 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b33978e8d1e9f3b72dd019aba0061c0aa3954ce0751dba3e9160fd3bfa06baf3
-  data.tar.gz: e32736f80614a2fdf417c2d5028f5ada09d1e864c7d742e9a918f172a1bad2ac
+  metadata.gz: d005e7cd6f9fdcbccfb46fea9352cef44d44d76adafa4e80938413e2037849ba
+  data.tar.gz: 87a0de829e090c6799fa9c8184f9e5439e2c31b5175bb18e557191e4e9ae26ce
 SHA512:
-  metadata.gz: 39d7dbda2d2943d0ae2ef9298c5f91178a269e012a26d6895274e241f1313ad843d9cecb39913f823dd13bd57dc6cd887aa8cdd102ba304f479bf82932a30fbc
-  data.tar.gz: 4d2df569275c95015768131dae59e32a159cffe9b13861892235e7089c994db9fd0216e7ce05492717da01eb7024188ddabd6d8c28f2f3bcb5e7fc3d32c53c2d
+  metadata.gz: b4da47651fb170b0a097c2f14cf6bfe6e1a0d2174ba88a2b95390e9aae2943b5ea957ff3603882b550f45eb6545b88eaf4286f3b848b5bdced4beed8bbc2fcd5
+  data.tar.gz: 2d4245600e6e8ba8cd1fff297108b080d7ed3827452afc6b13a3cc428d3ac71e63526017fe076fcbbe4823195046cba1355d8197ddf500ef246a4e883a9011ab

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    solrb (0.2.2)
+    solrb (0.2.5)
       addressable
       faraday
 
@@ -80,4 +80,4 @@ DEPENDENCIES
   solrb!
 
 BUNDLED WITH
-   1.16.6
+   1.17.3

data/README.md

@@ -15,6 +15,8 @@ Object-Oriented approach to Solr in Ruby.
   * [Single core configuration](#single-core-configuration)
   * [Multiple core configuration](#multiple-core-configuration)
   * [Solr Cloud](#solr-cloud)
+  * [Master-slave](#master-slave)
+    * [Gray list](#gray-list)
   * [Basic Authentication](#basic-authentication)
 * [Indexing](#indexing)
 * [Querying](#querying)
@@ -164,6 +166,51 @@ on_worker_boot do
 end
 ```
 
+## Master-slave
+
+To enable master-slave mode you must define a master url and slave url on solr config block.
+In solr master-slave mode you don't need to provide a solr url (`config.url` or `ENV['SOLR_URL']`).
+
+```ruby
+Solr.configure do |config|
+  config.master_url = 'localhost:8983'
+  config.slave_url = 'localhost:8984'
+  # Disable select queries from master:
+  config.disable_read_from_master = true
+  # Specify Gray-list service
+  config.nodes_gray_list = Solr::MasterSlave::NodesGrayList::InMemory.new
+end
+```
+
+If you are using puma web server in clustered mode you must call `enable_master_slave!` on `on_worker_boot`
+callback to make each puma worker connect with zookeeper.
+
+
+```ruby
+on_worker_boot do
+  Solr.enable_master_slave!
+end
+```
+
+### Gray list
+
+Solrb provides two built-in services:
+- `Solr::MasterSlave::NodesGrayList::Disabled` — Disabled service (default). Just does nothing.
+- `Solr::MasterSlave::NodesGrayList::InMemory` — In memory service. It stores failed URLs in an instance variable, so it's not shared across threads/servers. URLs will be marked as "gray" for 5 minutes, but if all URLs are gray, the policy will try to send requests to these URLs earlier.
+
+You are able to implement your own services with corresponding API.
+
+## Force node URL
+
+You can force solrb to use a specific node URL with the `with_node_url` method:
+
+```ruby
+Solr.with_node_url('http://localhost:9000') do
+  Solr::Query::Request.new(search_term: 'example', query_fields: query_fields).run
+end
+```
+
+
 ## Basic Authentication
 
 Basic authentication is supported by solrb. You can enable it by providing `auth_user` and `auth_password`

data/lib/solr.rb

@@ -16,14 +16,19 @@ require 'solr/indexing/document'
 require 'solr/indexing/request'
 
 require 'solr/cloud/helper_methods'
+require 'solr/master_slave/helper_methods'
+require 'solr/helper_methods'
 require 'solr/commands'
 
 module Solr
   class << self
     include Solr::Commands
     include Solr::Cloud::HelperMethods
+    include Solr::MasterSlave::HelperMethods
+    include Solr::HelperMethods
 
     CURRENT_CORE_CONFIG_VARIABLE_NAME = :solrb_current_core_config
+    SOLR_NODE_URL_OVERRIDE_CONFIG = :solrb_node_url_override_config
 
     attr_accessor :configuration
 
@@ -32,7 +37,11 @@ module Solr
     def configure
       yield configuration
       configuration.validate!
-      enable_solr_cloud! unless configuration.zookeeper_url.nil?
+      if configuration.zookeeper_url
+        enable_solr_cloud!
+      elsif configuration.master_url
+        enable_master_slave!
+      end
       configuration
     end
 
@@ -49,6 +58,17 @@ module Solr
       Thread.current[CURRENT_CORE_CONFIG_VARIABLE_NAME] = old_core_config
     end
 
+    def with_node_url(url)
+      Thread.current[SOLR_NODE_URL_OVERRIDE_CONFIG] = url
+      yield
+    ensure
+      Thread.current[SOLR_NODE_URL_OVERRIDE_CONFIG] = nil
+    end
+
+    def node_url_override
+      Thread.current[SOLR_NODE_URL_OVERRIDE_CONFIG]
+    end
+
     def solr_url(path = '')
       Solr::Support::UrlHelper.solr_url(path)
     end

data/lib/solr/cloud/helper_methods.rb

@@ -3,7 +3,7 @@ require 'solr/cloud/configuration'
 module Solr
   module Cloud
     module HelperMethods
-      def active_nodes_for(collection:)
+      def cloud_active_nodes_for(collection:)
         collections_state_manager.active_nodes_for(collection: collection)
       end
 

data/lib/solr/commands.rb

@@ -5,8 +5,9 @@ require 'solr/data_import/request'
 
 module Solr
   module Commands
-    def commit(open_searcher: true, runner_options: nil)
-      Solr::Commit::Request.new.run(open_searcher: open_searcher,
+    def commit(open_searcher: true, optimize: false, runner_options: nil)
+      Solr::Commit::Request.new.run(optimize: optimize,
+                                    open_searcher: open_searcher,
                                     runner_options: runner_options)
     end
 

data/lib/solr/commit/request.rb

@@ -3,8 +3,8 @@ module Solr
     class Request
       PATH = '/update'.freeze
 
-      def run(open_searcher: true, runner_options: nil)
-        http_request = build_http_request(open_searcher)
+      def run(open_searcher: true, optimize: false, runner_options: nil)
+        http_request = build_http_request(open_searcher, optimize)
         options = default_runner_options.merge(runner_options || {})
         Solr::Request::Runner.call(request: http_request, **options)
       end
@@ -12,12 +12,22 @@ module Solr
       private
 
       def default_runner_options
-        { node_selection_strategy: Solr::Request::LeaderNodeSelectionStrategy }
+        if Solr.cloud_enabled?
+          { node_selection_strategy: Solr::Request::Cloud::LeaderNodeSelectionStrategy }
+        elsif Solr.master_slave_enabled?
+          { node_selection_strategy: Solr::Request::MasterSlave::MasterNodeSelectionStrategy }
+        else
+          {}
+        end
       end
 
-      def build_http_request(open_searcher)
+      def build_http_request(open_searcher, optimize)
         Solr::Request::HttpRequest.new(path: PATH,
-                                       url_params: { commit: true, openSearcher: open_searcher },
+                                       url_params: {
+                                         commit: true,
+                                         optimize: optimize,
+                                         openSearcher: open_searcher
+                                       },
                                        method: :post)
       end
     end

data/lib/solr/configuration.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require 'solr/core_configuration/dynamic_field'
 require 'solr/core_configuration/field'
 require 'solr/core_configuration/core_config'
@@ -11,20 +12,27 @@ module Solr
     extend Forwardable
 
     delegate [:zookeeper_url, :zookeeper_url=, :zookeeper_auth_user=, :zookeeper_auth_password=] => :@cloud_configuration
+    delegate [:master_url, :master_url=, :slave_url, :slave_url=, :disable_read_from_master,
+      :disable_read_from_master=, :nodes_gray_list, :nodes_gray_list=] => :@master_slave_configuration
 
     SOLRB_USER_AGENT_HEADER = { user_agent: "Solrb v#{Solr::VERSION}" }.freeze
 
     attr_accessor :cores, :test_connection, :auth_user, :auth_password
 
-    attr_reader :url, :faraday_options, :cloud_configuration
+    attr_reader :url, :faraday_options, :faraday_configuration, :cloud_configuration,
+      :master_slave_configuration
+
+    attr_writer :url, :logger
 
     def initialize
       @faraday_options = {
         request: { timeout: 2, open_timeout: 8 },
         headers: SOLRB_USER_AGENT_HEADER
       }
+      @faraday_configuration = nil
       @cores = {}
       @cloud_configuration = Solr::Cloud::Configuration.new
+      @master_slave_configuration = Solr::MasterSlave::Configuration.new
     end
 
     def faraday_options=(options)
@@ -33,8 +41,8 @@ module Solr
       @faraday_options = options
     end
 
-    def url=(value)
-      @url = value
+    def faraday_configure(&block)
+      @faraday_configuration = block
     end
 
     def core_config_by_name(core)
@@ -87,9 +95,22 @@ module Solr
     end
 
     def validate!
-      if !(url || @cloud_configuration.zookeeper_url || ENV['SOLR_URL'])
+      if !(url ||
+           @cloud_configuration.zookeeper_url ||
+           (@master_slave_configuration.master_url && @master_slave_configuration.slave_url) ||
+           ENV['SOLR_URL'])
         raise Solr::Errors::SolrUrlNotDefinedError
       end
     end
+
+    def logger
+      @logger || null_logger
+    end
+
+    private
+
+    def null_logger
+      @null_logger ||= ::Logger.new(IO::NULL)
+    end
   end
 end

data/lib/solr/connection.rb

@@ -3,9 +3,9 @@ module Solr
   class Connection
     INSTRUMENT_KEY = 'request.solrb'.freeze
 
-    def initialize(url, faraday_options: Solr.configuration.faraday_options)
+    def initialize(url, faraday_options: Solr.configuration.faraday_options, faraday_configuration: Solr.configuration.faraday_configuration)
       # Allow mock the connection for testing
-      @raw_connection = Solr.configuration.test_connection || build_faraday_connection(url, faraday_options)
+      @raw_connection = Solr.configuration.test_connection || build_faraday_connection(url, faraday_options, faraday_configuration)
       freeze
     end
 
@@ -29,8 +29,8 @@ module Solr
 
     private
 
-    def build_faraday_connection(url, faraday_options)
-      connection = Faraday.new(url, faraday_options)
+    def build_faraday_connection(url, faraday_options, faraday_configuration)
+      connection = Faraday.new(url, faraday_options, &faraday_configuration)
       if Solr.configuration.auth_user && Solr.configuration.auth_password
         connection.basic_auth(Solr.configuration.auth_user, Solr.configuration.auth_password)
       end

data/lib/solr/data_import/request.rb

@@ -21,7 +21,13 @@ module Solr
       private
 
       def default_runner_options
-        { node_selection_strategy: Solr::Request::LeaderNodeSelectionStrategy }
+        if Solr.cloud_enabled?
+          { node_selection_strategy: Solr::Request::Cloud::LeaderNodeSelectionStrategy }
+        elsif Solr.master_slave_enabled?
+          { node_selection_strategy: Solr::Request::MasterSlave::MasterNodeSelectionStrategy }
+        else
+          {}
+        end
       end
     end
   end

data/lib/solr/delete/request.rb

@@ -21,7 +21,13 @@ module Solr
       private
 
       def default_runner_options
-        { node_selection_strategy: Solr::Request::LeaderNodeSelectionStrategy }
+        if Solr.cloud_enabled?
+          { node_selection_strategy: Solr::Request::Cloud::LeaderNodeSelectionStrategy }
+        elsif Solr.master_slave_enabled?
+          { node_selection_strategy: Solr::Request::MasterSlave::MasterNodeSelectionStrategy }
+        else
+          {}
+        end
       end
 
       def build_http_request(commit)

data/lib/solr/helper_methods.rb

@@ -0,0 +1,11 @@
+module Solr
+  module HelperMethods
+    def active_nodes_for(collection:)
+      if cloud_enabled?
+        cloud_active_nodes_for(collection: collection)
+      elsif master_slave_enabled?
+        master_slave_active_nodes_for(collection: collection)
+      end
+    end
+  end
+end

data/lib/solr/indexing/request.rb

@@ -18,7 +18,13 @@ module Solr
       private
 
       def default_runner_options
-        { node_selection_strategy: Solr::Request::LeaderNodeSelectionStrategy }
+        if Solr.cloud_enabled?
+          { node_selection_strategy: Solr::Request::Cloud::LeaderNodeSelectionStrategy }
+        elsif Solr.master_slave_enabled?
+          { node_selection_strategy: Solr::Request::MasterSlave::MasterNodeSelectionStrategy }
+        else
+          {}
+        end
       end
 
       def build_http_request(commit)

data/lib/solr/master_slave/configuration.rb

@@ -0,0 +1,38 @@
+require 'solr/master_slave/nodes_gray_list/disabled'
+require 'solr/master_slave/nodes_gray_list/in_memory'
+
+module Solr
+  module MasterSlave
+    class Configuration
+      attr_accessor :master_url, :slave_url, :disable_read_from_master
+
+      attr_reader :master_slave_enabled
+      attr_writer :nodes_gray_list
+
+      def enable_master_slave!(_)
+        @master_slave_enabled = true
+      end
+
+      def master_slave_enabled?
+        @master_slave_enabled
+      end
+
+      def active_nodes_for(collection:)
+        urls = []
+        urls.push(master_url) unless disable_read_from_master
+        urls.push(*slave_url) if slave_url
+        nodes_gray_list.select_active(urls, collection_name: collection)
+      end
+
+      def nodes_gray_list
+        @nodes_gray_list || gray_list_disabled_instance
+      end
+
+      private
+
+      def gray_list_disabled_instance
+        @gray_list_disabled_instance ||= Solr::MasterSlave::NodesGrayList::Disabled.new
+      end
+    end
+  end
+end

data/lib/solr/master_slave/helper_methods.rb

@@ -0,0 +1,25 @@
+require 'solr/master_slave/configuration'
+
+module Solr
+  module MasterSlave
+    module HelperMethods
+      def master_slave_active_nodes_for(collection:)
+        master_slave_configuration.active_nodes_for(collection: collection)
+      end
+
+      def master_slave_enabled?
+        master_slave_configuration.master_slave_enabled?
+      end
+
+      def enable_master_slave!
+        master_slave_configuration.enable_master_slave!(configuration.cores.keys)
+      end
+
+      private
+
+      def master_slave_configuration
+        configuration.master_slave_configuration
+      end
+    end
+  end
+end

data/lib/solr/master_slave/nodes_gray_list/disabled.rb

@@ -0,0 +1,21 @@
+module Solr
+  module MasterSlave
+    module NodesGrayList
+      class Disabled
+        def add(_)
+        end
+
+        def remove(_)
+        end
+
+        def added?(_)
+          true
+        end
+
+        def select_active(urls, collection_name:)
+          urls
+        end
+      end
+    end
+  end
+end

data/lib/solr/master_slave/nodes_gray_list/in_memory.rb

@@ -0,0 +1,47 @@
+module Solr
+  module MasterSlave
+    module NodesGrayList
+      class InMemory
+        attr_reader :gray_list, :removal_period
+
+        DEFAULT_REMOVAL_PERIOD = 5 * 60 # 5 minutes in seconds
+        
+        def initialize(removal_period: DEFAULT_REMOVAL_PERIOD)
+          @gray_list = {}
+          @removal_period = removal_period
+        end
+        
+        def add(url)
+          return if gray_list.has_key?(url)
+          ::Solr.configuration.logger.info("#{url} added to a gray list")
+          gray_list[url] = Time.now.utc
+        end
+
+        def remove(url)
+          gray_list.delete(url)
+        end
+
+        def added?(url)
+          added_at = gray_list[url]
+          return false unless added_at
+
+          if added_at + removal_period > Time.now.utc
+            true
+          else
+            remove(url)
+            false
+          end
+        end
+
+        def select_active(urls, collection_name:)
+          urls = Array(urls)
+          active_urls = urls.reject do |url|
+            collection_url = File.join(url, collection_name.to_s)
+            added?(collection_url)
+          end
+          active_urls.any? ? active_urls : urls
+        end
+      end
+    end
+  end
+end

data/lib/solr/query/handler.rb

@@ -5,21 +5,22 @@ require 'solr/query/http_request_builder'
 module Solr
   module Query
     class Handler
-      attr_reader :query, :page, :page_size
+      attr_reader :query, :rows, :start, :runner_options
 
       def self.call(opts)
         new(opts).call
       end
 
-      def initialize(query:, page:, page_size:)
+      def initialize(query:, rows:, start:, runner_options: {})
         @query = query
-        @page = page
-        @page_size = page_size
+        @rows = rows
+        @start = start
+        @runner_options = runner_options || {}
       end
 
       def call
-        http_request = Solr::Query::HttpRequestBuilder.call(query: query, page: page, page_size: page_size)
-        solr_response = Solr::Request::Runner.call(request: http_request)
+        http_request = Solr::Query::HttpRequestBuilder.call(query: query, start: start, rows: rows)
+        solr_response = Solr::Request::Runner.call(request: http_request, **runner_options)
         Solr::Query::Response::Parser.new(request: query, solr_response: solr_response.body).to_response
       end
     end

data/lib/solr/query/http_request_builder.rb

@@ -5,16 +5,16 @@ module Solr
     class HttpRequestBuilder
       PATH = '/select'.freeze
 
-      attr_reader :query, :page, :page_size
+      attr_reader :query, :start, :rows
 
       def self.call(opts)
         new(opts).call
       end
 
-      def initialize(query:, page:, page_size:)
+      def initialize(query:, start:, rows:)
         @query = query
-        @page = page
-        @page_size = page_size
+        @rows = rows
+        @start = start
       end
 
       def call
@@ -27,13 +27,7 @@ module Solr
 
       # 🏋️
       def build_body
-        @request_params ||= { params: solr_params.merge(wt: :json, rows: page_size.to_i, start: start) }
-      end
-
-      def start
-        start_page = page.to_i - 1
-        start_page = start_page < 1 ? 0 : start_page
-        start_page * page_size
+        @request_params ||= { params: solr_params.merge(wt: :json, rows: rows, start: start) }
       end
 
       def solr_params

data/lib/solr/query/request.rb

@@ -30,8 +30,11 @@ module Solr
         @filters = filters
       end
 
-      def run(page: 1, page_size: 10)
-        Solr::Query::Handler.call(query: self, page: page, page_size: page_size)
+      def run(page: nil, start: nil, rows: nil, page_size: nil, runner_options: {})
+        rows ||= page_size
+        return run_paged(page: page, page_size: rows, runner_options: runner_options) if page && rows
+        return run_start(start: start, rows: rows, runner_options: runner_options) if start && rows
+        raise ArgumentError, 'You must specify either page/rows or start/rows arguments'
       end
 
       def grouping
@@ -45,6 +48,20 @@ module Solr
       def to_h
         Solr::Query::Request::EdismaxAdapter.new(self).to_h
       end
+
+      private
+
+      def run_paged(page: 1, page_size: 10, runner_options:)
+        start_page = page.to_i - 1
+        start_page = start_page < 1 ? 0 : start_page
+        start = start_page * page_size
+
+        Solr::Query::Handler.call(query: self, start: start, rows: page_size, runner_options: runner_options)
+      end
+
+      def run_start(rows: 10, start: 0, runner_options:)
+        Solr::Query::Handler.call(query: self, start: start, rows: rows, runner_options: runner_options)
+      end
     end
   end
 end

data/lib/solr/request/cloud/first_shard_leader_node_selection_strategy.rb

@@ -0,0 +1,27 @@
+module Solr
+  module Request
+    module Cloud
+      class FirstShardLeaderNodeSelectionStrategy < NodeSelectionStrategy
+        def call
+          leader = first_shard_leader_replica_node_for(collection: collection_name)
+          replicas = solr_cloud_active_nodes_urls.shuffle
+          urls = ([leader] + replicas).flatten.uniq
+          map_urls_to_collections(urls)
+        end
+
+        private
+
+        def first_shard_leader_replica_node_for(collection:)
+          shards = Solr.shards_for(collection: collection)
+          return unless shards
+          first_shard_name = shards.sort.first
+          Solr.leader_replica_node_for(collection: collection, shard: first_shard_name)
+        end
+
+        def solr_cloud_active_nodes_urls
+          Solr.active_nodes_for(collection: collection_name)
+        end
+      end
+    end
+  end
+end

data/lib/solr/request/cloud/leader_node_selection_strategy.rb

@@ -0,0 +1,21 @@
+module Solr
+  module Request
+    module Cloud
+      class LeaderNodeSelectionStrategy < NodeSelectionStrategy
+        def call
+          urls = [leader_replica_node_for(collection: collection_name)]
+          map_urls_to_collections(urls)
+        end
+
+        private
+
+        def leader_replica_node_for(collection:)
+          shards = Solr.shards_for(collection: collection)
+          return unless shards
+          first_shard_name = shards.sort.first
+          Solr.leader_replica_node_for(collection: collection, shard: first_shard_name)
+        end
+      end
+    end
+  end
+end

data/lib/solr/request/default_node_selection_strategy.rb

@@ -2,7 +2,8 @@ module Solr
   module Request
     class DefaultNodeSelectionStrategy < NodeSelectionStrategy
       def call
-        Solr.active_nodes_for(collection: collection_name).shuffle
+        urls = Solr.active_nodes_for(collection: collection_name)
+        map_urls_to_collections(urls).shuffle
       end
     end
   end

data/lib/solr/request/master_slave/master_node_selection_strategy.rb

@@ -0,0 +1,12 @@
+module Solr
+  module Request
+    module MasterSlave
+      class MasterNodeSelectionStrategy < NodeSelectionStrategy
+        def call
+          urls = [Solr.configuration.master_url]
+          map_urls_to_collections(urls)
+        end
+      end
+    end
+  end
+end

data/lib/solr/request/node_selection_strategy.rb

@@ -14,6 +14,12 @@ module Solr
       def call
         raise "Not implemented"
       end
+
+      private
+
+      def map_urls_to_collections(urls)
+        urls&.map { |u| File.join(u, collection_name.to_s) }
+      end
     end
   end
 end

data/lib/solr/request/runner.rb

@@ -1,7 +1,8 @@
 require 'solr/request/node_selection_strategy'
 require 'solr/request/default_node_selection_strategy'
-require 'solr/request/first_shard_leader_node_selection_strategy'
-require 'solr/request/leader_node_selection_strategy'
+require 'solr/request/cloud/first_shard_leader_node_selection_strategy'
+require 'solr/request/cloud/leader_node_selection_strategy'
+require 'solr/request/master_slave/master_node_selection_strategy'
 require 'solr/errors/solr_query_error'
 require 'solr/errors/solr_connection_failed_error'
 require 'solr/errors/no_active_solr_nodes_error'
@@ -39,6 +40,9 @@ module Solr
             raise Solr::Errors::SolrQueryError, solr_response.error_message unless solr_response.ok?
             return solr_response
           rescue Faraday::ConnectionFailed, Faraday::TimeoutError, Errno::EADDRNOTAVAIL => e
+            if Solr.master_slave_enabled?
+              Solr.configuration.nodes_gray_list.add(node_url)
+            end
             solr_url_errors[node_url] = "#{e.class.name} - #{e.message}"
             # Try next node
           end
@@ -51,7 +55,13 @@ module Solr
 
       def solr_urls
         @solr_urls ||= begin
-          urls = Solr.cloud_enabled? ? solr_cloud_collection_urls : [Solr.current_core_config.url]
+          urls = if Solr.node_url_override
+            [File.join(Solr.node_url_override, collection_name.to_s)]
+          elsif Solr.cloud_enabled? || Solr.master_slave_enabled?
+            node_selection_strategy.call(collection_name)
+          else
+            [Solr.current_core_config.url]
+          end
           unless urls && urls.any?
             raise Solr::Errors::NoActiveSolrNodesError
           end
@@ -59,11 +69,6 @@ module Solr
         end
       end
 
-      def solr_cloud_collection_urls
-        urls = node_selection_strategy.call(collection_name)
-        urls&.map { |u| File.join(u, collection_name.to_s) }
-      end
-
       def collection_name
         Solr.current_core_config.name
       end

data/lib/solr/support/url_helper.rb

@@ -18,11 +18,16 @@ module Solr
       end
 
       def core_url
-        Solr.cloud_enabled? ? solr_cloud_url : current_core.uri
+        if Solr.cloud_enabled? || Solr.master_slave_enabled?
+          solr_cloud_or_master_slave_url
+        else
+          current_core.uri
+        end
       end
 
-      def solr_cloud_url
-        File.join(Solr.active_nodes_for(collection: current_core.name.to_s).first, current_core.name.to_s)
+      def solr_cloud_or_master_slave_url
+        url = Solr.active_nodes_for(collection: current_core.name.to_s).first
+        File.join(url, current_core.name.to_s)
       end
 
       def current_core

data/lib/solr/version.rb

@@ -1,3 +1,3 @@
 module Solr
-  VERSION = '0.2.5'.freeze
+  VERSION = '0.2.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solrb
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Adriano Luz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -198,8 +198,13 @@ files:
 - lib/solr/errors/solr_url_not_defined_error.rb
 - lib/solr/errors/zookeeper_required.rb
 - lib/solr/grouped_document_collection.rb
+- lib/solr/helper_methods.rb
 - lib/solr/indexing/document.rb
 - lib/solr/indexing/request.rb
+- lib/solr/master_slave/configuration.rb
+- lib/solr/master_slave/helper_methods.rb
+- lib/solr/master_slave/nodes_gray_list/disabled.rb
+- lib/solr/master_slave/nodes_gray_list/in_memory.rb
 - lib/solr/query/handler.rb
 - lib/solr/query/http_request_builder.rb
 - lib/solr/query/request.rb
@@ -235,10 +240,11 @@ files:
 - lib/solr/query/response/field_facets.rb
 - lib/solr/query/response/parser.rb
 - lib/solr/query/response/spellcheck.rb
+- lib/solr/request/cloud/first_shard_leader_node_selection_strategy.rb
+- lib/solr/request/cloud/leader_node_selection_strategy.rb
 - lib/solr/request/default_node_selection_strategy.rb
-- lib/solr/request/first_shard_leader_node_selection_strategy.rb
 - lib/solr/request/http_request.rb
-- lib/solr/request/leader_node_selection_strategy.rb
+- lib/solr/request/master_slave/master_node_selection_strategy.rb
 - lib/solr/request/node_selection_strategy.rb
 - lib/solr/request/runner.rb
 - lib/solr/response.rb

data/lib/solr/request/first_shard_leader_node_selection_strategy.rb

@@ -1,24 +0,0 @@
-module Solr
-  module Request
-    class FirstShardLeaderNodeSelectionStrategy < NodeSelectionStrategy
-      def call
-        leader = first_shard_leader_replica_node_for(collection: collection_name)
-        replicas = solr_cloud_active_nodes_urls.shuffle
-        ([leader] + replicas).flatten.uniq
-      end
-
-      private
-
-      def first_shard_leader_replica_node_for(collection:)
-        shards = Solr.shards_for(collection: collection)
-        return unless shards
-        first_shard_name = shards.sort.first
-        Solr.leader_replica_node_for(collection: collection, shard: first_shard_name)
-      end
-
-      def solr_cloud_active_nodes_urls
-        Solr.active_nodes_for(collection: collection_name)
-      end
-    end
-  end
-end

data/lib/solr/request/leader_node_selection_strategy.rb

@@ -1,18 +0,0 @@
-module Solr
-  module Request
-    class LeaderNodeSelectionStrategy < NodeSelectionStrategy
-      def call
-        [leader_replica_node_for(collection: collection_name)]
-      end
-
-      private
-
-      def leader_replica_node_for(collection:)
-        shards = Solr.shards_for(collection: collection)
-        return unless shards
-        first_shard_name = shards.sort.first
-        Solr.leader_replica_node_for(collection: collection, shard: first_shard_name)
-      end
-    end
-  end
-end