rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-07 13:32:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

GitHub Actions: pin Rust version to 1.58 like on CircleCI

Browse Source 
* Fix failing `cargo clippy` while we're here.
  The behavior has been changed in Rust 1.60: https://github.com/rust-lang/rust-clippy/issues/8928
* Add Rust version to the Cargo deps cache key
This commit is contained in:
Egor Suvorov
2022-06-01 20:50:15 +03:00
committed by Egor Suvorov
parent b155fe0e2f
commit aba5e5f8b5
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/testing.yml vendored
View File

@@ -12,7 +12,7 @@ jobs:
matrix:
# If we want to duplicate this job for different
# Rust toolchains (e.g. nightly or 1.37.0), add them here.
rust_toolchain: [stable]
rust_toolchain: [1.58]
os: [ubuntu-latest, macos-latest]
timeout-minutes: 30
name: run regression test suite
@@ -87,7 +87,7 @@ jobs:
~/.cargo/registry
~/.cargo/git
target
key: ${{ runner.os }}-cargo-${{ hashFiles('./Cargo.lock') }}
key: ${{ runner.os }}-cargo-${{ hashFiles('./Cargo.lock') }}-rust-${{ matrix.rust_toolchain }}
- name: Run cargo clippy
run: ./run_clippy.sh

9
pageserver/src/walreceiver.rs
View File

@@ -469,12 +469,9 @@ async fn timeline_wal_broker_loop_step(
updates = broker_subscription.fetch_data() => match updates {
Some(mut all_timeline_updates) => {
if let Some(subscribed_timeline_updates) = all_timeline_updates.remove(&id) {
match wal_connection_manager.select_connection_candidate(subscribed_timeline_updates) {
Some(candidate) => {
info!("Switching to different safekeeper {} for timeline {id}, reason: {:?}", candidate.safekeeper_id, candidate.reason);
wal_connection_manager.change_connection(candidate.safekeeper_id, candidate.wal_producer_connstr).await;
},
None => {}
if let Some(candidate) = wal_connection_manager.select_connection_candidate(subscribed_timeline_updates) {
info!("Switching to different safekeeper {} for timeline {id}, reason: {:?}", candidate.safekeeper_id, candidate.reason);
wal_connection_manager.change_connection(candidate.safekeeper_id, candidate.wal_producer_connstr).await;
}
}
},