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.

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

Liveliness & FetchingSubscriber #441

Merged
merged 39 commits into from
Apr 4, 2023
Merged
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
5acda07
Add liveliness functionality
OlivierHecart Jan 13, 2023
88d6205
Add z_liveliness example
OlivierHecart Jan 13, 2023
a0289a5
Mark liveliness stuff unstable
OlivierHecart Jan 13, 2023
eab6e2a
Implement declare_liveliness for Arc<Session>
OlivierHecart Jan 24, 2023
0471f62
Improve z_liveliness example outputs
OlivierHecart Jan 24, 2023
a837945
Add rustdoc
OlivierHecart Jan 24, 2023
d8819b0
Merge branch 'master' into liveliness
OlivierHecart Jan 26, 2023
ece4155
Add required-features to liveliness example
OlivierHecart Feb 8, 2023
2ca1675
Add comments
OlivierHecart Feb 8, 2023
d426a47
Add scoped queries
OlivierHecart Feb 9, 2023
5993859
Store full selector rather than scoped selector in QueryState
OlivierHecart Feb 9, 2023
3dc8319
Add scoped Subscribers
OlivierHecart Feb 9, 2023
1f91b3b
Merge branch 'master' into liveliness
OlivierHecart Feb 9, 2023
da24bf9
Fix examples/Cargo.toml
OlivierHecart Feb 9, 2023
2111bed
Merge branch 'scoped' into liveliness2
OlivierHecart Feb 9, 2023
87b7e04
Add declare_liveliness_subscriber and get_liveliness functions
OlivierHecart Feb 9, 2023
ea530fc
Remove builders scout functions
OlivierHecart Feb 13, 2023
62c6d3c
Fix declare_liveliness_subscriber signature for Arc<Session>
OlivierHecart Feb 14, 2023
f7963b5
Gather liveliness primitives in a Liveliness struct
OlivierHecart Feb 16, 2023
f3ca7b9
Change z_liveliness example default key
OlivierHecart Feb 18, 2023
ede37f6
Remove Session::declare_liveliness()
OlivierHecart Feb 27, 2023
4ecfce8
Fix compilation when unstable feature disabled
OlivierHecart Mar 1, 2023
af6bc16
QueryingSubscriberBuilder is constructed from SubscriberBuilder raher…
OlivierHecart Mar 1, 2023
1ad19bc
Liveliness Subscriber has it's own builder
OlivierHecart Mar 2, 2023
aaee57f
Fix build when unstable feature disabled
OlivierHecart Mar 7, 2023
e1d267b
Add FetchingSubscriber
OlivierHecart Mar 7, 2023
7c1f209
Fix rustdoc
OlivierHecart Mar 7, 2023
f45419f
Update README.md with new examples
OlivierHecart Mar 7, 2023
f275799
Improve examples outputs
OlivierHecart Mar 7, 2023
66da4f5
Fix examples
OlivierHecart Mar 7, 2023
071ffe8
Merge branch 'liveliness2' into builder-dev
OlivierHecart Mar 7, 2023
d59669b
Merge branch 'master' into builder-dev
OlivierHecart Mar 8, 2023
ed6be2f
Remove unneeded ClonableError trait
OlivierHecart Mar 8, 2023
4a64a33
Add liveliness tests
OlivierHecart Mar 9, 2023
8245652
Code format
OlivierHecart Mar 10, 2023
8504c59
Merge branch 'master' into builder-dev
OlivierHecart Mar 13, 2023
8d9892a
Add query_accept_replies option to QueryingSubscriberBuilder
OlivierHecart Mar 21, 2023
76bedc9
Merge branch 'master' into builder-dev
OlivierHecart Mar 28, 2023
83d6f76
Merge branch 'master' into builder-dev
OlivierHecart Apr 4, 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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ readme = "README.md"

[features]
shared-memory = ["zenoh/shared-memory"]
unstable = ["zenoh/unstable"]

[dependencies]
async-std = { workspace = true, features = ["attributes"] }
Expand Down Expand Up @@ -118,6 +119,21 @@ path = "examples/z_get.rs"
name = "z_forward"
path = "examples/z_forward.rs"

[[example]]
name = "z_liveliness"
path = "examples/z_liveliness.rs"
required-features = ["unstable"]

[[example]]
name = "z_sub_liveliness"
path = "examples/z_sub_liveliness.rs"
required-features = ["unstable"]

[[example]]
name = "z_get_liveliness"
path = "examples/z_get_liveliness.rs"
required-features = ["unstable"]

[[example]]
name = "z_pub_thr"
path = "examples/z_pub_thr.rs"
Expand Down
48 changes: 48 additions & 0 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,3 +204,51 @@
```bash
z_pub_shm_thr
```

### z_liveliness

Declares a liveliness token on a given key expression (`group1/zenoh-rs` by default).
This token will be seen alive byt the `z_get_liveliness` and `z_sub_liveliness` until
user explicitely drops the token by pressing `'d'` or implicitely dropped by terminating
or killing the `z_liveliness` example.

Typical usage:
```bash
z_liveliness
```
or
```bash
z_liveliness -k group1/member1
```

### z_get_liveliness

Queries all the currently alive liveliness tokens that match a given key expression
(`group1/**` by default). Those tokens could be declared by the `z_liveliness` example.

Typical usage:
```bash
z_get_liveliness
```
or
```bash
z_get_liveliness -k group1/**
```

### z_sub_liveliness

Subscribe to all liveliness changes (liveliness tokens getting alive or
liveliness tokens being dropped) that match a given key expression
(`group1/**` by default). Those tokens could be declared by the `z_liveliness`
example.
Note: the `z_sub_liveliness` example will not receive informations about
matching liveliness tokens that were alive before it's start.

Typical usage:
```bash
z_sub_liveliness
```
or
```bash
z_sub_liveliness -k group1/**
```
103 changes: 103 additions & 0 deletions examples/examples/z_get_liveliness.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
//
// Copyright (c) 2022 ZettaScale Technology
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License 2.0 which is available at
// http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
//
// Contributors:
// ZettaScale Zenoh Team, <[email protected]>
//
use clap::{App, Arg};
use std::convert::TryFrom;
use std::time::Duration;
use zenoh::config::Config;
use zenoh::prelude::r#async::*;

#[async_std::main]
async fn main() {
// initiate logging
env_logger::init();

let (config, key_expr, timeout) = parse_args();

println!("Opening session...");
let session = zenoh::open(config).res().await.unwrap();

println!("Sending Liveliness Query '{key_expr}'...");
let replies = session
.liveliness()
.get(&key_expr)
.timeout(timeout)
.res()
.await
.unwrap();
while let Ok(reply) = replies.recv_async().await {
match reply.sample {
Ok(sample) => println!(">> Alive token ('{}')", sample.key_expr.as_str(),),
Err(err) => println!(">> Received (ERROR: '{}')", String::try_from(&err).unwrap()),
}
}
}

fn parse_args() -> (Config, String, Duration) {
let args = App::new("zenoh liveliness query example")
.arg(
Arg::from_usage("-m, --mode=[MODE] 'The zenoh session mode (peer by default).")
.possible_values(["peer", "client"]),
)
.arg(Arg::from_usage(
"-e, --connect=[ENDPOINT]... 'Endpoints to connect to.'",
))
.arg(Arg::from_usage(
"-l, --listen=[ENDPOINT]... 'Endpoints to listen on.'",
))
.arg(
Arg::from_usage("-k, --key_expr=[KEYEXPR] 'The key expression matching liveliness tokens to query.'")
.default_value("group1/**"),
)
.arg(
Arg::from_usage("-o, --timeout=[TIME] 'The query timeout in milliseconds'")
.default_value("10000"),
)
.arg(Arg::from_usage(
"-c, --config=[FILE] 'A configuration file.'",
))
.arg(Arg::from_usage(
"--no-multicast-scouting 'Disable the multicast-based scouting mechanism.'",
))
.get_matches();

let mut config = if let Some(conf_file) = args.value_of("config") {
Config::from_file(conf_file).unwrap()
} else {
Config::default()
};
if let Some(Ok(mode)) = args.value_of("mode").map(|mode| mode.parse()) {
config.set_mode(Some(mode)).unwrap();
}
if let Some(values) = args.values_of("connect") {
config
.connect
.endpoints
.extend(values.map(|v| v.parse().unwrap()))
}
if let Some(values) = args.values_of("listen") {
config
.listen
.endpoints
.extend(values.map(|v| v.parse().unwrap()))
}
if args.is_present("no-multicast-scouting") {
config.scouting.multicast.set_enabled(Some(false)).unwrap();
}

let key_expr = args.value_of("key_expr").unwrap().to_string();

let timeout = Duration::from_millis(args.value_of("timeout").unwrap().parse::<u64>().unwrap());

(config, key_expr, timeout)
}
114 changes: 114 additions & 0 deletions examples/examples/z_liveliness.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
//
// Copyright (c) 2022 ZettaScale Technology
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License 2.0 which is available at
// http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
//
// Contributors:
// ZettaScale Zenoh Team, <[email protected]>
//
use async_std::task::sleep;
use clap::{App, Arg};
use futures::prelude::*;
use std::convert::TryFrom;
use std::time::Duration;
use zenoh::config::Config;
use zenoh::prelude::r#async::*;

#[async_std::main]
async fn main() {
// Initiate logging
env_logger::init();

let (config, key_expr) = parse_args();

println!("Opening session...");
let session = zenoh::open(config).res().await.unwrap();

println!("Declaring LivelinessToken on '{}'...", &key_expr);
let mut token = Some(
session
.liveliness()
.declare_token(&key_expr)
.res()
.await
.unwrap(),
);

println!("Enter 'd' to undeclare LivelinessToken, 'q' to quit...");
let mut stdin = async_std::io::stdin();
let mut input = [0_u8];
loop {
let _ = stdin.read_exact(&mut input).await;
match input[0] {
b'q' => break,
b'd' => {
if let Some(token) = token.take() {
println!("Undeclaring LivelinessToken...");
token.undeclare().res().await.unwrap();
}
}
0 => sleep(Duration::from_secs(1)).await,
_ => (),
}
}
}

fn parse_args() -> (Config, KeyExpr<'static>) {
let args = App::new("zenoh liveliness example")
.arg(
Arg::from_usage("-m, --mode=[MODE] 'The zenoh session mode (peer by default).")
.possible_values(["peer", "client"]),
)
.arg(Arg::from_usage(
"-e, --connect=[ENDPOINT]... 'Endpoints to connect to.'",
))
.arg(Arg::from_usage(
"-l, --listen=[ENDPOINT]... 'Endpoints to listen on.'",
))
.arg(
Arg::from_usage("-k, --key=[KEYEXPR] 'The key expression of the liveliness token.'")
.default_value("group1/zenoh-rs"),
)
.arg(Arg::from_usage(
"-c, --config=[FILE] 'A configuration file.'",
))
.arg(Arg::from_usage(
"--no-multicast-scouting 'Disable the multicast-based scouting mechanism.'",
))
.get_matches();

let mut config = if let Some(conf_file) = args.value_of("config") {
Config::from_file(conf_file).unwrap()
} else {
Config::default()
};
if let Some(Ok(mode)) = args.value_of("mode").map(|mode| mode.parse()) {
config.set_mode(Some(mode)).unwrap();
}
if let Some(values) = args.values_of("connect") {
config
.connect
.endpoints
.extend(values.map(|v| v.parse().unwrap()))
}
if let Some(values) = args.values_of("listen") {
config
.listen
.endpoints
.extend(values.map(|v| v.parse().unwrap()))
}
if args.is_present("no-multicast-scouting") {
config.scouting.multicast.set_enabled(Some(false)).unwrap();
}

let key_expr = KeyExpr::try_from(args.value_of("key").unwrap())
.unwrap()
.into_owned();

(config, key_expr)
}
Loading