Skip to content

Commit f2fc5ca

Browse files
epageepage
committed
fix(publish): Block until it is in index
Originally, crates.io would block on publish requests until the publish was complete, giving `cargo publish` this behavior by extension. When crates.io switched to asynchronous publishing, this intermittently broke people's workflows when publishing multiple crates. I say interittent because it usually works until it doesn't and it is unclear why to the end user because it will be published by the time they check. In the end, callers tend to either put in timeouts (and pray), poll the server's API, or use `crates-index` crate to poll the index. This isn't sufficient because - For any new interested party, this is a pit of failure they'll fall into - crates-index has re-implemented index support incorrectly in the past, currently doesn't handle auth, doesn't support `git-cli`, etc. - None of these previous options work if we were to implement workspace-publish support (#1169) - The new sparse registry might increase the publish times, making the delay easier to hit manually - The new sparse registry goes through CDNs so checking the server's API might not be sufficient - Once the sparse registry is available, crates-index users will find out when the package is ready in git but it might not be ready through the sparse registry because of CDNs So now `cargo` will block until it sees the package in the index. - This is checking via the index instead of server APIs in case there are propagation delays. This has the side effect of being noisy because of all of the "Updating index" messages. - This is done unconditionally because cargo used to block and that didn't seem to be a problem, blocking by default is the less error prone case, and there doesn't seem to be enough justification for a "don't block" flag. The timeout was 5min but I dropped it to 1m. Unfortunately, I don't have data from `cargo-release` to know what a reasonable timeout is, so going ahead and dropping to 60s and assuming anything more is an outage. Fixes #9507
1 parent 487d7e5 commit f2fc5ca

8 files changed

+59
-32
lines changed

‎src/cargo/ops/registry.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> {
186186
opts.dry_run,
187187
)?;
188188
if !opts.dry_run {
189-
const DEFAULT_TIMEOUT: u64 = 0;
189+
const DEFAULT_TIMEOUT: u64 = 60;
190190
let timeout = if opts.config.cli_unstable().publish_timeout {
191191
let timeout: Option<u64> = opts.config.get("publish.timeout")?;
192192
timeout.unwrap_or(DEFAULT_TIMEOUT)

‎tests/testsuite/artifact_dep.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1920,6 +1920,7 @@ fn publish_artifact_dep() {
19201920
[UPDATING] [..]
19211921
[PACKAGING] foo v0.1.0 [..]
19221922
[UPLOADING] foo v0.1.0 [..]
1923+
[UPDATING] [..]
19231924
",
19241925
)
19251926
.run();

‎tests/testsuite/credential_process.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ Only one of these values may be set, remove one or the other to proceed.
135135
[UPDATING] [..]
136136
[PACKAGING] foo v0.1.0 [..]
137137
[UPLOADING] foo v0.1.0 [..]
138+
[UPDATING] [..]
138139
",
139140
)
140141
.run();
@@ -208,6 +209,7 @@ fn publish() {
208209
[UPDATING] [..]
209210
[PACKAGING] foo v0.1.0 [..]
210211
[UPLOADING] foo v0.1.0 [..]
212+
[UPDATING] [..]
211213
",
212214
)
213215
.run();

‎tests/testsuite/cross_publish.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ fn publish_with_target() {
110110
[COMPILING] foo v0.0.0 ([CWD]/target/package/foo-0.0.0)
111111
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
112112
[UPLOADING] foo v0.0.0 ([CWD])
113+
[UPDATING] crates.io index
113114
",
114115
)
115116
.run();

‎tests/testsuite/features_namespaced.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -903,6 +903,7 @@ fn publish_no_implicit() {
903903
[UPDATING] [..]
904904
[PACKAGING] foo v0.1.0 [..]
905905
[UPLOADING] foo v0.1.0 [..]
906+
[UPDATING] [..]
906907
",
907908
)
908909
.run();
@@ -1029,6 +1030,7 @@ fn publish() {
10291030
[COMPILING] foo v0.1.0 [..]
10301031
[FINISHED] [..]
10311032
[UPLOADING] foo v0.1.0 [..]
1033+
[UPDATING] [..]
10321034
",
10331035
)
10341036
.run();

‎tests/testsuite/publish.rs

Lines changed: 46 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ fn simple() {
123123
See [..]
124124
[PACKAGING] foo v0.0.1 ([CWD])
125125
[UPLOADING] foo v0.0.1 ([CWD])
126+
[UPDATING] [..]
126127
",
127128
)
128129
.run();
@@ -176,6 +177,7 @@ fn old_token_location() {
176177
See [..]
177178
[PACKAGING] foo v0.0.1 ([CWD])
178179
[UPLOADING] foo v0.0.1 ([CWD])
180+
[UPDATING] [..]
179181
",
180182
)
181183
.run();
@@ -215,7 +217,9 @@ fn simple_with_index() {
215217
[..]
216218
[..]
217219
[..]
218-
[UPLOADING] foo v0.0.1 ([CWD])",
220+
[UPLOADING] foo v0.0.1 ([CWD])
221+
[UPDATING] [..]
222+
",
219223
)
220224
.run();
221225

@@ -410,7 +414,9 @@ fn publish_clean() {
410414
[VERIFYING] foo v0.0.1 ([CWD])
411415
[..]
412416
[..]
413-
[UPLOADING] foo v0.0.1 ([CWD])",
417+
[UPLOADING] foo v0.0.1 ([CWD])
418+
[UPDATING] [..]
419+
",
414420
)
415421
.run();
416422

@@ -453,7 +459,9 @@ fn publish_in_sub_repo() {
453459
[VERIFYING] foo v0.0.1 ([CWD])
454460
[..]
455461
[..]
456-
[UPLOADING] foo v0.0.1 ([CWD])",
462+
[UPLOADING] foo v0.0.1 ([CWD])
463+
[UPDATING] [..]
464+
",
457465
)
458466
.run();
459467

@@ -496,7 +504,9 @@ fn publish_when_ignored() {
496504
[VERIFYING] foo v0.0.1 ([CWD])
497505
[..]
498506
[..]
499-
[UPLOADING] foo v0.0.1 ([CWD])",
507+
[UPLOADING] foo v0.0.1 ([CWD])
508+
[UPDATING] [..]
509+
",
500510
)
501511
.run();
502512

@@ -538,7 +548,9 @@ fn ignore_when_crate_ignored() {
538548
[VERIFYING] foo v0.0.1 ([CWD])
539549
[..]
540550
[..]
541-
[UPLOADING] foo v0.0.1 ([CWD])",
551+
[UPLOADING] foo v0.0.1 ([CWD])
552+
[UPDATING] [..]
553+
",
542554
)
543555
.run();
544556

@@ -727,7 +739,9 @@ fn publish_allowed_registry() {
727739
[VERIFYING] foo v0.0.1 ([CWD])
728740
[..]
729741
[..]
730-
[UPLOADING] foo v0.0.1 ([CWD])",
742+
[UPLOADING] foo v0.0.1 ([CWD])
743+
[UPDATING] `alternative` index
744+
",
731745
)
732746
.run();
733747

@@ -789,7 +803,9 @@ fn publish_implicitly_to_only_allowed_registry() {
789803
[VERIFYING] foo v0.0.1 ([CWD])
790804
[..]
791805
[..]
792-
[UPLOADING] foo v0.0.1 ([CWD])",
806+
[UPLOADING] foo v0.0.1 ([CWD])
807+
[UPDATING] `alternative` index
808+
",
793809
)
794810
.run();
795811

@@ -912,7 +928,9 @@ The registry `alternative` is not listed in the `publish` value in Cargo.toml.
912928
[VERIFYING] foo v0.0.1 ([CWD])
913929
[..]
914930
[..]
915-
[UPLOADING] foo v0.0.1 ([CWD])",
931+
[UPLOADING] foo v0.0.1 ([CWD])
932+
[UPDATING] crates.io index
933+
",
916934
)
917935
.run();
918936
}
@@ -958,6 +976,7 @@ fn publish_with_select_features() {
958976
[..]
959977
[..]
960978
[UPLOADING] foo v0.0.1 ([CWD])
979+
[UPDATING] crates.io index
961980
",
962981
)
963982
.run();
@@ -1004,6 +1023,7 @@ fn publish_with_all_features() {
10041023
[..]
10051024
[..]
10061025
[UPLOADING] foo v0.0.1 ([CWD])
1026+
[UPDATING] crates.io index
10071027
",
10081028
)
10091029
.run();
@@ -1112,7 +1132,9 @@ fn publish_with_patch() {
11121132
[..]
11131133
[..]
11141134
[..]
1115-
[UPLOADING] foo v0.0.1 ([CWD])",
1135+
[UPLOADING] foo v0.0.1 ([CWD])
1136+
[UPDATING] crates.io index
1137+
",
11161138
)
11171139
.run();
11181140

@@ -1316,7 +1338,9 @@ fn publish_git_with_version() {
13161338
[..]
13171339
[..]
13181340
[..]
1319-
[UPLOADING] foo v0.1.0 ([CWD])",
1341+
[UPLOADING] foo v0.1.0 ([CWD])
1342+
[UPDATING] crates.io index
1343+
",
13201344
)
13211345
.run();
13221346

@@ -1443,6 +1467,7 @@ fn publish_dev_dep_no_version() {
14431467
[UPDATING] [..]
14441468
[PACKAGING] foo v0.1.0 [..]
14451469
[UPLOADING] foo v0.1.0 [..]
1470+
[UPDATING] crates.io index
14461471
",
14471472
)
14481473
.run();
@@ -1526,6 +1551,7 @@ fn credentials_ambiguous_filename() {
15261551
[..]
15271552
[..]
15281553
[UPLOADING] foo v0.0.1 [..]
1554+
[UPDATING] crates.io index
15291555
",
15301556
)
15311557
.run();
@@ -1934,6 +1960,7 @@ fn in_package_workspace() {
19341960
See [..]
19351961
[PACKAGING] li v0.0.1 ([CWD]/li)
19361962
[UPLOADING] li v0.0.1 ([CWD]/li)
1963+
[UPDATING] crates.io index
19371964
",
19381965
)
19391966
.run();
@@ -2039,6 +2066,7 @@ fn in_package_workspace_with_members_with_features_old() {
20392066
See [..]
20402067
[PACKAGING] li v0.0.1 ([CWD]/li)
20412068
[UPLOADING] li v0.0.1 ([CWD]/li)
2069+
[UPDATING] crates.io index
20422070
",
20432071
)
20442072
.run();
@@ -2129,6 +2157,7 @@ fn in_virtual_workspace_with_p() {
21292157
See [..]
21302158
[PACKAGING] li v0.0.1 ([CWD]/li)
21312159
[UPLOADING] li v0.0.1 ([CWD]/li)
2160+
[UPDATING] crates.io index
21322161
",
21332162
)
21342163
.run();
@@ -2313,7 +2342,9 @@ fn http_api_not_noop() {
23132342
[VERIFYING] foo v0.0.1 ([CWD])
23142343
[..]
23152344
[..]
2316-
[UPLOADING] foo v0.0.1 ([CWD])",
2345+
[UPLOADING] foo v0.0.1 ([CWD])
2346+
[UPDATING] [..]
2347+
",
23172348
)
23182349
.run();
23192350

@@ -2380,17 +2411,10 @@ fn wait_for_publish() {
23802411
"#,
23812412
)
23822413
.file("src/lib.rs", "")
2383-
.file(
2384-
".cargo/config",
2385-
"
2386-
[publish]
2387-
timeout = 60
2388-
",
2389-
)
23902414
.build();
23912415

2392-
p.cargo("publish --no-verify -Z sparse-registry -Z publish-timeout")
2393-
.masquerade_as_nightly_cargo(&["sparse-registry", "publish-timeout"])
2416+
p.cargo("publish --no-verify -Z sparse-registry")
2417+
.masquerade_as_nightly_cargo(&["sparse-registry"])
23942418
.replace_crates_io(registry.index_url())
23952419
.with_status(0)
23962420
.with_stderr(
@@ -2477,17 +2501,10 @@ fn wait_for_publish_underscore() {
24772501
"#,
24782502
)
24792503
.file("src/lib.rs", "")
2480-
.file(
2481-
".cargo/config",
2482-
"
2483-
[publish]
2484-
timeout = 60
2485-
",
2486-
)
24872504
.build();
24882505

2489-
p.cargo("publish --no-verify -Z sparse-registry -Z publish-timeout")
2490-
.masquerade_as_nightly_cargo(&["sparse-registry", "publish-timeout"])
2506+
p.cargo("publish --no-verify -Z sparse-registry")
2507+
.masquerade_as_nightly_cargo(&["sparse-registry"])
24912508
.replace_crates_io(registry.index_url())
24922509
.with_status(0)
24932510
.with_stderr(

‎tests/testsuite/source_replacement.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,8 @@ fn publish_with_replacement() {
206206
p.cargo("publish --registry crates-io")
207207
.replace_crates_io(crates_io.index_url())
208208
.with_stderr(
209-
"[UPDATING] crates.io index
209+
"\
210+
[UPDATING] crates.io index
210211
[WARNING] manifest has no documentation, homepage or repository.
211212
See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for more info.
212213
[PACKAGING] foo v0.0.1 ([..])
@@ -217,7 +218,9 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for
217218
[COMPILING] bar v1.0.0
218219
[COMPILING] foo v0.0.1 ([..]foo-0.0.1)
219220
[FINISHED] dev [..]
220-
[UPLOADING] foo v0.0.1 ([..])",
221+
[UPLOADING] foo v0.0.1 ([..])
222+
[UPDATING] crates.io index
223+
",
221224
)
222225
.run();
223226
}

‎tests/testsuite/weak_dep_features.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,7 @@ fn publish() {
569569
[COMPILING] foo v0.1.0 [..]
570570
[FINISHED] [..]
571571
[UPLOADING] foo v0.1.0 [..]
572+
[UPDATING] [..]
572573
",
573574
)
574575
.run();

0 commit comments

Comments
 (0)