Replace Makara with an initial Rails 6 role based splitting method.

app/controllers/api/base_controller.rb

@@ -65,7 +65,11 @@ class Api::BaseController < ApplicationController
   def current_resource_owner
     if doorkeeper_token
       @current_user ||= Rails.cache.fetch("dk:user:#{doorkeeper_token.resource_owner_id}", expires_in: 25.hours) do
-        User.find(doorkeeper_token.resource_owner_id)
+        u = nil
+        ActiveRecord::Base.connected_to(role: :writing) do
+          u = User.find(doorkeeper_token.resource_owner_id)
+        end
+        u
       end
     end
     return @current_user

app/controllers/api/v1/accounts/statuses_controller.rb

@@ -22,11 +22,17 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
   private
 
   def set_account
-    @account = Account.find(params[:account_id])
+    ActiveRecord::Base.connected_to(role: :reading) do
+      @account = Account.find(params[:account_id])
+    end
   end
 
   def load_statuses
-    cached_account_statuses
+    cas = nil
+    ActiveRecord::Base.connected_to(role: :reading) do
+      cas = cached_account_statuses
+    end
+    cas
   end
 
   def cached_account_statuses

app/controllers/api/v1/bookmark_collections/bookmarks_controller.rb

@@ -17,7 +17,11 @@ class Api::V1::BookmarkCollections::BookmarksController < Api::BaseController
   private
 
   def load_statuses
-    cached_bookmarks
+    cb = nil
+    ActiveRecord::Base.connected_to(role: :reading) do
+      cb = cached_bookmarks
+    end
+    cb
   end
 
   def cached_bookmarks
@@ -25,7 +29,7 @@ class Api::V1::BookmarkCollections::BookmarksController < Api::BaseController
       Status.reorder(nil).joins(:status_bookmarks).merge(results),
       Status
     )
-  end
+    ``  end
 
   def results
     @_results ||= account_bookmarks.paginate_by_id(
@@ -65,4 +69,4 @@ class Api::V1::BookmarkCollections::BookmarksController < Api::BaseController
   def pagination_params(core_params)
     params.slice(:limit).permit(:limit).merge(core_params)
   end
-end
+end

app/controllers/api/v1/notifications_controller.rb

@@ -27,7 +27,6 @@ class Api::V1::NotificationsController < Api::BaseController
   def mark_read
     if !params[:id].nil? and !current_account.user.nil?
       conn = ActiveRecord::Base.connection
-      conn.stick_to_master!
       conn.exec_query "update users set last_read_notification = #{params[:id].to_i} where id = #{current_account.user.id}"
     end
     # current_account.notifications.find(params[:id]).mark_read!

app/controllers/api/v1/statuses/favourites_controller.rb

@@ -34,14 +34,6 @@ class Api::V1::Statuses::FavouritesController < Api::BaseController
   end
 
   def requested_status
-    rs = nil
-    begin
-      rs = Status.find(params[:status_id])
-    rescue ActiveRecord::RecordNotFound
-      Status.connection.stick_to_master!
-      rs = Status.find(params[:status_id])
-    end
-    return rs unless rs.nil?
-    raise ActiveRecord::RecordNotFound
+    Status.find(params[:status_id])
   end
 end

app/controllers/api/v1/statuses/reblogs_controller.rb

@@ -31,15 +31,7 @@ class Api::V1::Statuses::ReblogsController < Api::BaseController
   private
 
   def status_for_reblog
-    rs = nil
-    begin
-      rs = Status.find(params[:status_id])
-    rescue ActiveRecord::RecordNotFound
-      Status.connection.stick_to_master!
-      rs = Status.find(params[:status_id])
-    end
-    return rs unless rs.nil?
-    raise ActiveRecord::RecordNotFound
+    Status.find(params[:status_id])
   end
 
   def status_for_destroy

app/controllers/api/v1/timelines/explore_controller.rb

@@ -39,7 +39,11 @@ class Api::V1::Timelines::ExploreController < Api::BaseController
   end
 
   def cached_explore_statuses
-    cache_collection explore_statuses, Status
+    es = nil
+    ActiveRecord::Base.connected_to(role: :reading) do
+      es = cache_collection explore_statuses, Status
+    end
+    es
   end
 
   def explore_statuses

app/controllers/api/v1/timelines/group_collection_controller.rb

@@ -56,7 +56,11 @@ class Api::V1::Timelines::GroupCollectionController < Api::BaseController
   end
 
   def cached_group_collection_statuses
-    cache_collection group_collection_statuses, Status
+    gcs = nil
+    ActiveRecord::Base.connected_to(role: :reading) do
+      gcs = cache_collection group_collection_statuses, Status
+    end
+    gcs
   end
 
   def group_collection_statuses

app/controllers/api/v1/timelines/group_controller.rb

@@ -46,7 +46,11 @@ class Api::V1::Timelines::GroupController < Api::BaseController
   end
 
   def cached_group_statuses
-    cache_collection group_statuses, Status
+    gs = nil
+    ActiveRecord::Base.connected_to(role: :reading) do
+      gs = cache_collection group_statuses, Status
+    end
+    gs
   end
 
   def group_statuses

app/controllers/api/v1/timelines/pro_controller.rb

@@ -16,7 +16,11 @@ class Api::V1::Timelines::ProController < Api::BaseController
   end
 
   def cached_pro_statuses
-    cache_collection pro_statuses, Status
+    ps = nil
+    ActiveRecord::Base.connected_to(role: :reading) do
+      ps = cache_collection pro_statuses, Status
+    end
+    ps
   end
 
   def pro_statuses