Skip to content

Commit eedb620

Browse files
mkeetermkeeter
authored
Remove IOStateCount::new (#1468)
Now that `IOState::New` is gone, we can remove it from the counters and DTrace scripts.
1 parent c453fe9 commit eedb620

File tree

7 files changed

+31
-63
lines changed

7 files changed

+31
-63
lines changed

‎cmon/src/main.rs

-7
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ fn print_dtrace_header(dd: &[DtraceDisplay]) {
206206
print!(" {:>5}", "DSW");
207207
}
208208
DtraceDisplay::IoCount | DtraceDisplay::IoSummary => {
209-
print!(" {:>5} {:>5} {:>5}", "NEW0", "NEW1", "NEW2");
210209
print!(" {:>5} {:>5} {:>5}", "IP0", "IP1", "IP2");
211210
print!(" {:>5} {:>5} {:>5}", "D0", "D1", "D2");
212211
print!(" {:>5} {:>5} {:>5}", "S0", "S1", "S2");
@@ -272,12 +271,6 @@ fn print_dtrace_row(d_out: Arg, dd: &[DtraceDisplay], last_job_id: &mut u64) {
272271
print!(" {:5}", d_out.ds_count);
273272
}
274273
DtraceDisplay::IoCount | DtraceDisplay::IoSummary => {
275-
print!(
276-
" {:5} {:5} {:5}",
277-
d_out.ds_io_count.new[ClientId::new(0)],
278-
d_out.ds_io_count.new[ClientId::new(1)],
279-
d_out.ds_io_count.new[ClientId::new(2)],
280-
);
281274
print!(
282275
" {:5} {:5} {:5}",
283276
d_out.ds_io_count.in_progress[ClientId::new(0)],

‎tools/dtrace/README.md

+31-31
Original file line numberDiff line numberDiff line change
@@ -392,17 +392,17 @@ only that PID. See upstairs_info.d for a description of the columns.
392392

393393
```
394394
EVT22200005 # dtrace -s single_up_info.d 15579
395-
SESSION DS STATE 0 DS STATE 1 DS STATE 2 UPW DSW NEXT_JOB BAKPR WRITE_BO NEW0 NEW1 NEW2 IP0 IP1 IP2 D0 D1 D2 S0 S1 S2 ER0 ER1 ER2 EC0 EC1 EC2
396-
c0b92059 live_repair active active 3 435 570215 2761 226492416 0 0 0 40 241 241 24 194 194 371 0 0 9384 0 0 0 0 0
397-
a666a8bd live_repair active active 2 3 90656 0 0 0 0 0 2 1 1 1 2 2 0 0 0 7561 0 0 11640 0 0
398-
a666a8bd live_repair active active 2 11 90664 0 0 0 0 0 2 1 1 9 10 10 0 0 0 7563 0 0 11640 0 0
399-
c0b92059 live_repair active active 3 514 570762 3111 237219840 0 0 0 67 234 234 33 280 280 414 0 0 9385 0 0 0 0 0
400-
c0b92059 live_repair active active 3 329 571129 2929 231735296 0 0 0 1 227 251 59 102 78 269 0 0 9386 0 0 0 0 0
401-
a666a8bd live_repair active active 2 19 90672 0 0 0 0 0 2 1 1 17 18 18 0 0 0 7565 0 0 11640 0 0
402-
c0b92059 live_repair active active 3 339 571544 512 127401984 0 0 0 1 139 137 54 200 202 284 0 0 9387 0 0 0 0 0
403-
a666a8bd live_repair active active 2 23 90676 0 0 0 0 0 2 1 1 21 22 22 0 0 0 7566 0 0 11640 0 0
404-
c0b92059 live_repair active active 3 389 572038 221 101711872 0 0 0 1 112 112 67 277 277 321 0 0 9388 0 0 0 0 0
405-
a666a8bd live_repair active active 2 31 90684 0 0 0 0 0 2 1 1 29 30 30 0 0 0 7568 0 0 11640 0 0
395+
SESSION DS STATE 0 DS STATE 1 DS STATE 2 UPW DSW NEXT_JOB BAKPR WRITE_BO IP0 IP1 IP2 D0 D1 D2 S0 S1 S2 ER0 ER1 ER2 EC0 EC1 EC2
396+
c0b92059 live_repair active active 3 435 570215 2761 226492416 40 241 241 24 194 194 371 0 0 9384 0 0 0 0 0
397+
a666a8bd live_repair active active 2 3 90656 0 0 2 1 1 1 2 2 0 0 0 7561 0 0 11640 0 0
398+
a666a8bd live_repair active active 2 11 90664 0 0 2 1 1 9 10 10 0 0 0 7563 0 0 11640 0 0
399+
c0b92059 live_repair active active 3 514 570762 3111 237219840 67 234 234 33 280 280 414 0 0 9385 0 0 0 0 0
400+
c0b92059 live_repair active active 3 329 571129 2929 231735296 1 227 251 59 102 78 269 0 0 9386 0 0 0 0 0
401+
a666a8bd live_repair active active 2 19 90672 0 0 2 1 1 17 18 18 0 0 0 7565 0 0 11640 0 0
402+
c0b92059 live_repair active active 3 339 571544 512 127401984 1 139 137 54 200 202 284 0 0 9387 0 0 0 0 0
403+
a666a8bd live_repair active active 2 23 90676 0 0 2 1 1 21 22 22 0 0 0 7566 0 0 11640 0 0
404+
c0b92059 live_repair active active 3 389 572038 221 101711872 1 112 112 67 277 277 321 0 0 9388 0 0 0 0 0
405+
a666a8bd live_repair active active 2 31 90684 0 0 2 1 1 29 30 30 0 0 0 7568 0 0 11640 0 0
406406
```
407407
## sled_upstairs_info.d
408408
Similar to upstairs_info.d, this script prints out various counters in
@@ -413,19 +413,19 @@ reporting stats for.
413413

414414
```
415415
EVT22200005 # dtrace -s sled_upstairs_info.d
416-
PID SESSION DS STATE 0 DS STATE 1 DS STATE 2 UPW DSW NEXT_JOB BAKPR WRITE_BO NEW0 NEW1 NEW2 IP0 IP1 IP2 D0 D1 D2 S0 S1 S2 ER0 ER1 ER2 EC0 EC1 EC2
417-
15579 c0b92059 live_repair active active 3 367 656347 1616 185597952 0 0 0 75 195 195 69 172 172 223 0 0 9589 0 0 0 0 0
418-
15579 a666a8bd live_repair active active 2 95 91960 0 0 0 0 0 2 1 1 93 94 94 0 0 0 7827 0 0 11667 0 0
419-
24948 fac8cbba new new new 0 0 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
420-
24948 fac8cbba new new new 0 0 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
421-
24948 79d92ceb active active active 0 0 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
422-
15579 c0b92059 live_repair active active 3 432 656863 2077 203423744 0 0 0 104 168 168 68 264 264 260 0 0 9590 0 0 0 0 0
423-
15579 a666a8bd live_repair active active 2 99 91964 0 0 0 0 0 2 1 1 97 98 98 0 0 0 7828 0 0 11667 0 0
424-
24948 127b8de5 new new new 0 0 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
425-
24948 fac8cbba new new new 0 0 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
426-
24948 79d92ceb active active active 0 0 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
427-
15579 c0b92059 live_repair active active 4 529 657227 4805 282066944 0 0 0 95 296 296 80 233 233 354 0 0 9591 0 0 0 0 0
428-
15579 a666a8bd live_repair active active 2 107 91972 0 0 0 0 0 2 1 1 105 106 106 0 0 0 7830 0 0 11667 0 0
416+
PID SESSION DS STATE 0 DS STATE 1 DS STATE 2 UPW DSW NEXT_JOB BAKPR WRITE_BO IP0 IP1 IP2 D0 D1 D2 S0 S1 S2 ER0 ER1 ER2 EC0 EC1 EC2
417+
15579 c0b92059 live_repair active active 3 367 656347 1616 185597952 75 195 195 69 172 172 223 0 0 9589 0 0 0 0 0
418+
15579 a666a8bd live_repair active active 2 95 91960 0 0 2 1 1 93 94 94 0 0 0 7827 0 0 11667 0 0
419+
24948 fac8cbba new new new 0 0 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
420+
24948 fac8cbba new new new 0 0 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
421+
24948 79d92ceb active active active 0 0 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
422+
15579 c0b92059 live_repair active active 3 432 656863 2077 203423744 104 168 168 68 264 264 260 0 0 9590 0 0 0 0 0
423+
15579 a666a8bd live_repair active active 2 99 91964 0 0 2 1 1 97 98 98 0 0 0 7828 0 0 11667 0 0
424+
24948 127b8de5 new new new 0 0 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
425+
24948 fac8cbba new new new 0 0 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
426+
24948 79d92ceb active active active 0 0 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
427+
15579 c0b92059 live_repair active active 4 529 657227 4805 282066944 95 296 296 80 233 233 354 0 0 9591 0 0 0 0 0
428+
15579 a666a8bd live_repair active active 2 107 91972 0 0 2 1 1 105 106 106 0 0 0 7830 0 0 11667 0 0
429429
430430
```
431431

@@ -509,13 +509,13 @@ for the `Error` state which we don't print.
509509
Here is an example of how it might look:
510510
```
511511
alan@cat:crucible$ pfexec dtrace -s upstairs_info.d
512-
PID DS STATE 0 DS STATE 1 DS STATE 2 UPW DSW DELTA BAKPR WRITE_BO NEW0 NEW1 NEW2 IP0 IP1 IP2 D0 D1 D2 S0 S1 S2
513-
1546 active active active 9 165 303 81 82837504 0 0 0 26 17 152 139 148 13 0 0 0
514-
1546 active active active 7 158 314 33 72351744 0 0 0 32 15 137 126 143 21 0 0 0
515-
1546 active active active 7 177 327 3 59768832 0 0 0 28 12 113 149 165 64 0 0 0
516-
1546 active active active 5 154 315 20 68157440 0 0 0 21 11 121 133 143 33 0 0 0
517-
1546 active active active 7 184 364 0 55574528 0 0 0 15 12 101 169 172 83 0 0 0
518-
1546 active active active 7 192 362 0 46155264 0 0 0 26 10 95 166 182 97 0 0 0
512+
PID DS STATE 0 DS STATE 1 DS STATE 2 UPW DSW DELTA BAKPR WRITE_BO IP0 IP1 IP2 D0 D1 D2 S0 S1 S2
513+
1546 active active active 9 165 303 81 82837504 26 17 152 139 148 13 0 0 0
514+
1546 active active active 7 158 314 33 72351744 32 15 137 126 143 21 0 0 0
515+
1546 active active active 7 177 327 3 59768832 28 12 113 149 165 64 0 0 0
516+
1546 active active active 5 154 315 20 68157440 21 11 121 133 143 33 0 0 0
517+
1546 active active active 7 184 364 0 55574528 15 12 101 169 172 83 0 0 0
518+
1546 active active active 7 192 362 0 46155264 26 10 95 166 182 97 0 0 0
519519
```
520520

521521
## upstairs_count.d

‎tools/dtrace/single_up_info.d

-8
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ tick-1s
2222
printf("%17s %17s %17s", "DS STATE 0", "DS STATE 1", "DS STATE 2");
2323
printf(" %5s %5s %9s %5s", "UPW", "DSW", "NEXT_JOB", "BAKPR");
2424
printf(" %10s", "WRITE_BO");
25-
printf(" %5s %5s %5s", "NEW0", "NEW1", "NEW2");
2625
printf(" %5s %5s %5s", "IP0", "IP1", "IP2");
2726
printf(" %5s %5s %5s", "D0", "D1", "D2");
2827
printf(" %5s %5s %5s", "S0", "S1", "S2");
@@ -66,13 +65,6 @@ crucible_upstairs*:::up-status
6665
json(copyinstr(arg1), "ok.up_backpressure"),
6766
json(copyinstr(arg1), "ok.write_bytes_out"),
6867

69-
/*
70-
* New jobs on the work list for each downstairs
71-
*/
72-
json(copyinstr(arg1), "ok.ds_io_count.new[0]"),
73-
json(copyinstr(arg1), "ok.ds_io_count.new[1]"),
74-
json(copyinstr(arg1), "ok.ds_io_count.new[2]"),
75-
7668
/*
7769
* In progress jobs on the work list for each downstairs
7870
*/

‎tools/dtrace/sled_upstairs_info.d

-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ tick-1s
2727
printf("%17s %17s %17s", "DS STATE 0", "DS STATE 1", "DS STATE 2");
2828
printf(" %5s %5s %9s %5s", "UPW", "DSW", "NEXT_JOB", "BAKPR");
2929
printf(" %10s", "WRITE_BO");
30-
printf(" %5s %5s %5s", "NEW0", "NEW1", "NEW2");
3130
printf(" %5s %5s %5s", "IP0", "IP1", "IP2");
3231
printf(" %5s %5s %5s", "D0", "D1", "D2");
3332
printf(" %5s %5s %5s", "S0", "S1", "S2");
@@ -66,11 +65,6 @@ crucible_upstairs*:::up-status
6665
json(copyinstr(arg1), "ok.up_backpressure"),
6766
json(copyinstr(arg1), "ok.write_bytes_out"),
6867

69-
/* New jobs on the work list for each downstairs */
70-
json(copyinstr(arg1), "ok.ds_io_count.new[0]"),
71-
json(copyinstr(arg1), "ok.ds_io_count.new[1]"),
72-
json(copyinstr(arg1), "ok.ds_io_count.new[2]"),
73-
7468
/* In progress jobs on the work list for each downstairs */
7569
json(copyinstr(arg1), "ok.ds_io_count.in_progress[0]"),
7670
json(copyinstr(arg1), "ok.ds_io_count.in_progress[1]"),

‎tools/dtrace/upstairs_info.d

-9
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ tick-1s
2323
printf("%17s %17s %17s", "DS STATE 0", "DS STATE 1", "DS STATE 2");
2424
printf(" %5s %5s %9s %5s", "UPW", "DSW", "JOBID", "BAKPR");
2525
printf(" %10s", "WRITE_BO");
26-
printf(" %5s %5s %5s", "NEW0", "NEW1", "NEW2");
2726
printf(" %5s %5s %5s", "IP0", "IP1", "IP2");
2827
printf(" %5s %5s %5s", "D0", "D1", "D2");
2928
printf(" %5s %5s %5s", "S0", "S1", "S2");
@@ -56,14 +55,6 @@ crucible_upstairs*:::up-status
5655
printf(" %5s", json(copyinstr(arg1), "ok.up_backpressure"));
5756
printf(" %10s", json(copyinstr(arg1), "ok.write_bytes_out"));
5857

59-
/*
60-
* New jobs on the work list for each downstairs
61-
*/
62-
printf(" ");
63-
printf(" %5s", json(copyinstr(arg1), "ok.ds_io_count.new[0]"));
64-
printf(" %5s", json(copyinstr(arg1), "ok.ds_io_count.new[1]"));
65-
printf(" %5s", json(copyinstr(arg1), "ok.ds_io_count.new[2]"));
66-
6758
/*
6859
* In progress jobs on the work list for each downstairs
6960
*/

‎upstairs/src/downstairs.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2826,7 +2826,6 @@ impl Downstairs {
28262826
ClientData([g(d[0]), g(d[1]), g(d[2])])
28272827
};
28282828
IOStateCount {
2829-
new: f(|d| d.new),
28302829
in_progress: f(|d| d.in_progress),
28312830
done: f(|d| d.done),
28322831
skipped: f(|d| d.skipped),

‎upstairs/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1461,7 +1461,6 @@ impl ClientIOStateCount {
14611461

14621462
#[derive(Debug, Copy, Clone, Serialize, Deserialize)]
14631463
pub struct IOStateCount {
1464-
pub new: ClientData<u32>,
14651464
pub in_progress: ClientData<u32>,
14661465
pub done: ClientData<u32>,
14671466
pub skipped: ClientData<u32>,

0 commit comments

Comments
 (0)