MB-24907 Revert "MB-24881 temporary disable user caches on ns_coushdb…

… node"

This reverts commit a1be437.

Change-Id: I63b6284978e5b50c3b0b177e691a142753be46b5
Reviewed-on: http://review.couchbase.org/79699
Tested-by: Artem Stemkovski <artem@couchbase.com>
Reviewed-by: Ajit Yagaty <ajit.yagaty@couchbase.com>

deps/ns_couchdb/src/ns_couchdb_sup.erl

@@ -46,6 +46,9 @@ init([]) ->
 
 child_specs() ->
     [
+     {menelaus_users_auth_cache, {menelaus_users, start_auth_cache, []},
+      permanent, 1000, worker, [versioned_cache]},
+
      {cb_couch_sup, {cb_couch_sup, start_link, []},
       permanent, 5000, supervisor, [cb_couch_sup]},
 
@@ -70,6 +73,9 @@ child_specs() ->
       permanent, infinity, supervisor,
       [ns_couchdb_config_sup]},
 
+     {compiled_roles_cache, {menelaus_roles, start_compiled_roles_cache, []},
+      permanent, 1000, worker, [versioned_cache]},
+
      {request_throttler, {request_throttler, start_link, []},
       permanent, 1000, worker, [request_throttler]},
 

src/menelaus_roles.erl

@@ -532,12 +532,7 @@ start_compiled_roles_cache() ->
 
 -spec get_compiled_roles(rbac_identity()) -> [rbac_compiled_role()].
 get_compiled_roles(Identity) ->
-    case ns_node_disco:couchdb_node() == node() of
-        false ->
-            versioned_cache:get(compiled_roles_cache_name(), Identity);
-        true ->
-            rpc:call(ns_node_disco:ns_server_node(), ?MODULE, get_compiled_roles, [Identity])
-    end.
+    versioned_cache:get(compiled_roles_cache_name(), Identity).
 
 build_compiled_roles(Identity) ->
     case ns_node_disco:couchdb_node() == node() of

src/menelaus_users.erl

@@ -385,8 +385,7 @@ get_auth_info(Identity) ->
         false ->
             get_auth_info_on_ns_server(Identity);
         true ->
-            rpc:call(ns_node_disco:ns_server_node(), ?MODULE, get_auth_info_on_ns_server,
-                     [Identity])
+            versioned_cache:get(auth_cache_name(), Identity)
     end.
 
 get_auth_info_on_ns_server(Identity) ->