Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
c9fb7a6
[nexus] Add Affinity/Anti-Affinity Groups to API (unimplemented)
smklein Jan 30, 2025
4020517
[nexus] Add Affinity/Anti-Affinity groups to database
smklein Jan 30, 2025
8f1d37c
[nexus] Add CRUD implementations for Affinity/Anti-Affinity Groups
smklein Jan 30, 2025
772e64f
[nexus] Consider Affinity/Anti-Affinity Groups during instance placement
smklein Jan 30, 2025
d8cff32
[nexus] Implement Affinity/Anti-Affinity Groups in external API
smklein Jan 30, 2025
161f9d6
fix policy tests
smklein Jan 30, 2025
df119b6
Merge branch 'affinity-db-crud' into affinity-instance-integration
smklein Jan 30, 2025
83a26a4
Merge branch 'affinity-instance-integration' into affinity-integration
smklein Jan 30, 2025
8dc0825
fmt
smklein Jan 30, 2025
e3113ff
Merge branch 'affinity-api' into affinity-db-model
smklein Jan 30, 2025
789bc97
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Jan 30, 2025
5e21f34
Merge branch 'affinity-db-crud' into affinity-instance-integration
smklein Jan 30, 2025
fa9461b
Merge branch 'affinity-instance-integration' into affinity-integration
smklein Jan 30, 2025
4e9cebc
tags
smklein Jan 30, 2025
6cfca2d
doc comments
smklein Jan 31, 2025
a1c97d4
Merge branch 'affinity-api' into affinity-db-model
smklein Jan 31, 2025
050b4c5
Merge branch 'main' into affinity-api
smklein Jan 31, 2025
4b08032
typed UUID
smklein Jan 31, 2025
8bc8f0c
Merge branch 'affinity-api' into affinity-db-model
smklein Jan 31, 2025
900f09c
Typed UUID
smklein Jan 31, 2025
195e167
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Jan 31, 2025
f2ebe31
Typed UUID
smklein Jan 31, 2025
62c38ec
Merge branch 'affinity-db-crud' into affinity-instance-integration
smklein Jan 31, 2025
85985c1
Merge branch 'affinity-instance-integration' into affinity-integration
smklein Jan 31, 2025
1326116
UUID typing
smklein Jan 31, 2025
aba9596
comments
smklein Jan 31, 2025
a271f1d
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Jan 31, 2025
1ad0101
review feedback
smklein Feb 1, 2025
4d26262
comment
smklein Feb 1, 2025
6ae1910
clippy
smklein Feb 1, 2025
58ebd65
Merge branch 'affinity-db-crud' into affinity-instance-integration
smklein Feb 1, 2025
ab817bc
Merge branch 'affinity-instance-integration' into affinity-integration
smklein Feb 1, 2025
9daf923
Converting sled_resource to sled_resource_vmm
smklein Feb 3, 2025
1b39c51
schema, more renaming
smklein Feb 3, 2025
e21125f
Merge branch 'main' into affinity-api
smklein Feb 4, 2025
bd95b03
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 4, 2025
76b0af9
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Feb 4, 2025
1179919
Merge branch 'affinity-db-crud' into affinity-instance-integration
smklein Feb 4, 2025
a07c46e
review feedback
smklein Feb 4, 2025
fdccd6b
review feedback (grammatical)
smklein Feb 5, 2025
db49c67
Merge branch 'affinity-instance-integration' into affinity-integration
smklein Feb 5, 2025
6e44392
anti-affinity group description
smklein Feb 5, 2025
8e6fe1a
Merge branch 'affinity-integration' into sled-resource-vmm
smklein Feb 5, 2025
d5b951f
Update comment
smklein Feb 5, 2025
fdfb78d
Merge branch 'affinity-integration' into sled-resource-vmm
smklein Feb 5, 2025
f57a96a
Fix schema migration
smklein Feb 5, 2025
fb8976d
Redo regression test for OID poisoning, and move it
smklein Feb 5, 2025
17dc409
clippppyyyyyy
smklein Feb 6, 2025
97b9b2e
Eliza's feedback
smklein Feb 6, 2025
d949890
Merge branch 'affinity-instance-integration' into affinity-integration
smklein Feb 6, 2025
fa2550e
Merge branch 'affinity-integration' into sled-resource-vmm
smklein Feb 6, 2025
79b4252
[nexus-db-queries] Benchmark for VMM reservation
smklein Feb 6, 2025
04a4b98
Tweak usable hardware threads to make instance placement less flaky
smklein Feb 6, 2025
db40d05
Normalize reservation time, only benchmark creation pathway
smklein Feb 6, 2025
b68239b
Normalize
smklein Feb 7, 2025
ca8f890
cleanup
smklein Feb 7, 2025
5406dd4
Better contention info
smklein Feb 10, 2025
bb0f349
Better contention information
smklein Feb 11, 2025
6704be1
restructure benchmark
smklein Feb 11, 2025
127285c
more refactoring
smklein Feb 11, 2025
acf3a64
test naming
smklein Feb 12, 2025
2eaef4f
Start working towards a reduced-contention sled reservation
smklein Feb 12, 2025
c9bb4c7
passing tests
smklein Feb 12, 2025
8e5b1b0
cleanup
smklein Feb 12, 2025
d1356f8
Updated expectorate output
smklein Feb 12, 2025
7abc2b4
Testing contention more explicitly
smklein Feb 13, 2025
bd14e7b
fmt
smklein Feb 13, 2025
d55e540
Patch benchmark
smklein Feb 13, 2025
f710687
Partway through affinity group testing
smklein Feb 14, 2025
82b028c
cache instance/group records
smklein Feb 14, 2025
43f4437
benchmark updates
smklein Feb 14, 2025
7e80208
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Feb 14, 2025
9a3ef20
fmt
smklein Feb 14, 2025
f028351
clippy
smklein Feb 14, 2025
df9a1f8
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Feb 14, 2025
2ea4dea
Remove unused test output
smklein Feb 14, 2025
45b993a
Merge branch 'main' into affinity-api
smklein Feb 18, 2025
05c8b60
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 18, 2025
eee1d6f
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Feb 18, 2025
10aaed9
Merge branch 'affinity-db-crud' into affinity-instance-integration
smklein Feb 18, 2025
f8b9b5d
Merge branch 'affinity-instance-integration' into affinity-integration
smklein Feb 18, 2025
1032128
Merge branch 'affinity-integration' into sled-resource-vmm
smklein Feb 18, 2025
859f099
Merge branch 'sled-resource-vmm' into vmm-reserve-bench
smklein Feb 18, 2025
7e5cd6a
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Feb 18, 2025
3edc5ed
Fix mismerge
smklein Feb 18, 2025
8566395
Merge branch 'sled-resource-vmm' into vmm-reserve-bench
smklein Feb 18, 2025
5c55192
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Feb 18, 2025
393a925
Merge branch 'main' into affinity-api
smklein Feb 19, 2025
7a99a96
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 19, 2025
ee657cc
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Feb 19, 2025
931801d
Merge branch 'affinity-db-crud' into affinity-instance-integration
smklein Feb 19, 2025
5f75a2b
Merge branch 'affinity-instance-integration' into affinity-integration
smklein Feb 19, 2025
b1689c8
Merge branch 'affinity-integration' into sled-resource-vmm
smklein Feb 19, 2025
fd09de7
Merge branch 'sled-resource-vmm' into vmm-reserve-bench
smklein Feb 19, 2025
81d843e
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Feb 19, 2025
c18449c
Merge branch 'main' into affinity-api
smklein Feb 19, 2025
4bf0e48
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 19, 2025
1a7e7e0
Merge branch 'main' into affinity-api
smklein Feb 19, 2025
01b8f03
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 19, 2025
a35a33c
Merge branch 'main' into affinity-api
smklein Feb 20, 2025
eb9682f
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 20, 2025
0e6eaf2
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Feb 20, 2025
45a97a3
Merge branch 'affinity-db-crud' into affinity-instance-integration
smklein Feb 20, 2025
bd1f2cc
Merge branch 'affinity-instance-integration' into affinity-integration
smklein Feb 20, 2025
7ba08b0
Merge branch 'affinity-integration' into sled-resource-vmm
smklein Feb 20, 2025
1add3c1
Merge branch 'sled-resource-vmm' into vmm-reserve-bench
smklein Feb 20, 2025
18d3031
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Feb 20, 2025
4a00ddd
Merge branch 'main' into affinity-api
smklein Feb 21, 2025
7a8da16
Merge branch 'affinity-api' into affinity-db-model (schema)
smklein Feb 21, 2025
081e8b4
Merge branch 'main' into affinity-api
smklein Feb 21, 2025
7733054
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 21, 2025
e9cc19c
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Feb 21, 2025
01914c3
Merge branch 'affinity-db-crud' into affinity-instance-integration
smklein Feb 21, 2025
e6634dc
Merge branch 'affinity-instance-integration' into affinity-integration
smklein Feb 21, 2025
565ffc8
Merge branch 'main' into affinity-api
smklein Feb 21, 2025
e15460c
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 21, 2025
9190d80
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Feb 21, 2025
8d90161
Merge branch 'affinity-db-crud' into affinity-instance-integration
smklein Feb 21, 2025
9f6ad7b
Merge branch 'affinity-instance-integration' into affinity-integration
smklein Feb 21, 2025
49196d2
Merge branch 'affinity-integration' into sled-resource-vmm
smklein Feb 21, 2025
7193c88
Merge branch 'sled-resource-vmm' into vmm-reserve-bench
smklein Feb 21, 2025
c3f164f
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Feb 21, 2025
16b3df3
Merge branch 'main' into affinity-api
smklein Feb 24, 2025
f5bbe28
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 24, 2025
beaedfc
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Feb 24, 2025
afbc4ad
Merge branch 'affinity-db-crud' into affinity-instance-integration
smklein Feb 24, 2025
25a6e5e
Merge branch 'affinity-instance-integration' into affinity-integration
smklein Feb 24, 2025
7c90072
Merge branch 'affinity-integration' into sled-resource-vmm
smklein Feb 24, 2025
701106d
Merge branch 'sled-resource-vmm' into vmm-reserve-bench
smklein Feb 24, 2025
40cef0b
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Feb 24, 2025
0419d37
review feedback
smklein Feb 24, 2025
2ad7bb7
Merge branch 'affinity-integration' into sled-resource-vmm
smklein Feb 24, 2025
da625b9
Merge branch 'sled-resource-vmm' into vmm-reserve-bench
smklein Feb 24, 2025
36ddafc
Relocate some functions into pub_test_utils
smklein Feb 25, 2025
b8c5024
Code review feedback
smklein Feb 25, 2025
bba32a6
Merge branch 'main' into affinity-instance-integration
smklein Feb 25, 2025
e893250
Merge branch 'affinity-instance-integration' into affinity-integration
smklein Feb 25, 2025
f5ec80d
Merge branch 'affinity-integration' into sled-resource-vmm
smklein Feb 25, 2025
fba0614
Merge branch 'sled-resource-vmm' into vmm-reserve-bench
smklein Feb 25, 2025
0e54843
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Feb 25, 2025
e79fa5f
README
smklein Feb 25, 2025
faed1c4
Merge branch 'main' into vmm-reserve-bench
smklein Feb 25, 2025
01029f1
Add issue
smklein Feb 25, 2025
df01f7a
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Feb 25, 2025
b36be57
new args to test helpers
smklein Feb 25, 2025
3c0cc80
Merge branch 'main' into vmm-reserve-bench
smklein Feb 25, 2025
c2e9493
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Feb 25, 2025
462afc7
Merge branch 'main' into vmm-reserve-bench
smklein Feb 27, 2025
9d10bd8
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Feb 27, 2025
93d4ac3
Merge branch 'main' into vmm-reserve-bench
smklein Feb 28, 2025
77f2675
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Feb 28, 2025
75acd32
Merge branch 'main' into vmm-reserve-bench
smklein Mar 3, 2025
744d97f
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Mar 3, 2025
a3e885a
Merge branch 'main' into vmm-reserve-bench
smklein Mar 4, 2025
72ecbf2
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Mar 4, 2025
4ed71c3
Merge branch 'main' into vmm-reserve-bench
smklein Mar 7, 2025
d8f173d
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
smklein Mar 7, 2025
37fa3fb
Merge branch 'main' into vmm-reduce-contention
smklein Mar 10, 2025
dec670d
Merge branch 'main' into vmm-reduce-contention
smklein Mar 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
641 changes: 469 additions & 172 deletions nexus/db-queries/src/db/datastore/sled.rs

Large diffs are not rendered by default.

611 changes: 0 additions & 611 deletions nexus/db-queries/src/db/queries/affinity.rs

This file was deleted.

2 changes: 1 addition & 1 deletion nexus/db-queries/src/db/queries/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//! Specialized queries for inserting database records, usually to maintain
//! complex invariants that are most accurately expressed in a single query.

pub mod affinity;
pub mod disk;
pub mod external_ip;
pub mod ip_pool;
Expand All @@ -14,6 +13,7 @@ mod next_item;
pub mod network_interface;
pub mod oximeter;
pub mod region_allocation;
pub mod sled_reservation;
pub mod virtual_provisioning_collection_update;
pub mod vpc;
pub mod vpc_subnet;
Expand Down
Loading
Loading