Skip to content

Commit 46c3d50

Browse files
sumeerbholasumeerbhola
committed
kvserver,server: remove more RACv1 integration code
Informs #136529 Epic: none Release note: None
1 parent 24e1ef3 commit 46c3d50

24 files changed

+91
-1303
lines changed

‎docs/generated/metrics/metrics.yaml

Lines changed: 0 additions & 328 deletions
Original file line numberDiff line numberDiff line change
@@ -12589,334 +12589,6 @@ layers:
1258912589
unit: COUNT
1259012590
aggregation: AVG
1259112591
derivative: NON_NEGATIVE_DERIVATIVE
12592-
- name: kvadmission.flow_controller.elastic_blocked_stream_count
12593-
exported_name: kvadmission_flow_controller_elastic_blocked_stream_count
12594-
description: Number of replication streams with no flow tokens available for elastic requests
12595-
y_axis_label: Count
12596-
type: GAUGE
12597-
unit: COUNT
12598-
aggregation: AVG
12599-
derivative: NONE
12600-
- name: kvadmission.flow_controller.elastic_requests_admitted
12601-
exported_name: kvadmission_flow_controller_elastic_requests_admitted
12602-
description: Number of elastic requests admitted by the flow controller
12603-
y_axis_label: Requests
12604-
type: COUNTER
12605-
unit: COUNT
12606-
aggregation: AVG
12607-
derivative: NON_NEGATIVE_DERIVATIVE
12608-
- name: kvadmission.flow_controller.elastic_requests_bypassed
12609-
exported_name: kvadmission_flow_controller_elastic_requests_bypassed
12610-
description: Number of elastic waiting requests that bypassed the flow controller due to disconnecting streams
12611-
y_axis_label: Requests
12612-
type: COUNTER
12613-
unit: COUNT
12614-
aggregation: AVG
12615-
derivative: NON_NEGATIVE_DERIVATIVE
12616-
- name: kvadmission.flow_controller.elastic_requests_errored
12617-
exported_name: kvadmission_flow_controller_elastic_requests_errored
12618-
description: Number of elastic requests that errored out while waiting for flow tokens
12619-
y_axis_label: Requests
12620-
type: COUNTER
12621-
unit: COUNT
12622-
aggregation: AVG
12623-
derivative: NON_NEGATIVE_DERIVATIVE
12624-
- name: kvadmission.flow_controller.elastic_requests_waiting
12625-
exported_name: kvadmission_flow_controller_elastic_requests_waiting
12626-
description: Number of elastic requests waiting for flow tokens
12627-
y_axis_label: Requests
12628-
type: GAUGE
12629-
unit: COUNT
12630-
aggregation: AVG
12631-
derivative: NONE
12632-
- name: kvadmission.flow_controller.elastic_stream_count
12633-
exported_name: kvadmission_flow_controller_elastic_stream_count
12634-
description: Total number of replication streams for elastic requests
12635-
y_axis_label: Count
12636-
type: GAUGE
12637-
unit: COUNT
12638-
aggregation: AVG
12639-
derivative: NONE
12640-
- name: kvadmission.flow_controller.elastic_tokens_available
12641-
exported_name: kvadmission_flow_controller_elastic_tokens_available
12642-
description: Flow tokens available for elastic requests, across all replication streams
12643-
y_axis_label: Bytes
12644-
type: GAUGE
12645-
unit: BYTES
12646-
aggregation: AVG
12647-
derivative: NONE
12648-
- name: kvadmission.flow_controller.elastic_tokens_deducted
12649-
exported_name: kvadmission_flow_controller_elastic_tokens_deducted
12650-
description: Flow tokens deducted by elastic requests, across all replication streams
12651-
y_axis_label: Bytes
12652-
type: COUNTER
12653-
unit: BYTES
12654-
aggregation: AVG
12655-
derivative: NON_NEGATIVE_DERIVATIVE
12656-
- name: kvadmission.flow_controller.elastic_tokens_returned
12657-
exported_name: kvadmission_flow_controller_elastic_tokens_returned
12658-
description: Flow tokens returned by elastic requests, across all replication streams
12659-
y_axis_label: Bytes
12660-
type: COUNTER
12661-
unit: BYTES
12662-
aggregation: AVG
12663-
derivative: NON_NEGATIVE_DERIVATIVE
12664-
- name: kvadmission.flow_controller.elastic_tokens_unaccounted
12665-
exported_name: kvadmission_flow_controller_elastic_tokens_unaccounted
12666-
description: Flow tokens returned by elastic requests that were unaccounted for, across all replication streams
12667-
y_axis_label: Bytes
12668-
type: COUNTER
12669-
unit: BYTES
12670-
aggregation: AVG
12671-
derivative: NON_NEGATIVE_DERIVATIVE
12672-
- name: kvadmission.flow_controller.elastic_wait_duration
12673-
exported_name: kvadmission_flow_controller_elastic_wait_duration
12674-
description: Latency histogram for time elastic requests spent waiting for flow tokens
12675-
y_axis_label: Nanoseconds
12676-
type: HISTOGRAM
12677-
unit: NANOSECONDS
12678-
aggregation: AVG
12679-
derivative: NONE
12680-
- name: kvadmission.flow_controller.regular_blocked_stream_count
12681-
exported_name: kvadmission_flow_controller_regular_blocked_stream_count
12682-
description: Number of replication streams with no flow tokens available for regular requests
12683-
y_axis_label: Count
12684-
type: GAUGE
12685-
unit: COUNT
12686-
aggregation: AVG
12687-
derivative: NONE
12688-
- name: kvadmission.flow_controller.regular_requests_admitted
12689-
exported_name: kvadmission_flow_controller_regular_requests_admitted
12690-
description: Number of regular requests admitted by the flow controller
12691-
y_axis_label: Requests
12692-
type: COUNTER
12693-
unit: COUNT
12694-
aggregation: AVG
12695-
derivative: NON_NEGATIVE_DERIVATIVE
12696-
- name: kvadmission.flow_controller.regular_requests_bypassed
12697-
exported_name: kvadmission_flow_controller_regular_requests_bypassed
12698-
description: Number of regular waiting requests that bypassed the flow controller due to disconnecting streams
12699-
y_axis_label: Requests
12700-
type: COUNTER
12701-
unit: COUNT
12702-
aggregation: AVG
12703-
derivative: NON_NEGATIVE_DERIVATIVE
12704-
- name: kvadmission.flow_controller.regular_requests_errored
12705-
exported_name: kvadmission_flow_controller_regular_requests_errored
12706-
description: Number of regular requests that errored out while waiting for flow tokens
12707-
y_axis_label: Requests
12708-
type: COUNTER
12709-
unit: COUNT
12710-
aggregation: AVG
12711-
derivative: NON_NEGATIVE_DERIVATIVE
12712-
- name: kvadmission.flow_controller.regular_requests_waiting
12713-
exported_name: kvadmission_flow_controller_regular_requests_waiting
12714-
description: Number of regular requests waiting for flow tokens
12715-
y_axis_label: Requests
12716-
type: GAUGE
12717-
unit: COUNT
12718-
aggregation: AVG
12719-
derivative: NONE
12720-
- name: kvadmission.flow_controller.regular_stream_count
12721-
exported_name: kvadmission_flow_controller_regular_stream_count
12722-
description: Total number of replication streams for regular requests
12723-
y_axis_label: Count
12724-
type: GAUGE
12725-
unit: COUNT
12726-
aggregation: AVG
12727-
derivative: NONE
12728-
- name: kvadmission.flow_controller.regular_tokens_available
12729-
exported_name: kvadmission_flow_controller_regular_tokens_available
12730-
description: Flow tokens available for regular requests, across all replication streams
12731-
y_axis_label: Bytes
12732-
type: GAUGE
12733-
unit: BYTES
12734-
aggregation: AVG
12735-
derivative: NONE
12736-
- name: kvadmission.flow_controller.regular_tokens_deducted
12737-
exported_name: kvadmission_flow_controller_regular_tokens_deducted
12738-
description: Flow tokens deducted by regular requests, across all replication streams
12739-
y_axis_label: Bytes
12740-
type: COUNTER
12741-
unit: BYTES
12742-
aggregation: AVG
12743-
derivative: NON_NEGATIVE_DERIVATIVE
12744-
- name: kvadmission.flow_controller.regular_tokens_returned
12745-
exported_name: kvadmission_flow_controller_regular_tokens_returned
12746-
description: Flow tokens returned by regular requests, across all replication streams
12747-
y_axis_label: Bytes
12748-
type: COUNTER
12749-
unit: BYTES
12750-
aggregation: AVG
12751-
derivative: NON_NEGATIVE_DERIVATIVE
12752-
- name: kvadmission.flow_controller.regular_tokens_unaccounted
12753-
exported_name: kvadmission_flow_controller_regular_tokens_unaccounted
12754-
description: Flow tokens returned by regular requests that were unaccounted for, across all replication streams
12755-
y_axis_label: Bytes
12756-
type: COUNTER
12757-
unit: BYTES
12758-
aggregation: AVG
12759-
derivative: NON_NEGATIVE_DERIVATIVE
12760-
- name: kvadmission.flow_controller.regular_wait_duration
12761-
exported_name: kvadmission_flow_controller_regular_wait_duration
12762-
description: Latency histogram for time regular requests spent waiting for flow tokens
12763-
y_axis_label: Nanoseconds
12764-
type: HISTOGRAM
12765-
unit: NANOSECONDS
12766-
aggregation: AVG
12767-
derivative: NONE
12768-
- name: kvadmission.flow_handle.elastic_requests_admitted
12769-
exported_name: kvadmission_flow_handle_elastic_requests_admitted
12770-
description: Number of elastic requests admitted by the flow handle
12771-
y_axis_label: Requests
12772-
type: COUNTER
12773-
unit: COUNT
12774-
aggregation: AVG
12775-
derivative: NON_NEGATIVE_DERIVATIVE
12776-
- name: kvadmission.flow_handle.elastic_requests_errored
12777-
exported_name: kvadmission_flow_handle_elastic_requests_errored
12778-
description: Number of elastic requests that errored out while waiting for flow tokens, at the handle level
12779-
y_axis_label: Requests
12780-
type: COUNTER
12781-
unit: COUNT
12782-
aggregation: AVG
12783-
derivative: NON_NEGATIVE_DERIVATIVE
12784-
- name: kvadmission.flow_handle.elastic_requests_waiting
12785-
exported_name: kvadmission_flow_handle_elastic_requests_waiting
12786-
description: Number of elastic requests waiting for flow tokens, at the handle level
12787-
y_axis_label: Requests
12788-
type: GAUGE
12789-
unit: COUNT
12790-
aggregation: AVG
12791-
derivative: NONE
12792-
- name: kvadmission.flow_handle.elastic_wait_duration
12793-
exported_name: kvadmission_flow_handle_elastic_wait_duration
12794-
description: Latency histogram for time elastic requests spent waiting for flow tokens, at the handle level
12795-
y_axis_label: Nanoseconds
12796-
type: HISTOGRAM
12797-
unit: NANOSECONDS
12798-
aggregation: AVG
12799-
derivative: NONE
12800-
- name: kvadmission.flow_handle.regular_requests_admitted
12801-
exported_name: kvadmission_flow_handle_regular_requests_admitted
12802-
description: Number of regular requests admitted by the flow handle
12803-
y_axis_label: Requests
12804-
type: COUNTER
12805-
unit: COUNT
12806-
aggregation: AVG
12807-
derivative: NON_NEGATIVE_DERIVATIVE
12808-
- name: kvadmission.flow_handle.regular_requests_errored
12809-
exported_name: kvadmission_flow_handle_regular_requests_errored
12810-
description: Number of regular requests that errored out while waiting for flow tokens, at the handle level
12811-
y_axis_label: Requests
12812-
type: COUNTER
12813-
unit: COUNT
12814-
aggregation: AVG
12815-
derivative: NON_NEGATIVE_DERIVATIVE
12816-
- name: kvadmission.flow_handle.regular_requests_waiting
12817-
exported_name: kvadmission_flow_handle_regular_requests_waiting
12818-
description: Number of regular requests waiting for flow tokens, at the handle level
12819-
y_axis_label: Requests
12820-
type: GAUGE
12821-
unit: COUNT
12822-
aggregation: AVG
12823-
derivative: NONE
12824-
- name: kvadmission.flow_handle.regular_wait_duration
12825-
exported_name: kvadmission_flow_handle_regular_wait_duration
12826-
description: Latency histogram for time regular requests spent waiting for flow tokens, at the handle level
12827-
y_axis_label: Nanoseconds
12828-
type: HISTOGRAM
12829-
unit: NANOSECONDS
12830-
aggregation: AVG
12831-
derivative: NONE
12832-
- name: kvadmission.flow_handle.streams_connected
12833-
exported_name: kvadmission_flow_handle_streams_connected
12834-
description: Number of times we've connected to a stream, at the handle level
12835-
y_axis_label: Streams
12836-
type: COUNTER
12837-
unit: COUNT
12838-
aggregation: AVG
12839-
derivative: NON_NEGATIVE_DERIVATIVE
12840-
- name: kvadmission.flow_handle.streams_disconnected
12841-
exported_name: kvadmission_flow_handle_streams_disconnected
12842-
description: Number of times we've disconnected from a stream, at the handle level
12843-
y_axis_label: Streams
12844-
type: COUNTER
12845-
unit: COUNT
12846-
aggregation: AVG
12847-
derivative: NON_NEGATIVE_DERIVATIVE
12848-
- name: kvadmission.flow_token_dispatch.coalesced_elastic
12849-
exported_name: kvadmission_flow_token_dispatch_coalesced_elastic
12850-
description: Number of coalesced elastic flow token dispatches (where we're informing the sender of a higher log entry being admitted)
12851-
y_axis_label: Dispatches
12852-
type: COUNTER
12853-
unit: COUNT
12854-
aggregation: AVG
12855-
derivative: NON_NEGATIVE_DERIVATIVE
12856-
- name: kvadmission.flow_token_dispatch.coalesced_regular
12857-
exported_name: kvadmission_flow_token_dispatch_coalesced_regular
12858-
description: Number of coalesced regular flow token dispatches (where we're informing the sender of a higher log entry being admitted)
12859-
y_axis_label: Dispatches
12860-
type: COUNTER
12861-
unit: COUNT
12862-
aggregation: AVG
12863-
derivative: NON_NEGATIVE_DERIVATIVE
12864-
- name: kvadmission.flow_token_dispatch.local_elastic
12865-
exported_name: kvadmission_flow_token_dispatch_local_elastic
12866-
description: Number of local elastic flow token dispatches
12867-
y_axis_label: Dispatches
12868-
type: COUNTER
12869-
unit: COUNT
12870-
aggregation: AVG
12871-
derivative: NON_NEGATIVE_DERIVATIVE
12872-
- name: kvadmission.flow_token_dispatch.local_regular
12873-
exported_name: kvadmission_flow_token_dispatch_local_regular
12874-
description: Number of local regular flow token dispatches
12875-
y_axis_label: Dispatches
12876-
type: COUNTER
12877-
unit: COUNT
12878-
aggregation: AVG
12879-
derivative: NON_NEGATIVE_DERIVATIVE
12880-
- name: kvadmission.flow_token_dispatch.pending_elastic
12881-
exported_name: kvadmission_flow_token_dispatch_pending_elastic
12882-
description: Number of pending elastic flow token dispatches
12883-
y_axis_label: Dispatches
12884-
type: GAUGE
12885-
unit: COUNT
12886-
aggregation: AVG
12887-
derivative: NONE
12888-
- name: kvadmission.flow_token_dispatch.pending_nodes
12889-
exported_name: kvadmission_flow_token_dispatch_pending_nodes
12890-
description: Number of nodes pending flow token dispatches
12891-
y_axis_label: Nodes
12892-
type: GAUGE
12893-
unit: COUNT
12894-
aggregation: AVG
12895-
derivative: NONE
12896-
- name: kvadmission.flow_token_dispatch.pending_regular
12897-
exported_name: kvadmission_flow_token_dispatch_pending_regular
12898-
description: Number of pending regular flow token dispatches
12899-
y_axis_label: Dispatches
12900-
type: GAUGE
12901-
unit: COUNT
12902-
aggregation: AVG
12903-
derivative: NONE
12904-
- name: kvadmission.flow_token_dispatch.remote_elastic
12905-
exported_name: kvadmission_flow_token_dispatch_remote_elastic
12906-
description: Number of remote elastic flow token dispatches
12907-
y_axis_label: Dispatches
12908-
type: COUNTER
12909-
unit: COUNT
12910-
aggregation: AVG
12911-
derivative: NON_NEGATIVE_DERIVATIVE
12912-
- name: kvadmission.flow_token_dispatch.remote_regular
12913-
exported_name: kvadmission_flow_token_dispatch_remote_regular
12914-
description: Number of remote regular flow token dispatches
12915-
y_axis_label: Dispatches
12916-
type: COUNTER
12917-
unit: COUNT
12918-
aggregation: AVG
12919-
derivative: NON_NEGATIVE_DERIVATIVE
1292012592
- name: kvflowcontrol.eval_wait.elastic.duration
1292112593
exported_name: kvflowcontrol_eval_wait_elastic_duration
1292212594
description: Latency histogram for time elastic requests spent waiting for flow tokens to evaluate

‎pkg/inspectz/inspectz.go

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,34 +31,30 @@ const URLPrefix = "/inspectz/"
3131
type Server struct {
3232
log.AmbientContext
3333

34-
mux *http.ServeMux
35-
handlesV1, handlesV2 kvflowcontrol.InspectHandles
36-
kvflowControllerV1, kvflowControllerV2 kvflowcontrol.InspectController
37-
storeLiveness kvserver.InspectAllStoreLiveness
34+
mux *http.ServeMux
35+
handlesV2 kvflowcontrol.InspectHandles
36+
kvflowControllerV2 kvflowcontrol.InspectController
37+
storeLiveness kvserver.InspectAllStoreLiveness
3838
}
3939

4040
var _ inspectzpb.InspectzServer = &Server{}
4141

4242
// NewServer sets up an inspectz server.
4343
func NewServer(
4444
ambient log.AmbientContext,
45-
handlesV1, handlesV2 kvflowcontrol.InspectHandles,
46-
kvflowControllerV1, kvflowControllerV2 kvflowcontrol.InspectController,
45+
handlesV2 kvflowcontrol.InspectHandles,
46+
kvflowControllerV2 kvflowcontrol.InspectController,
4747
storeLiveness kvserver.InspectAllStoreLiveness,
4848
) *Server {
4949
mux := http.NewServeMux()
5050
server := &Server{
5151
AmbientContext: ambient,
5252

5353
mux: mux,
54-
handlesV1: handlesV1,
5554
handlesV2: handlesV2,
56-
kvflowControllerV1: kvflowControllerV1,
5755
kvflowControllerV2: kvflowControllerV2,
5856
storeLiveness: storeLiveness,
5957
}
60-
mux.Handle("/inspectz/v1/kvflowhandles", server.makeKVFlowHandlesHandler(server.KVFlowHandles))
61-
mux.Handle("/inspectz/v1/kvflowcontroller", server.makeKVFlowControllerHandler(server.KVFlowController))
6258
mux.Handle("/inspectz/v2/kvflowhandles", server.makeKVFlowHandlesHandler(server.KVFlowHandlesV2))
6359
mux.Handle("/inspectz/v2/kvflowcontroller", server.makeKVFlowControllerHandler(server.KVFlowControllerV2))
6460
mux.Handle(
@@ -134,20 +130,6 @@ func (s *Server) makeStoreLivenessHandler(
134130
}
135131
}
136132

137-
// KVFlowController implements the InspectzServer interface.
138-
func (s *Server) KVFlowController(
139-
ctx context.Context, request *kvflowinspectpb.ControllerRequest,
140-
) (*kvflowinspectpb.ControllerResponse, error) {
141-
return kvFlowController(ctx, request, s.kvflowControllerV1)
142-
}
143-
144-
// KVFlowHandles implements the InspectzServer interface.
145-
func (s *Server) KVFlowHandles(
146-
ctx context.Context, request *kvflowinspectpb.HandlesRequest,
147-
) (*kvflowinspectpb.HandlesResponse, error) {
148-
return kvFlowHandles(ctx, request, s.handlesV1)
149-
}
150-
151133
// KVFlowControllerV2 implements the InspectzServer interface.
152134
func (s *Server) KVFlowControllerV2(
153135
ctx context.Context, request *kvflowinspectpb.ControllerRequest,

0 commit comments

Comments
 (0)