Skip to content

reconfigurator: Ensure all durable datasets, not just crucible#6065

Merged
jgallagher merged 2 commits into
mainfrom
john/reconfigurator-ensure-datasets
Jul 12, 2024
Merged

reconfigurator: Ensure all durable datasets, not just crucible#6065
jgallagher merged 2 commits into
mainfrom
john/reconfigurator-ensure-datasets

Conversation

@jgallagher

@jgallagher jgallagher commented Jul 12, 2024

Copy link
Copy Markdown
Contributor

Reconfigurator currently ensures a Dataset row exists for all crucible zones, but fails to do so for other zones with durable datasets (notably Cockroach, which we now support adding and expunging!). This PR fixes that.

I think we also need reconfigurator to learn how to delete dataset rows for expunged zones, right? That will be a followup PR.

@jgallagher jgallagher requested a review from smklein July 12, 2024 16:10
@jgallagher jgallagher mentioned this pull request Jul 12, 2024
Open
smklein
smklein approved these changes Jul 12, 2024
View reviewed changes

@smklein smklein left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for quickly patching this!

I'm happy to tackle the "removal of datasets" portion of this, which I think also makes sense as part of the execution stage of the reconfigurator

@jgallagher

jgallagher commented Jul 12, 2024

Copy link
Copy Markdown
Contributor Author

Confirmed this works on a4x2 by manually adding a blueprint with a sixth CRDB zone, making it the target, and seeing the sixth dataset show up (the last row):

root@[fd00:1122:3344:102::4]:32221/omicron> select * from dataset where kind = 'cockroach';
                   id                  |         time_created          |         time_modified         | time_deleted | rcgen |               pool_id                |           ip           | port  |   kind    | size_used
---------------------------------------+-------------------------------+-------------------------------+--------------+-------+--------------------------------------+------------------------+-------+-----------+------------
  26f0e9c7-e394-4ff2-bff5-f632f366a90b | 2024-07-12 16:37:42.673585+00 | 2024-07-12 16:37:42.673585+00 | NULL         |     1 | 470c01dd-f51d-469c-b7e2-348d39f5fd22 | fd00:1122:3344:102::4  | 32221 | cockroach |      NULL
  51d4e08c-a427-4ba6-bf65-26e28cd70845 | 2024-07-12 16:37:42.673586+00 | 2024-07-12 16:37:42.673586+00 | NULL         |     1 | 8ce87cc0-2d37-478d-bda7-f403e46e9afc | fd00:1122:3344:101::4  | 32221 | cockroach |      NULL
  6806bb5e-49b0-4792-8e2f-83c2df6165a2 | 2024-07-12 16:37:42.673585+00 | 2024-07-12 16:37:42.673585+00 | NULL         |     1 | e007f4d8-1ece-478b-8129-f23aa6ae06d8 | fd00:1122:3344:102::3  | 32221 | cockroach |      NULL
  7acf4ec3-f1c5-41d1-ae41-3b30f5802918 | 2024-07-12 16:37:42.673586+00 | 2024-07-12 16:37:42.673586+00 | NULL         |     1 | bd73e1dd-d092-4769-aa18-a7fbeef4a6a9 | fd00:1122:3344:101::3  | 32221 | cockroach |      NULL
  8bb8b92b-4ff9-4395-98f9-ea1959c9596e | 2024-07-12 16:37:42.673586+00 | 2024-07-12 16:37:42.673586+00 | NULL         |     1 | 6254c2e4-7c99-4db0-afd7-ae09095c612f | fd00:1122:3344:103::3  | 32221 | cockroach |      NULL
  9bb8b92b-4ff9-4395-98f9-ea1959c9596e | 2024-07-12 18:07:17.133902+00 | 2024-07-12 18:07:17.133902+00 | NULL         |     1 | 692917b9-da45-4699-9bc2-0bf0836a822b | fd00:1122:3344:103::40 | 32221 | cockroach |      NULL
(6 rows)

@jgallagher jgallagher merged commit fe60eb9 into main Jul 12, 2024
@jgallagher jgallagher deleted the john/reconfigurator-ensure-datasets branch July 12, 2024 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@smklein smklein smklein approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jgallagher @smklein