Skip to content

update propolis and crucible deps #1074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2022
Merged

update propolis and crucible deps #1074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nexus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ authz-macros = { path = "src/authz/authz-macros" }
base64 = "0.13.0"
bb8 = "0.8.0"
cookie = "0.16"
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "257032d1e842901d427f344a396d78b9b85b183f" }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "8ea317a9dfee65d7c018a1fda89fdec63a560ef3" }
diesel = { version = "2.0.0-rc.0", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
fatfs = "0.3.5"
futures = "0.3.21"
Expand Down
30 changes: 27 additions & 3 deletions openapi/sled-agent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@
"type": {
"type": "string",
"enum": [
"Volume"
"volume"
]
}
},
Expand All @@ -1081,7 +1081,7 @@
"type": {
"type": "string",
"enum": [
"Url"
"url"
]
},
"url": {
Expand Down Expand Up @@ -1113,7 +1113,7 @@
"type": {
"type": "string",
"enum": [
"Region"
"region"
]
}
},
Expand All @@ -1123,6 +1123,30 @@
"opts",
"type"
]
},
{
"type": "object",
"properties": {
"block_size": {
"type": "integer",
"format": "uint64",
"minimum": 0
},
"path": {
"type": "string"
},
"type": {
"type": "string",
"enum": [
"file"
]
}
},
"required": [
"block_size",
"path",
"type"
]
}
]
}
Expand Down
6 changes: 3 additions & 3 deletions package-manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ zone = true
# 3. Use type = "manual" instead of the "prebuilt"
type = "prebuilt"
repo = "crucible"
commit = "d412b2be7ef8c0658bf5603f7fd746f6972e4666"
commit = "8ea317a9dfee65d7c018a1fda89fdec63a560ef3"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
sha256 = "f85bb22797bab58d128c8dd168a2e6ba57feee284bdc9d0adf282197cb45cccb"
Copy link
Contributor

@jmpesp jmpesp May 16, 2022

Choose a reason for hiding this comment

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

it's surprising to me that this didn't change, given the commit rev did...?

Copy link
Contributor

@jmpesp jmpesp May 16, 2022

Choose a reason for hiding this comment

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

(specifically the sha256)

Copy link
Contributor

@jmpesp jmpesp May 16, 2022

Choose a reason for hiding this comment

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

$ curl -sq https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/d412b2be7ef8c0658bf5603f7fd746f6972e4666/crucible.sha256.txt
f85bb22797bab58d128c8dd168a2e6ba57feee284bdc9d0adf282197cb45cccb

$ curl -sq https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/8ea317a9dfee65d7c018a1fda89fdec63a560ef3/crucible.sha256.txt
f85bb22797bab58d128c8dd168a2e6ba57feee284bdc9d0adf282197cb45cccb

seems legit

Copy link
Contributor Author

@ahl ahl May 16, 2022

Choose a reason for hiding this comment

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

very odd:

$ curl https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/d412b2be7ef8c0658bf5603f7fd746f6972e4666/crucible.sha256.txt
f85bb22797bab58d128c8dd168a2e6ba57feee284bdc9d0adf282197cb45cccb
$ curl https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/8ea317a9dfee65d7c018a1fda89fdec63a560ef3/crucible.sha256.txt
f85bb22797bab58d128c8dd168a2e6ba57feee284bdc9d0adf282197cb45cccb

Copy link
Contributor Author

@ahl ahl May 16, 2022

Choose a reason for hiding this comment

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

@jclulow do you have any insights as to how this might happen?

Copy link
Contributor

@jmpesp jmpesp May 16, 2022

Choose a reason for hiding this comment

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

propolis does not seem to have this problem:

$ for commit in $(git log | grep commit | head -n10 | cut -d' ' -f2); do echo "${commit} $(curl -sq https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/${commit}/propolis-server.tar.gz | sha256sum)"; done;
36d5ba53a421e0bf251abd1e3114011f5a7cd2c3 30a4606c0ca6e9b9a9c11a70489ce6dabf62ef3b884912b9cde3f6d0efb06def  -
2129d16b1a677fd57ac382a905f1304195589a90 02127e631d77f5114ed96881007c0e13a5a932432b92afd94c871e685271e03e  -
4c9fbd1b3cd75896308264a60e6df3a011797807 9cd05d81571a0ab8604658b4c7a8e7a065a2cf3a9c4f95bddee529e08ca8991e  -
de0ac67e5e1e19a905e9a6e02da342dbbabf2d09 65ee923b9b774089a346cd32f5b1c9fbe140b49d0d2da6febd7e238d9c8dccd7  -
47ef18a5b0eb7a208ae43e669cf0a93d65576114 058e809987011743008382332f5755498ae81b18019a608b4c69acc56ad51721  -
eaec980e060b368c4ca39aaaaf7757cecdb43ecc 0522bf1644867e53e8931851e55001fb7edf81897803a96ba8071d5a73d5f179  -
ec4f3a41a638ea6c3316a86f30f1895f4877f2ef fd3ac7cfa6659033051bb29ecc297240c519c5db339045f17ecccf594a266811  -
514fa1fc7740209fcb4b38397b9fe7e6c2df30cb 2de46d18505f022d38e12b65a8d0b985bd705c9c8f532d10b79ec909d8b48dde  -
bb18d9b9e2c153d016204b1a41535e603d36bad6 2582d18c12c81ee60f632a36cc6c32c6d863db9253f7710f7c21c16c45e1072f  -
fc09089e2d8a238637449a59752bf134f52631bb b284af2c879d58dbc549eed3690dcca957be41856b94b50090cda9e4ef93fcaa  -

Copy link
Collaborator

@smklein smklein May 16, 2022

Choose a reason for hiding this comment

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

The SHA256 references the generated zone image, not the entire source tree at a particular commit.

If changes were made to the repo that did not modify the downstairs zone image, I would expect it to stay the same.

Copy link
Collaborator

@bnaecker bnaecker May 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

That seems right. This last commit that @ahl added didn't change anything that's packaged into the zone tarball, but some of those previous commits do change things like the agent or downstairs binaries yet result in the same SHA. I'd expect that to change the digest of the zone image, but I could be missing something.

Copy link
Contributor Author

@ahl ahl May 16, 2022

Choose a reason for hiding this comment

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

I didn't realize that build were purely deterministic.

Copy link
Collaborator

@jclulow jclulow May 16, 2022

Choose a reason for hiding this comment

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

That is indeed quite impressive

Expand All @@ -98,7 +98,7 @@ zone = true
[external_package.propolis-server.source]
type = "prebuilt"
repo = "propolis"
commit = "ec4f3a41a638ea6c3316a86f30f1895f4877f2ef"
commit = "845c9cffc482739d417761aa1c668895f24b776d"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
sha256 = "fd3ac7cfa6659033051bb29ecc297240c519c5db339045f17ecccf594a266811"
sha256 = "80ba693906972d6525767596c95c0c5bafc1c6ff0c9d8cf9b9df437bfefb0bd6"
4 changes: 2 additions & 2 deletions sled-agent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ bytes = "1.1"
cfg-if = "1.0"
chrono = { version = "0.4", features = [ "serde" ] }
# Only used by the simulated sled agent.
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "257032d1e842901d427f344a396d78b9b85b183f" }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "8ea317a9dfee65d7c018a1fda89fdec63a560ef3" }
dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] }
futures = "0.3.21"
ipnetwork = "0.18"
Expand All @@ -24,7 +24,7 @@ omicron-common = { path = "../common" }
p256 = "0.9.0"
percent-encoding = "2.1.0"
progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "ec4f3a41a638ea6c3316a86f30f1895f4877f2ef" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "845c9cffc482739d417761aa1c668895f24b776d" }
rand = { version = "0.8.5", features = ["getrandom"] }
reqwest = { version = "0.11.8", default-features = false, features = ["rustls-tls", "stream"] }
schemars = { version = "0.8", features = [ "chrono", "uuid" ] }
Expand Down