MB-49271 Merge remote-tracking branch 'couchbase/mad-hatter'

* MB-49271 [BP] Takeover via orchestrator using conn names < 200 chars * MB-49271 [BP] Limit DCP connection names to 200 chars max Change-Id: I1752fa75c346f349c4c846dad3b2392f809487d1
couchbase · Nov 3, 2021 · f304d0f · f304d0f
2 parents d504ed3 + 2fddafd
commit f304d0f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/dcp_replicator.erl b/src/dcp_replicator.erl
@@ -336,7 +336,7 @@ get_connection_name_test() ->
                  "nodeA.eng.couchbase.com:bucket1", ConnAB),
     ?assertEqual(true, length(ConnAB) =< ?MAX_DCP_CONNECTION_NAME),
 
-    %% Test where the connection name, using the pre-NEO method, won't
+    %% Test where the connection name, using the previous method, won't
     %% fit into the maximum allowed.
 
     Node1 = "ns_1@platform-couchbase-cluster-0000.platform-couchbase-cluster."

diff --git a/src/ns_single_vbucket_mover.erl b/src/ns_single_vbucket_mover.erl
@@ -442,8 +442,8 @@ get_takeover_connection_name(NewMaster, OldMaster, Bucket, VBucket) ->
                               NewM, ":",
                               string:slice(Bucket, 0, 60), ":",
                               integer_to_list(VBucket)]),
-                true = length(ConnName1) =< ?MAX_DCP_CONNECTION_NAME,
-                ConnName1
+            true = length(ConnName1) =< ?MAX_DCP_CONNECTION_NAME,
+            ConnName1
     end.
 
 do_takeover(false, Pid, _Bucket, VBucket) ->