Skip to content

Commit 4ee3b72

Browse files
committed
adapter: mz_dataflow_shutdown_durations_histogram
This commit adds a new `mz_dataflow_shutdown_durations_histogram_raw` introspection source, as well as convenience views on top of it. The new source and views follow the existing conventions of `mz_peek_durations_histogram_raw`, which has the same format.
1 parent c7ee83e commit 4ee3b72

File tree

7 files changed

+62
-7
lines changed

7 files changed

+62
-7
lines changed

src/adapter/src/catalog/builtin.rs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,6 +1297,12 @@ pub const MZ_PEEK_DURATIONS_HISTOGRAM_RAW: BuiltinLog = BuiltinLog {
12971297
variant: LogVariant::Compute(ComputeLog::PeekDuration),
12981298
};
12991299

1300+
pub const MZ_DATAFLOW_SHUTDOWN_DURATIONS_HISTOGRAM_RAW: BuiltinLog = BuiltinLog {
1301+
name: "mz_dataflow_shutdown_durations_histogram_raw",
1302+
schema: MZ_INTERNAL_SCHEMA,
1303+
variant: LogVariant::Compute(ComputeLog::ShutdownDuration),
1304+
};
1305+
13001306
pub const MZ_ARRANGEMENT_HEAP_SIZE_RAW: BuiltinLog = BuiltinLog {
13011307
name: "mz_arrangement_heap_size_raw",
13021308
schema: MZ_INTERNAL_SCHEMA,
@@ -2639,6 +2645,28 @@ FROM mz_internal.mz_peek_durations_histogram_per_worker
26392645
GROUP BY duration_ns",
26402646
};
26412647

2648+
pub const MZ_DATAFLOW_SHUTDOWN_DURATIONS_HISTOGRAM_PER_WORKER: BuiltinView = BuiltinView {
2649+
name: "mz_dataflow_shutdown_durations_histogram_per_worker",
2650+
schema: MZ_INTERNAL_SCHEMA,
2651+
sql: "CREATE VIEW mz_internal.mz_dataflow_shutdown_durations_histogram_per_worker AS SELECT
2652+
worker_id, duration_ns, pg_catalog.count(*) AS count
2653+
FROM
2654+
mz_internal.mz_dataflow_shutdown_durations_histogram_raw
2655+
GROUP BY
2656+
worker_id, duration_ns",
2657+
};
2658+
2659+
pub const MZ_DATAFLOW_SHUTDOWN_DURATIONS_HISTOGRAM: BuiltinView = BuiltinView {
2660+
name: "mz_dataflow_shutdown_durations_histogram",
2661+
schema: MZ_INTERNAL_SCHEMA,
2662+
sql: "CREATE VIEW mz_internal.mz_dataflow_shutdown_durations_histogram AS
2663+
SELECT
2664+
duration_ns,
2665+
pg_catalog.sum(count) AS count
2666+
FROM mz_internal.mz_dataflow_shutdown_durations_histogram_per_worker
2667+
GROUP BY duration_ns",
2668+
};
2669+
26422670
pub const MZ_SCHEDULING_ELAPSED_PER_WORKER: BuiltinView = BuiltinView {
26432671
name: "mz_scheduling_elapsed_per_worker",
26442672
schema: MZ_INTERNAL_SCHEMA,
@@ -3760,6 +3788,7 @@ pub static BUILTINS_STATIC: Lazy<Vec<Builtin<NameReference>>> = Lazy::new(|| {
37603788
Builtin::Log(&MZ_MESSAGE_COUNTS_SENT_RAW),
37613789
Builtin::Log(&MZ_ACTIVE_PEEKS_PER_WORKER),
37623790
Builtin::Log(&MZ_PEEK_DURATIONS_HISTOGRAM_RAW),
3791+
Builtin::Log(&MZ_DATAFLOW_SHUTDOWN_DURATIONS_HISTOGRAM_RAW),
37633792
Builtin::Log(&MZ_ARRANGEMENT_HEAP_CAPACITY_RAW),
37643793
Builtin::Log(&MZ_ARRANGEMENT_HEAP_ALLOCATIONS_RAW),
37653794
Builtin::Log(&MZ_ARRANGEMENT_HEAP_SIZE_RAW),
@@ -3848,6 +3877,8 @@ pub static BUILTINS_STATIC: Lazy<Vec<Builtin<NameReference>>> = Lazy::new(|| {
38483877
Builtin::View(&MZ_RECORDS_PER_DATAFLOW),
38493878
Builtin::View(&MZ_PEEK_DURATIONS_HISTOGRAM_PER_WORKER),
38503879
Builtin::View(&MZ_PEEK_DURATIONS_HISTOGRAM),
3880+
Builtin::View(&MZ_DATAFLOW_SHUTDOWN_DURATIONS_HISTOGRAM_PER_WORKER),
3881+
Builtin::View(&MZ_DATAFLOW_SHUTDOWN_DURATIONS_HISTOGRAM),
38513882
Builtin::View(&MZ_SCHEDULING_ELAPSED_PER_WORKER),
38523883
Builtin::View(&MZ_SCHEDULING_ELAPSED),
38533884
Builtin::View(&MZ_SCHEDULING_PARKS_HISTOGRAM_PER_WORKER),

test/sqllogictest/cluster.slt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@ bar mz_dataflow_operator_reachability_raw mz_dataflow_operator_reachability_ra
201201
bar mz_dataflow_operator_reachability_raw mz_dataflow_operator_reachability_raw_u6_primary_idx 5 time NULL true
202202
bar mz_dataflow_operators_per_worker mz_dataflow_operators_per_worker_u6_primary_idx 1 id NULL false
203203
bar mz_dataflow_operators_per_worker mz_dataflow_operators_per_worker_u6_primary_idx 2 worker_id NULL false
204+
bar mz_dataflow_shutdown_durations_histogram_raw mz_dataflow_shutdown_durations_histogram_raw_u6_primary_idx 1 worker_id NULL false
205+
bar mz_dataflow_shutdown_durations_histogram_raw mz_dataflow_shutdown_durations_histogram_raw_u6_primary_idx 2 duration_ns NULL false
204206
bar mz_message_counts_received_raw mz_message_counts_received_raw_u6_primary_idx 1 channel_id NULL false
205207
bar mz_message_counts_received_raw mz_message_counts_received_raw_u6_primary_idx 2 from_worker_id NULL false
206208
bar mz_message_counts_received_raw mz_message_counts_received_raw_u6_primary_idx 3 to_worker_id NULL false
@@ -360,11 +362,10 @@ DROP CLUSTER foo, foo2, foo3, foo4 CASCADE
360362

361363
# Test that introspection source indexes are created and dropped correctly
362364

363-
# There are 19 introspection sources
364365
query I
365366
SELECT COUNT(name) FROM mz_indexes WHERE cluster_id = 'u1';
366367
----
367-
22
368+
23
368369

369370
query I
370371
SELECT COUNT(name) FROM mz_indexes WHERE cluster_id <> 'u1' AND cluster_id NOT LIKE 's%';
@@ -377,15 +378,15 @@ CREATE CLUSTER test REPLICAS (foo (SIZE '1'));
377378
query I
378379
SELECT COUNT(name) FROM mz_indexes;
379380
----
380-
110
381+
114
381382

382383
statement ok
383384
DROP CLUSTER test CASCADE
384385

385386
query T
386387
SELECT COUNT(name) FROM mz_indexes;
387388
----
388-
88
389+
91
389390

390391
statement error nvalid SIZE: must provide a string value
391392
CREATE CLUSTER REPLICA default.size_1 SIZE;

test/sqllogictest/information_schema_tables.slt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,18 @@ mz_dataflow_operators_per_worker
377377
SOURCE
378378
materialize
379379
mz_internal
380+
mz_dataflow_shutdown_durations_histogram
381+
VIEW
382+
materialize
383+
mz_internal
384+
mz_dataflow_shutdown_durations_histogram_per_worker
385+
VIEW
386+
materialize
387+
mz_internal
388+
mz_dataflow_shutdown_durations_histogram_raw
389+
SOURCE
390+
materialize
391+
mz_internal
380392
mz_dataflows
381393
VIEW
382394
materialize

test/testdrive/catalog.td

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,7 @@ mz_dataflow_addresses_per_worker log <null>
530530
mz_dataflow_channels_per_worker log <null>
531531
mz_dataflow_operator_reachability_raw log <null>
532532
mz_dataflow_operators_per_worker log <null>
533+
mz_dataflow_shutdown_durations_histogram_raw log <null>
533534
mz_message_counts_received_raw log <null>
534535
mz_message_counts_sent_raw log <null>
535536
mz_peek_durations_histogram_raw log <null>
@@ -577,17 +578,19 @@ mz_compute_import_frontiers
577578
mz_compute_operator_durations_histogram
578579
mz_compute_operator_durations_histogram_per_worker
579580
mz_dataflow_addresses
581+
mz_dataflow_arrangement_sizes
580582
mz_dataflow_channel_operators
581583
mz_dataflow_channel_operators_per_worker
582584
mz_dataflow_channels
583585
mz_dataflow_operator_dataflows
584586
mz_dataflow_operator_dataflows_per_worker
585587
mz_dataflow_operator_parents
586588
mz_dataflow_operator_parents_per_worker
587-
mz_dataflow_arrangement_sizes
588589
mz_dataflow_operator_reachability
589590
mz_dataflow_operator_reachability_per_worker
590591
mz_dataflow_operators
592+
mz_dataflow_shutdown_durations_histogram
593+
mz_dataflow_shutdown_durations_histogram_per_worker
591594
mz_dataflows
592595
mz_dataflows_per_worker
593596
mz_message_counts
@@ -625,7 +628,7 @@ test_table
625628

626629
# There is one entry in mz_indexes for each field_number/expression of the index.
627630
> SELECT COUNT(id) FROM mz_indexes WHERE id LIKE 's%'
628-
88
631+
91
629632

630633
# Create a second schema with the same table name as above
631634
> CREATE SCHEMA tester2

test/testdrive/divergent-dataflow-cancellation.td

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ contains: canceling statement due to statement timeout
9393
> SELECT count(*)
9494
FROM mz_internal.mz_compute_frontiers_per_worker
9595
WHERE worker_id = 0
96-
22
96+
23
9797

9898
> SELECT count(*) FROM mz_internal.mz_compute_import_frontiers_per_worker
9999
0
@@ -113,6 +113,10 @@ contains: canceling statement due to statement timeout
113113
> SELECT count(*) FROM mz_internal.mz_dataflow_operators_per_worker
114114
0
115115

116+
# This source never sees retractions.
117+
> SELECT count(*) > 0 FROM mz_internal.mz_dataflow_shutdown_durations_histogram_raw
118+
true
119+
116120
> SELECT count(*) FROM mz_internal.mz_message_counts_received_raw
117121
0
118122

test/testdrive/indexes.td

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ mz_dataflow_addresses_per_worker_s2_primary_idx mz_dataflow_addresse
308308
mz_dataflow_channels_per_worker_s2_primary_idx mz_dataflow_channels_per_worker mz_introspection {id,worker_id}
309309
mz_dataflow_operator_reachability_raw_s2_primary_idx mz_dataflow_operator_reachability_raw mz_introspection {address,port,worker_id,update_type,time}
310310
mz_dataflow_operators_per_worker_s2_primary_idx mz_dataflow_operators_per_worker mz_introspection {id,worker_id}
311+
mz_dataflow_shutdown_durations_histogram_raw_s2_primary_idx mz_dataflow_shutdown_durations_histogram_raw mz_introspection {worker_id,duration_ns}
311312
mz_message_counts_received_raw_s2_primary_idx mz_message_counts_received_raw mz_introspection {channel_id,from_worker_id,to_worker_id}
312313
mz_message_counts_sent_raw_s2_primary_idx mz_message_counts_sent_raw mz_introspection {channel_id,from_worker_id,to_worker_id}
313314
mz_peek_durations_histogram_raw_s2_primary_idx mz_peek_durations_histogram_raw mz_introspection {worker_id,duration_ns}

test/testdrive/logging.td

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ $ set-regex match=s\d+ replacement=SID
7575
> SELECT count(*) FROM (SELECT count (*) FROM mz_internal.mz_peek_durations_histogram);
7676
1
7777

78+
> SELECT count(*) FROM (SELECT count (*) FROM mz_internal.mz_dataflow_shutdown_durations_histogram);
79+
1
80+
7881
> SELECT count(*) FROM (SELECT count (*) FROM mz_internal.mz_records_per_dataflow);
7982
1
8083

0 commit comments

Comments
 (0)