MB-51458 do not check project_intact key when computing quirks

...for long names issue

Change-Id: Id492b6694df111298485cb9475932e1c23753a54
Reviewed-on: https://review.couchbase.org/c/ns_server/+/172671
Well-Formed: Restriction Checker
Well-Formed: Build Bot <[email protected]>
Reviewed-by: Timofey Barmin <[email protected]>
Tested-by: Artem Stemkovski <[email protected]>

Author: vzasade

src/dcp_replicator.erl

@@ -277,7 +277,7 @@ should_truncate_name(ProducerNode) ->
         true ->
             true;
         false ->
-            Quirks = rebalance_quirks:get_quirks([ProducerNode]),
+            Quirks = rebalance_quirks:get_quirks([ProducerNode], long_names),
             not rebalance_quirks:is_enabled(
                   dont_truncate_long_names,
                   rebalance_quirks:get_node_quirks(ProducerNode, Quirks))
@@ -412,7 +412,7 @@ get_connection_name_test_() ->
                meck:expect(cluster_compat_mode, is_cluster_71,
                            fun () -> false end),
                meck:expect(rebalance_quirks, get_quirks,
-                           fun (_) -> [{ProducerNode, []}] end),
+                           fun (_, long_names) -> [{ProducerNode, []}] end),
                ?assertEqual(
                   TrimmedName,
                   get_connection_name(ConsumerNode, ProducerNode,
@@ -424,7 +424,7 @@ get_connection_name_test_() ->
                meck:expect(cluster_compat_mode, is_cluster_71,
                            fun () -> false end),
                meck:expect(rebalance_quirks, get_quirks,
-                           fun (_) ->
+                           fun (_, long_names) ->
                                    [{ProducerNode, [dont_truncate_long_names]}]
                            end),
                Conn = get_connection_name(ConsumerNode, ProducerNode,

src/ns_vbucket_mover.erl

@@ -140,7 +140,7 @@ init({Bucket, Nodes, OldMap, NewMap, ProgressCallback}) ->
     ets:new(compaction_inhibitions, [named_table, private, set]),
     ets:new(workers, [named_table, private, set]),
 
-    Quirks = rebalance_quirks:get_quirks(Nodes),
+    Quirks = rebalance_quirks:get_quirks(Nodes, project_intact),
     SchedulerState = vbucket_move_scheduler:prepare(
                        OldMap, NewMap, Quirks,
                        menelaus_web_settings:get_rebalance_moves_per_node(),

src/rebalance_quirks.erl

@@ -12,7 +12,7 @@
 -define(WAIT_STATUSES_TIMEOUT,
         ns_config:get_timeout({?MODULE, wait_statuses}, 15000)).
 
--export([get_quirks/1, is_enabled/2, get_node_quirks/2,
+-export([get_quirks/2, is_enabled/2, get_node_quirks/2,
          default_config/0, upgrade_config_project_intact_patched/0]).
 -export_type([quirk/0]).
 
@@ -23,7 +23,7 @@
                  dont_truncate_long_names.
 
 %% APIs
-get_quirks(Nodes) ->
+get_quirks(Nodes, Type) ->
     Config = ns_config:latest(),
     OverrideQuirks =
         lists:filtermap(
@@ -37,7 +37,7 @@ get_quirks(Nodes) ->
           end, Nodes),
 
     OtherNodes     = Nodes -- proplists:get_keys(OverrideQuirks),
-    ComputedQuirks = compute_quirks(OtherNodes, Config),
+    ComputedQuirks = compute_quirks(OtherNodes, Config, Type),
 
     OverrideQuirks ++
         lists:map(
@@ -73,23 +73,28 @@ get_disabled_quirks(Node, Config) ->
     ns_config:search_node_with_default(Node, Config,
                                        disable_rebalance_quirks, []).
 
-compute_quirks(Nodes, Config) ->
+compute_quirks(Nodes, Config, project_intact) ->
     Unpatched = [N || N <- Nodes,
                       not has_project_intact_patches(N, Config)],
 
     case Unpatched of
         [] ->
             [{N, []} || N <- Nodes];
         _ ->
-            lists:map(fun ({Node, Status}) ->
-                              case get_version(Status) of
-                                  {ok, Version} ->
-                                      {Node, quirks_for_version(Version)};
-                                  no_version ->
-                                      exit({no_version_for_node, Node})
-                              end
-                      end, get_statuses(Nodes))
-    end.
+            compute_quirks(Nodes)
+    end;
+compute_quirks(Nodes, _Config, long_names) ->
+    compute_quirks(Nodes).
+
+compute_quirks(Nodes) ->
+    lists:map(fun ({Node, Status}) ->
+                      case get_version(Status) of
+                          {ok, Version} ->
+                              {Node, quirks_for_version(Version)};
+                          no_version ->
+                              exit({no_version_for_node, Node})
+                      end
+              end, get_statuses(Nodes)).
 
 get_statuses(Nodes) ->
     case ns_doctor:wait_statuses(Nodes, ?WAIT_STATUSES_TIMEOUT) of