Skip to content

Commit d178f65

Browse files
committed
Merge branch 'master' into kjacque/ddb-vospath
Features: recovery ddb_cmd
2 parents 04349e7 + faf28dc commit d178f65

31 files changed

+1086
-288
lines changed

docs/QSG/setup_rhel.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,8 @@ Examples are available on [github](https://github.com/daos-stack/daos/tree/maste
377377
pdsh -S -w $SERVER_NODES "sudo systemctl status daos_server"
378378

379379
# if you see following format messages (depending on number of servers), proceed to storage format
380-
server-1: server-1.test.hpdd.intel.com INFO 2023/04/11 23:14:06 SCM format required on instance 1
381-
server-1: server-1.test.hpdd.intel.com INFO 2023/04/11 23:14:06 SCM format required on instance 0
380+
server-1: server-1.test.example.com INFO 2023/04/11 23:14:06 SCM format required on instance 1
381+
server-1: server-1.test.example.com INFO 2023/04/11 23:14:06 SCM format required on instance 0
382382

383383
# format storage
384384
dmg storage format -l $SERVER_NODES # can use --force if needed
@@ -391,10 +391,10 @@ Examples are available on [github](https://github.com/daos-stack/daos/tree/maste
391391
# all the server ranks should show 'Joined' STATE
392392
Rank UUID Control Address Fault Domain State Reason
393393
---- ---- --------------- ------------ ----- ------
394-
0 604c4ffa-563a-49dc-b702-3c87293dbcf3 10.8.1.179:10001 /server-1.test.hpdd.intel.com Joined
395-
1 f0791f98-4379-4ace-a083-6ca3ffa65756 10.8.1.179:10001 /server-1.test.hpdd.intel.com Joined
396-
2 745d2a5b-46dd-42c5-b90a-d2e46e178b3e 10.8.1.189:10001 /server-2.test.hpdd.intel.com Joined
397-
3 ba6a7800-3952-46ce-af92-bba9daa35048 10.8.1.189:10001 /server-2.test.hpdd.intel.com Joined
394+
0 604c4ffa-563a-49dc-b702-3c87293dbcf3 10.8.1.179:10001 /server-1.test.example.com Joined
395+
1 f0791f98-4379-4ace-a083-6ca3ffa65756 10.8.1.179:10001 /server-1.test.example.com Joined
396+
2 745d2a5b-46dd-42c5-b90a-d2e46e178b3e 10.8.1.189:10001 /server-2.test.example.com Joined
397+
3 ba6a7800-3952-46ce-af92-bba9daa35048 10.8.1.189:10001 /server-2.test.example.com Joined
398398

399399

400400
## Start the DAOS Agents

docs/QSG/setup_suse.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ Examples are available on [github](https://github.com/daos-stack/daos/tree/maste
394394
pdsh -S -w $SERVER_NODES "sudo systemctl status daos_server"
395395

396396
# if you see following format messages (depending on number of servers), proceed to storage format
397-
node-4: node-1.test.hpdd.intel.com INFO 2023/04/11 23:14:06 SCM format required on instance 0
397+
node-4: node-1.test.example.com INFO 2023/04/11 23:14:06 SCM format required on instance 0
398398

399399
# format storage
400400
dmg storage format -l $SERVER_NODES # can use --force if needed
@@ -407,10 +407,10 @@ Examples are available on [github](https://github.com/daos-stack/daos/tree/maste
407407
# all the server ranks should show 'Joined' STATE
408408
Rank UUID Control Address Fault Domain State Reason
409409
---- ---- --------------- ------------ ----- ------
410-
0 604c4ffa-563a-49dc-b702-3c87293dbcf3 10.8.1.179:10001 /node-4.test.hpdd.intel.com Joined
411-
1 f0791f98-4379-4ace-a083-6ca3ffa65756 10.8.1.179:10001 /node-4.test.hpdd.intel.com Joined
412-
2 745d2a5b-46dd-42c5-b90a-d2e46e178b3e 10.8.1.189:10001 /node-5.test.hpdd.intel.com Joined
413-
3 ba6a7800-3952-46ce-af92-bba9daa35048 10.8.1.189:10001 /node-5.test.hpdd.intel.com Joined
410+
0 604c4ffa-563a-49dc-b702-3c87293dbcf3 10.8.1.179:10001 /node-4.test.example.com Joined
411+
1 f0791f98-4379-4ace-a083-6ca3ffa65756 10.8.1.179:10001 /node-4.test.example.com Joined
412+
2 745d2a5b-46dd-42c5-b90a-d2e46e178b3e 10.8.1.189:10001 /node-5.test.example.com Joined
413+
3 ba6a7800-3952-46ce-af92-bba9daa35048 10.8.1.189:10001 /node-5.test.example.com Joined
414414

415415
## Start the DAOS Agents
416416

docs/QSG/tour.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ bring-up DAOS servers and clients.
153153
IOR-3.4.0+dev: MPI Coordinated Test of Parallel I/O
154154
Began : Fri Apr 16 18:07:56 2021
155155
Command line : ior -a POSIX -b 26214400 -v -w -k -i 1 -o /tmp/daos_test1/testfile -t 25M
156-
Machine : Linux boro-8.boro.hpdd.intel.com
156+
Machine : Linux boro-8.boro.example.com
157157
Start time skew across all tasks: 0.00 sec
158158
TestID : 0
159159
StartTime : Fri Apr 16 18:07:56 2021
@@ -358,19 +358,19 @@ bring-up DAOS servers and clients.
358358
$ dmg system query -v
359359
Rank UUID Control Address Fault Domain State Reason
360360
---- --------------- ------------ ----- ------
361-
0 2bf0e083-33d6-4ce3-83c4-c898c2a7ddbd 10.7.1.8:10001 boro-8.boro.hpdd.intel.com Joined
362-
1 c9ac1dd9-0f9d-4684-90d3-038b720fd26b 10.7.1.35:10001 boro-35.boro.hpdd.intel.com Joined
363-
2 80e44fe9-3a2b-4808-9a0f-88c3cbe7f565 10.7.1.53:10001 boro-53.boro.hpdd.intel.com Joined
364-
3 a26fd44a-6089-4cc3-a06b-278a85607fd3 10.7.1.52:10001 boro-52.boro.hpdd.intel.com Evicted system stop
361+
0 2bf0e083-33d6-4ce3-83c4-c898c2a7ddbd 10.7.1.8:10001 boro-8.boro.example.com Joined
362+
1 c9ac1dd9-0f9d-4684-90d3-038b720fd26b 10.7.1.35:10001 boro-35.boro.example.com Joined
363+
2 80e44fe9-3a2b-4808-9a0f-88c3cbe7f565 10.7.1.53:10001 boro-53.boro.example.com Joined
364+
3 a26fd44a-6089-4cc3-a06b-278a85607fd3 10.7.1.52:10001 boro-52.boro.example.com Evicted system stop
365365

366366
# Restart, after evicted server restarted, verify the server joined
367367
$ /usr/bin/dmg system query -v
368368
Rank UUID Control Address Fault Domain State Reason
369369
---- --------------- ------------ ----- ------
370-
0 2bf0e083-33d6-4ce3-83c4-c898c2a7ddbd 10.7.1.8:10001 /boro-8.boro.hpdd.intel.com Joined
371-
1 c9ac1dd9-0f9d-4684-90d3-038b720fd26b 10.7.1.35:10001 /boro-35.boro.hpdd.intel.com Joined
372-
2 80e44fe9-3a2b-4808-9a0f-88c3cbe7f565 10.7.1.53:10001 /boro-53.boro.hpdd.intel.com Joined
373-
3 a26fd44a-6089-4cc3-a06b-278a85607fd3 10.7.1.52:10001 /boro-52.boro.hpdd.intel.com Joined
370+
0 2bf0e083-33d6-4ce3-83c4-c898c2a7ddbd 10.7.1.8:10001 /boro-8.boro.example.com Joined
371+
1 c9ac1dd9-0f9d-4684-90d3-038b720fd26b 10.7.1.35:10001 /boro-35.boro.example.com Joined
372+
2 80e44fe9-3a2b-4808-9a0f-88c3cbe7f565 10.7.1.53:10001 /boro-53.boro.example.com Joined
373+
3 a26fd44a-6089-4cc3-a06b-278a85607fd3 10.7.1.52:10001 /boro-52.boro.example.com Joined
374374

375375
# Unmount after test completed
376376
$ fusermount -u /tmp/daos_test1/
@@ -415,19 +415,19 @@ bring-up DAOS servers and clients.
415415
$ dmg system query -v
416416
Rank UUID Control Address Fault Domain State Reason
417417
---- --------------- ------------ ----- ------
418-
0 2bf0e083-33d6-4ce3-83c4-c898c2a7ddbd 10.7.1.8:10001 boro-8.boro.hpdd.intel.com Joined
419-
1 c9ac1dd9-0f9d-4684-90d3-038b720fd26b 10.7.1.35:10001 boro-35.boro.hpdd.intel.com Joined
420-
2 80e44fe9-3a2b-4808-9a0f-88c3cbe7f565 10.7.1.53:10001 boro-53.boro.hpdd.intel.com Evicted system stop
421-
3 a26fd44a-6089-4cc3-a06b-278a85607fd3 10.7.1.52:10001 boro-52.boro.hpdd.intel.com Joined
418+
0 2bf0e083-33d6-4ce3-83c4-c898c2a7ddbd 10.7.1.8:10001 boro-8.boro.example.com Joined
419+
1 c9ac1dd9-0f9d-4684-90d3-038b720fd26b 10.7.1.35:10001 boro-35.boro.example.com Joined
420+
2 80e44fe9-3a2b-4808-9a0f-88c3cbe7f565 10.7.1.53:10001 boro-53.boro.example.com Evicted system stop
421+
3 a26fd44a-6089-4cc3-a06b-278a85607fd3 10.7.1.52:10001 boro-52.boro.example.com Joined
422422

423423
# Restart, after evicted server restarted, verify the server joined
424424
$ /usr/bin/dmg system query -v
425425
Rank UUID Control Address Fault Domain State Reason
426426
---- --------------- ------------ ----- ------
427-
0 2bf0e083-33d6-4ce3-83c4-c898c2a7ddbd 10.7.1.8:10001 /boro-8.boro.hpdd.intel.com Joined
428-
1 c9ac1dd9-0f9d-4684-90d3-038b720fd26b 10.7.1.35:10001 /boro-35.boro.hpdd.intel.com Joined
429-
2 80e44fe9-3a2b-4808-9a0f-88c3cbe7f565 10.7.1.53:10001 /boro-53.boro.hpdd.intel.com Joined
430-
3 a26fd44a-6089-4cc3-a06b-278a85607fd3 10.7.1.52:10001 /boro-52.boro.hpdd.intel.com Joined
427+
0 2bf0e083-33d6-4ce3-83c4-c898c2a7ddbd 10.7.1.8:10001 /boro-8.boro.example.com Joined
428+
1 c9ac1dd9-0f9d-4684-90d3-038b720fd26b 10.7.1.35:10001 /boro-35.boro.example.com Joined
429+
2 80e44fe9-3a2b-4808-9a0f-88c3cbe7f565 10.7.1.53:10001 /boro-53.boro.example.com Joined
430+
3 a26fd44a-6089-4cc3-a06b-278a85607fd3 10.7.1.52:10001 /boro-52.boro.example.com Joined
431431

432432
## Clean-Up
433433

docs/admin/administration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Below is an example of a RAS event signaling an exclusion of an unresponsive
3434
engine:
3535

3636
```
37-
&&& RAS EVENT id: [swim_rank_dead] ts: [2021-11-21T13:32:31.747408+0000] host: [wolf-112.wolf.hpdd.intel.com] type: [STATE_CHANGE] sev: [NOTICE] msg: [SWIM marked rank as dead.] pid: [253454] tid: [1] rank: [6] inc: [63a058833280000]
37+
&&& RAS EVENT id: [swim_rank_dead] ts: [2021-11-21T13:32:31.747408+0000] host: [wolf-112.wolf.example.com] type: [STATE_CHANGE] sev: [NOTICE] msg: [SWIM marked rank as dead.] pid: [253454] tid: [1] rank: [6] inc: [63a058833280000]
3838
```
3939

4040
### Event List
@@ -580,7 +580,7 @@ following `daos_server` log entries to indicate the parameters are written to
580580
the engine's NVMe config:
581581
582582
```bash
583-
DEBUG 13:59:29.229795 provider.go:592: BdevWriteConfigRequest: &{ForwardableRequest:{Forwarded:false} ConfigOutputPath:/mnt/daos0/daos_nvme.conf OwnerUID:10695475 OwnerGID:10695475 TierProps:[{Class:nvme DeviceList:0000:5e:00.0 DeviceFileSize:0 Tier:1 DeviceRoles:{OptionBits:0}}] HotplugEnabled:false HotplugBusidBegin:0 HotplugBusidEnd:0 Hostname:wolf-310.wolf.hpdd.intel.com AccelProps:{Engine: Options:0} SpdkRpcSrvProps:{Enable:false SockAddr:} AutoFaultyProps:{Enable:true MaxIoErrs:1 MaxCsumErrs:2} VMDEnabled:false ScannedBdevs:}
583+
DEBUG 13:59:29.229795 provider.go:592: BdevWriteConfigRequest: &{ForwardableRequest:{Forwarded:false} ConfigOutputPath:/mnt/daos0/daos_nvme.conf OwnerUID:10695475 OwnerGID:10695475 TierProps:[{Class:nvme DeviceList:0000:5e:00.0 DeviceFileSize:0 Tier:1 DeviceRoles:{OptionBits:0}}] HotplugEnabled:false HotplugBusidBegin:0 HotplugBusidEnd:0 Hostname:wolf-310.wolf.example.com AccelProps:{Engine: Options:0} SpdkRpcSrvProps:{Enable:false SockAddr:} AutoFaultyProps:{Enable:true MaxIoErrs:1 MaxCsumErrs:2} VMDEnabled:false ScannedBdevs:}
584584
Writing NVMe config file for engine instance 0 to "/mnt/daos0/daos_nvme.conf"
585585
```
586586

docs/admin/troubleshooting.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ updated its system fabric provider.
523523
Example `system_fabric_provider_changed` RAS event from syslog:
524524

525525
```
526-
daos_server[3302185]: id: [system_fabric_provider_changed] ts: [2024-02-13T20:08:50.956+00:00] host: [boro-74.boro.hpdd.intel.com] type: [INFO] sev: [NOTICE] msg: [system fabric provider has changed: ofi+tcp -> ofi+tcp;ofi_rxm] pid: [3302185]
526+
daos_server[3302185]: id: [system_fabric_provider_changed] ts: [2024-02-13T20:08:50.956+00:00] host: [boro-74.boro.example.com] type: [INFO] sev: [NOTICE] msg: [system fabric provider has changed: ofi+tcp -> ofi+tcp;ofi_rxm] pid: [3302185]
527527
```
528528

529529
To resolve the issue:
@@ -1083,11 +1083,11 @@ running under systemd run the following command:
10831083
CGroup: /system.slice/rsyslog.service
10841084
└─1962 /usr/sbin/rsyslogd -n
10851085
1086-
May 23 16:12:31 wolf-164.wolf.hpdd.intel.com systemd[1]: Starting System Logging Service...
1087-
May 23 16:12:31 wolf-164.wolf.hpdd.intel.com rsyslogd[1962]: [origin software="rsyslogd" swVersion="8.21>
1088-
May 23 16:12:31 wolf-164.wolf.hpdd.intel.com systemd[1]: Started System Logging Service.
1089-
May 23 16:12:31 wolf-164.wolf.hpdd.intel.com rsyslogd[1962]: imjournal: journal files changed, reloading>
1090-
May 29 03:18:01 wolf-164.wolf.hpdd.intel.com rsyslogd[1962]: [origin software="rsyslogd" swVersion="8.21>
1086+
May 23 16:12:31 wolf-164.wolf.example.com systemd[1]: Starting System Logging Service...
1087+
May 23 16:12:31 wolf-164.wolf.example.com rsyslogd[1962]: [origin software="rsyslogd" swVersion="8.21>
1088+
May 23 16:12:31 wolf-164.wolf.example.com systemd[1]: Started System Logging Service.
1089+
May 23 16:12:31 wolf-164.wolf.example.com rsyslogd[1962]: imjournal: journal files changed, reloading>
1090+
May 29 03:18:01 wolf-164.wolf.example.com rsyslogd[1962]: [origin software="rsyslogd" swVersion="8.21>
10911091
```
10921092

10931093
To configure a Syslog daemon to resolve the delivery errors and receive messages from 'daos_server'

docs/testing/ior.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ $ mpirun -hostfile /path/to/hostfile_clients -np 30 <your_dir>/bin/ior -a POSIX
5454
IOR-3.4.0+dev: MPI Coordinated Test of Parallel I/O
5555
Began : Thu Apr 29 23:23:09 2021
5656
Command line : ior -a POSIX -b 5G -t 1M -v -W -w -r -R -i 1 -o /tmp/daos_dfuse/testfile
57-
Machine : Linux wolf-86.wolf.hpdd.intel.com
57+
Machine : Linux wolf-86.wolf.example.com
5858
Start time skew across all tasks: 0.00 sec
5959
TestID : 0
6060
StartTime : Thu Apr 29 23:23:09 2021

docs/user/filesystem.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ $ systemctl status scratch_fs-root_dfuse.mount
486486
Docs: man:fstab(5)
487487
man:systemd-fstab-generator(8)
488488
489-
Sep 23 15:55:33 wolf-170.wolf.hpdd.intel.com systemd[1]: scratch_fs-root_dfuse.mount: Succeeded.
489+
Sep 23 15:55:33 wolf-170.wolf.example.com systemd[1]: scratch_fs-root_dfuse.mount: Succeeded.
490490
$ systemctl start scratch_fs-root_dfuse.mount
491491
$ df -h | grep fuse
492492
dfuse 537G 5.1G 532G 1% /scratch_fs/root_dfuse
@@ -505,8 +505,8 @@ $ systemctl status scratch_fs-root_dfuse.mount
505505
CGroup: /system.slice/scratch_fs-root_dfuse.mount
506506
└─4173 dfuse /scratch_fs/root_dfuse -o rw pool=admin_pool container=admin_cont dev suid
507507
508-
Sep 23 15:57:52 wolf-170.wolf.hpdd.intel.com systemd[1]: Mounting /scratch_fs/root_dfuse...
509-
Sep 23 15:57:53 wolf-170.wolf.hpdd.intel.com systemd[1]: Mounted /scratch_fs/root_dfuse.
508+
Sep 23 15:57:52 wolf-170.wolf.example.com systemd[1]: Mounting /scratch_fs/root_dfuse...
509+
Sep 23 15:57:53 wolf-170.wolf.example.com systemd[1]: Mounted /scratch_fs/root_dfuse.
510510
$ systemctl stop scratch_fs-root_dfuse.mount
511511
$ systemctl status scratch_fs-root_dfuse.mount
512512
● scratch_fs-root_dfuse.mount - /scratch_fs/root_dfuse
@@ -520,11 +520,11 @@ $ systemctl status scratch_fs-root_dfuse.mount
520520
Memory: 540.0K
521521
CGroup: /system.slice/scratch_fs-root_dfuse.mount
522522
523-
Sep 23 15:57:52 wolf-170.wolf.hpdd.intel.com systemd[1]: Mounting /scratch_fs/root_dfuse...
524-
Sep 23 15:57:53 wolf-170.wolf.hpdd.intel.com systemd[1]: Mounted /scratch_fs/root_dfuse.
525-
Sep 23 15:58:32 wolf-170.wolf.hpdd.intel.com systemd[1]: Unmounting /scratch_fs/root_dfuse...
526-
Sep 23 15:58:32 wolf-170.wolf.hpdd.intel.com systemd[1]: scratch_fs-root_dfuse.mount: Succeeded.
527-
Sep 23 15:58:32 wolf-170.wolf.hpdd.intel.com systemd[1]: Unmounted /scratch_fs/root_dfuse.
523+
Sep 23 15:57:52 wolf-170.wolf.example.com systemd[1]: Mounting /scratch_fs/root_dfuse...
524+
Sep 23 15:57:53 wolf-170.wolf.example.com systemd[1]: Mounted /scratch_fs/root_dfuse.
525+
Sep 23 15:58:32 wolf-170.wolf.example.com systemd[1]: Unmounting /scratch_fs/root_dfuse...
526+
Sep 23 15:58:32 wolf-170.wolf.example.com systemd[1]: scratch_fs-root_dfuse.mount: Succeeded.
527+
Sep 23 15:58:32 wolf-170.wolf.example.com systemd[1]: Unmounted /scratch_fs/root_dfuse.
528528
$
529529
```
530530

@@ -580,8 +580,8 @@ $ systemctl status scratch_fs-root_dfuse.mount
580580
CGroup: /system.slice/scratch_fs-root_dfuse.mount
581581
└─2346 dfuse /scratch_fs/root_dfuse -o rw pool=admin_pool container=admin_cont dev suid
582582
583-
Sep 23 16:13:34 wolf-170.wolf.hpdd.intel.com systemd[1]: Mounting /scratch_fs/root_dfuse...
584-
Sep 23 16:13:35 wolf-170.wolf.hpdd.intel.com systemd[1]: Mounted /scratch_fs/root_dfuse.
583+
Sep 23 16:13:34 wolf-170.wolf.example.com systemd[1]: Mounting /scratch_fs/root_dfuse...
584+
Sep 23 16:13:35 wolf-170.wolf.example.com systemd[1]: Mounted /scratch_fs/root_dfuse.
585585
$
586586
```
587587

src/cart/swim/swim.c

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) 2016 UChicago Argonne, LLC
33
* (C) Copyright 2018-2024 Intel Corporation.
44
* (C) Copyright 2025 Google LLC
5-
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
5+
* (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
66
*
77
* SPDX-License-Identifier: BSD-2-Clause-Patent
88
*/
@@ -1093,6 +1093,7 @@ swim_updates_parse(struct swim_context *ctx, swim_id_t from_id, swim_id_t id,
10931093
struct swim_member_state id_state;
10941094
swim_id_t self_id = swim_self_get(ctx);
10951095
swim_id_t upd_id;
1096+
bool from_untrustable = false;
10961097
size_t i;
10971098
int rc = 0;
10981099

@@ -1106,10 +1107,9 @@ swim_updates_parse(struct swim_context *ctx, swim_id_t from_id, swim_id_t id,
11061107

11071108
rc = ctx->sc_ops->get_member_state(ctx, from_id, &id_state);
11081109
if (rc == -DER_NONEXIST || id_state.sms_status == SWIM_MEMBER_DEAD) {
1109-
swim_ctx_unlock(ctx);
1110-
SWIM_DEBUG("%lu: skip untrustable update from %lu, rc = %d\n", self_id, from_id,
1111-
rc);
1112-
D_GOTO(out, rc = -DER_NONEXIST);
1110+
SWIM_DEBUG("%lu: 'untrustable' updates from %lu: " DF_RC "\n", self_id, from_id,
1111+
DP_RC(rc));
1112+
from_untrustable = true;
11131113
} else if (rc != 0) {
11141114
swim_ctx_unlock(ctx);
11151115
SWIM_ERROR("get_member_state(%lu): " DF_RC "\n", from_id, DP_RC(rc));
@@ -1182,6 +1182,13 @@ swim_updates_parse(struct swim_context *ctx, swim_id_t from_id, swim_id_t id,
11821182
break;
11831183
}
11841184

1185+
/*
1186+
* If from_id is "untrustable", react to its SUSPECT and DEAD updates about
1187+
* me (above), but ignore those about others.
1188+
*/
1189+
if (from_untrustable)
1190+
break;
1191+
11851192
if (upds[i].smu_state.sms_status == SWIM_MEMBER_SUSPECT)
11861193
swim_member_suspect(ctx, from_id, upd_id,
11871194
upds[i].smu_state.sms_incarnation);

src/chk/chk.pb-c.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ const ProtobufCEnumDescriptor chk__check_inconsist_class__descriptor =
379379
chk__check_inconsist_class__value_ranges,
380380
NULL,NULL,NULL,NULL /* reserved[1234] */
381381
};
382-
static const ProtobufCEnumValue chk__check_inconsist_action__enum_values_by_number[13] =
382+
static const ProtobufCEnumValue chk__check_inconsist_action__enum_values_by_number[14] =
383383
{
384384
{ "CIA_DEFAULT", "CHK__CHECK_INCONSIST_ACTION__CIA_DEFAULT", 0 },
385385
{ "CIA_INTERACT", "CHK__CHECK_INCONSIST_ACTION__CIA_INTERACT", 1 },
@@ -394,17 +394,19 @@ static const ProtobufCEnumValue chk__check_inconsist_action__enum_values_by_numb
394394
{ "CIA_TRUST_OLDEST", "CHK__CHECK_INCONSIST_ACTION__CIA_TRUST_OLDEST", 10 },
395395
{ "CIA_TRUST_EC_PARITY", "CHK__CHECK_INCONSIST_ACTION__CIA_TRUST_EC_PARITY", 11 },
396396
{ "CIA_TRUST_EC_DATA", "CHK__CHECK_INCONSIST_ACTION__CIA_TRUST_EC_DATA", 12 },
397+
{ "CIA_STALE", "CHK__CHECK_INCONSIST_ACTION__CIA_STALE", 65535 },
397398
};
398399
static const ProtobufCIntRange chk__check_inconsist_action__value_ranges[] = {
399-
{0, 0},{0, 13}
400+
{0, 0},{65535, 13},{0, 14}
400401
};
401-
static const ProtobufCEnumValueIndex chk__check_inconsist_action__enum_values_by_name[13] =
402+
static const ProtobufCEnumValueIndex chk__check_inconsist_action__enum_values_by_name[14] =
402403
{
403404
{ "CIA_DEFAULT", 0 },
404405
{ "CIA_DISCARD", 3 },
405406
{ "CIA_IGNORE", 2 },
406407
{ "CIA_INTERACT", 1 },
407408
{ "CIA_READD", 4 },
409+
{ "CIA_STALE", 13 },
408410
{ "CIA_TRUST_EC_DATA", 12 },
409411
{ "CIA_TRUST_EC_PARITY", 11 },
410412
{ "CIA_TRUST_LATEST", 9 },
@@ -421,11 +423,11 @@ const ProtobufCEnumDescriptor chk__check_inconsist_action__descriptor =
421423
"CheckInconsistAction",
422424
"Chk__CheckInconsistAction",
423425
"chk",
424-
13,
426+
14,
425427
chk__check_inconsist_action__enum_values_by_number,
426-
13,
428+
14,
427429
chk__check_inconsist_action__enum_values_by_name,
428-
1,
430+
2,
429431
chk__check_inconsist_action__value_ranges,
430432
NULL,NULL,NULL,NULL /* reserved[1234] */
431433
};

src/chk/chk.pb-c.h

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)