Skip to content

Commit 6130704

Browse files
committed
MB-47561 remove unused send_terse_streaming_buckets knob
Change-Id: If48bc792a3556a56c86b44657f1a7a64c51174e4 Reviewed-on: http://review.couchbase.org/c/ns_server/+/158232 Well-Formed: Restriction Checker Tested-by: Artem Stemkovski <[email protected]> Reviewed-by: Aliaksey Artamonau <[email protected]>
1 parent b103c26 commit 6130704

File tree

2 files changed

+5
-21
lines changed

2 files changed

+5
-21
lines changed

src/bucket_info_cache.erl

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
-include("ns_common.hrl").
2121

2222
-export([start_link/0,
23-
terse_bucket_info/1,
24-
terse_bucket_info_with_local_addr/2]).
23+
terse_bucket_info/1]).
2524

2625
-export([build_node_services/0]).
2726

@@ -325,12 +324,3 @@ do_build_node_services() ->
325324
J = {[{rev, Rev},
326325
{nodesExt, NEIs}] ++ Caps},
327326
{Rev, ejson:encode(J)}.
328-
329-
terse_bucket_info_with_local_addr(BucketName, LocalAddr) ->
330-
case terse_bucket_info(BucketName) of
331-
{ok, _, Bin} ->
332-
{ok, binary:replace(Bin, list_to_binary(?LOCALHOST_MARKER_STRING),
333-
list_to_binary(LocalAddr), [global])};
334-
Other ->
335-
Other
336-
end.

src/menelaus_web_buckets.erl

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -480,19 +480,13 @@ handle_sasl_buckets_streaming(_PoolId, Req) ->
480480

481481
handle_bucket_info_streaming(_PoolId, Id, Req) ->
482482
LocalAddr = menelaus_util:local_addr(Req),
483-
SendTerse = ns_config:read_key_fast(send_terse_streaming_buckets, false),
484483
F = fun(_Stability, _UpdateID) ->
485484
case ns_bucket:get_bucket(Id) of
486485
{ok, BucketConfig} ->
487-
case SendTerse of
488-
true ->
489-
{ok, Bin} = bucket_info_cache:terse_bucket_info_with_local_addr(Id, LocalAddr),
490-
{just_write, {write, Bin}};
491-
_ ->
492-
Info = build_bucket_info(Id, BucketConfig, streaming, LocalAddr,
493-
may_expose_bucket_auth(Id, Req), false),
494-
{just_write, Info}
495-
end;
486+
Info = build_bucket_info(
487+
Id, BucketConfig, streaming, LocalAddr,
488+
may_expose_bucket_auth(Id, Req), false),
489+
{just_write, Info};
496490
not_present ->
497491
exit(normal)
498492
end

0 commit comments

Comments
 (0)