Skip to content
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

fix: replay functions in snapshot on frontend #8912

Merged
merged 2 commits into from
Mar 31, 2023
Merged

fix: replay functions in snapshot on frontend #8912

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2171707
fix: replay functions in snapshot on frontend
yezizp2012 Mar 31, 2023
0d989f4
resolve comments
yezizp2012 Mar 31, 2023
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
48 changes: 34 additions & 14 deletions src/frontend/src/observer/observer_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use risingwave_common_service::observer_manager::{ObserverState, SubscribeFronte
use risingwave_pb::common::WorkerNode;
use risingwave_pb::meta::relation::RelationInfo;
use risingwave_pb::meta::subscribe_response::{Info, Operation};
use risingwave_pb::meta::{FragmentParallelUnitMapping, SubscribeResponse};
use risingwave_pb::meta::{FragmentParallelUnitMapping, MetaSnapshot, SubscribeResponse};
use tokio::sync::watch::Sender;

use crate::catalog::root_catalog::Catalog;
Expand Down Expand Up @@ -93,35 +93,55 @@ impl ObserverState for FrontendObserverNode {
let Some(Info::Snapshot(snapshot)) = resp.info else {
unreachable!();
};
let MetaSnapshot {
databases,
schemas,
sources,
sinks,
tables,
indexes,
views,
functions,
users,
parallel_unit_mappings,
nodes,
hummock_snapshot,
hummock_version: _,
meta_backup_manifest_id: _,
hummock_write_limits: _,
version,
} = snapshot;

for db in snapshot.databases {
for db in databases {
catalog_guard.create_database(&db)
}
for schema in snapshot.schemas {
for schema in schemas {
catalog_guard.create_schema(&schema)
}
for table in snapshot.tables {
for table in tables {
catalog_guard.create_table(&table)
}
for source in snapshot.sources {
for source in sources {
catalog_guard.create_source(&source)
}
for user in snapshot.users {
for user in users {
user_guard.create_user(user)
}
for index in snapshot.indexes {
for index in indexes {
catalog_guard.create_index(&index)
}
for sink in snapshot.sinks {
for sink in sinks {
catalog_guard.create_sink(&sink)
}
for view in snapshot.views {
for view in views {
catalog_guard.create_view(&view)
}
for function in functions {
catalog_guard.create_function(&function)
}
self.worker_node_manager.refresh(
snapshot.nodes,
snapshot
.parallel_unit_mappings
nodes,
parallel_unit_mappings
.iter()
.map(
|FragmentParallelUnitMapping {
Expand All @@ -135,9 +155,9 @@ impl ObserverState for FrontendObserverNode {
.collect(),
);
self.hummock_snapshot_manager
.update_epoch(snapshot.hummock_snapshot.unwrap());
.update_epoch(hummock_snapshot.unwrap());

let snapshot_version = snapshot.version.unwrap();
let snapshot_version = version.unwrap();
catalog_guard.set_version(snapshot_version.catalog_version);
self.catalog_updated_tx
.send(snapshot_version.catalog_version)
Expand Down