rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-08 05:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't panic if spawning a new WAL receiver thread fails.

Browse Source 
The panic would kill the page service thread. That's not too bad, but
still let's try to handle it more gracefully.
This commit is contained in:
Heikki Linnakangas
2022-01-14 18:02:34 +02:00
parent d29836d0d5
commit bad1dd9759
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pageserver/src/page_service.rs
View File

@@ -604,7 +604,7 @@ impl postgres_backend::Handler for PageServerHandler {
tenant_mgr::get_timeline_for_tenant(tenantid, timelineid)
.context("Failed to fetch local timeline for callmemaybe requests")?;
walreceiver::launch_wal_receiver(self.conf, tenantid, timelineid, &connstr);
walreceiver::launch_wal_receiver(self.conf, tenantid, timelineid, &connstr)?;
pgb.write_message_noflush(&BeMessage::CommandComplete(b"SELECT 1"))?;
} else if query_string.starts_with("branch_create ") {

8
pageserver/src/walreceiver.rs
View File

@@ -107,7 +107,7 @@ pub fn launch_wal_receiver(
tenantid: ZTenantId,
timelineid: ZTimelineId,
wal_producer_connstr: &str,
) {
) -> Result<()> {
let mut receivers = WAL_RECEIVERS.lock();
match receivers.get_mut(&(tenantid, timelineid)) {
@@ -122,8 +122,7 @@ pub fn launch_wal_receiver(
.spawn(move || {
IS_WAL_RECEIVER.with(|c| c.set(true));
thread_main(conf, tenantid, timelineid, rx);
})
.unwrap();
})?;
let receiver = WalReceiverEntry {
wal_producer_connstr: wal_producer_connstr.into(),
@@ -134,10 +133,11 @@ pub fn launch_wal_receiver(
receivers.insert((tenantid, timelineid), receiver);
// Update tenant state and start tenant threads, if they are not running yet.
tenant_mgr::set_tenant_state(tenantid, TenantState::Active).unwrap();
tenant_mgr::set_tenant_state(tenantid, TenantState::Active)?;
tenant_threads::start_tenant_threads(conf, tenantid);
}
};
Ok(())
}
// Look up current WAL producer connection string in the hash table