Skip to content

deprecate: remove host cmd line argument when starting meta node #8574

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
Mar 16, 2023
Merged

deprecate: remove host cmd line argument when starting meta node #8574

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
2 changes: 2 additions & 0 deletions .github/labeler.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ labels:
title: "^test.*"
- label: "component/doc"
title: "^doc.*"
- label: "type/deprecate"
title: "^deprecate.*"

- label: "user-facing-changes"
negate: true
Expand Down
2 changes: 1 addition & 1 deletion .github/pr-title-checker-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"color": "B60205"
},
"CHECKS": {
"regexp": "^(feat|fix|test|refactor|chore|style|doc|perf|build|ci|revert)(\\(.*\\))?:.*",
"regexp": "^(feat|fix|test|refactor|chore|style|doc|perf|build|ci|revert|deprecate)(\\(.*\\))?:.*",
"ignoreLabels" : ["ignore-title"]
}
}
17 changes: 3 additions & 14 deletions src/meta/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,13 @@ pub struct MetaNodeOpts {
#[clap(long, env = "RW_LISTEN_ADDR", default_value = "127.0.0.1:5690")]
listen_addr: String,

/// Deprecated. But we keep it for backward compatibility.
#[clap(long, env = "RW_HOST")]
host: Option<String>,

/// The address for contacting this instance of the service.
/// This would be synonymous with the service's "public address"
/// or "identifying address".
/// It will serve as a unique identifier in cluster
/// membership and leader election. Must be specified for etcd backend.
/// TODO: After host is removed, we require that this parameter must be provided when using
/// etcd
#[clap(long, env = "RW_ADVERTISE_ADDR")]
advertise_addr: Option<String>,
advertise_addr: String,

#[clap(long, env = "RW_DASHBOARD_HOST")]
dashboard_host: Option<String>,
Expand Down Expand Up @@ -165,7 +159,6 @@ pub struct OverrideConfigOpts {
}

use std::future::Future;
use std::net::SocketAddr;
use std::pin::Pin;

use risingwave_common::config::{load_config, MetaBackend, RwConfig};
Expand All @@ -181,13 +174,9 @@ pub fn start(opts: MetaNodeOpts) -> Pin<Box<dyn Future<Output = ()> + Send>> {
let config = load_config(&opts.config_path, Some(opts.override_opts));
info!("> config: {:?}", config);
info!("> version: {} ({})", RW_VERSION, GIT_SHA);
let listen_addr: SocketAddr = opts.listen_addr.parse().unwrap();
let meta_addr = opts.host.unwrap_or_else(|| listen_addr.ip().to_string());
let listen_addr = opts.listen_addr.parse().unwrap();
let dashboard_addr = opts.dashboard_host.map(|x| x.parse().unwrap());
let prometheus_addr = opts.prometheus_host.map(|x| x.parse().unwrap());
let advertise_addr = opts
.advertise_addr
.unwrap_or_else(|| format!("{}:{}", meta_addr, listen_addr.port()));
let backend = match config.meta.backend {
MetaBackend::Etcd => MetaStoreBackend::Etcd {
endpoints: opts
Expand All @@ -212,7 +201,7 @@ pub fn start(opts: MetaNodeOpts) -> Pin<Box<dyn Future<Output = ()> + Send>> {

info!("Meta server listening at {}", listen_addr);
let add_info = AddressInfo {
advertise_addr,
advertise_addr: opts.advertise_addr,
listen_addr,
prometheus_addr,
dashboard_addr,
Expand Down