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

Remote store registration API only registers a single recording #7982

Merged
merged 5 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
39 changes: 39 additions & 0 deletions .github/workflows/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,42 @@ jobs:
mode: minimum
count: 1
labels: "📊 analytics, 🟦 blueprint, 🪳 bug, 🌊 C++ API, CLI, codegen/idl, 🧑‍💻 dev experience, dependencies, 📖 documentation, 💬 discussion, examples, exclude from changelog, 🪵 Log & send APIs, 📉 performance, 🐍 Python API, ⛃ re_datastore, 🔍 re_query, 📺 re_viewer, 🔺 re_renderer, 🚜 refactor, ⛴ release, 🦀 Rust API, 🔨 testing, ui, 🕸️ web"

wasm-bindgen-check:
name: Check wasm-bindgen version
if: ${{ github.event_name == 'pull_request' }}
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: prefix-dev/[email protected]
with:
pixi-version: v0.34.0

- name: Get current wasm-bindgen version
id: current-version
run: |
version=$(pixi run taplo get -f crates/viewer/re_viewer/Cargo.toml "target.*.dependencies.wasm-bindgen")
echo "current_version=$version" >> $GITHUB_OUTPUT

- name: Get previous wasm-bindgen version
id: previous-version
run: |
prev_ref=$(git rev-parse --abbrev-ref HEAD)
git checkout main

version=$(pixi run taplo get -f crates/viewer/re_viewer/Cargo.toml "target.*.dependencies.wasm-bindgen")
echo "previous_version=$version" >> $GITHUB_OUTPUT

git checkout $prev_ref

- name: Require label if versions changed
if: ${{ steps.current-version.outputs.current_version != steps.previous-version.outputs.previous_version }}
uses: mheap/github-action-required-labels@v3
with:
mode: exactly
count: 1
labels: "wasm-bindgen version update"
30 changes: 7 additions & 23 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ dependencies = [
"futures-io",
"futures-lite",
"parking",
"polling 3.7.3",
"polling",
"rustix",
"slab",
"tracing",
Expand Down Expand Up @@ -1110,7 +1110,7 @@ checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
dependencies = [
"bitflags 2.6.0",
"log",
"polling 3.7.3",
"polling",
"rustix",
"slab",
"thiserror",
Expand Down Expand Up @@ -2384,9 +2384,9 @@ dependencies = [

[[package]]
name = "fixed"
version = "1.27.0"
version = "1.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2fc715d38bea7b5bf487fcd79bcf8c209f0b58014f3018a7a19c2b855f472048"
checksum = "85c6e0b89bf864acd20590dbdbad56f69aeb898abfc9443008fd7bd48b2cc85a"
dependencies = [
"az",
"bytemuck",
Expand Down Expand Up @@ -3304,9 +3304,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"

[[package]]
name = "infer"
version = "0.15.0"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199"
checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847"
dependencies = [
"cfb",
]
Expand Down Expand Up @@ -4715,22 +4715,6 @@ dependencies = [
"wasm-bindgen-futures",
]

[[package]]
name = "polling"
version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
dependencies = [
"autocfg",
"bitflags 1.3.2",
"cfg-if",
"concurrent-queue",
"libc",
"log",
"pin-project-lite",
"windows-sys 0.48.0",
]

[[package]]
name = "polling"
version = "3.7.3"
Expand Down Expand Up @@ -6552,7 +6536,7 @@ dependencies = [
"document-features",
"ewebsock",
"parking_lot",
"polling 2.8.0",
"polling",
"re_format",
"re_log",
"re_log_types",
Expand Down
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ econtext = "0.2" # Prints error contexts on crashes
ehttp = "0.5.0"
enumset = "1.0.12"
env_logger = { version = "0.10", default-features = false }
fixed = { version = "<1.28", default-features = false } # 1.28+ is MSRV 1.79+
fixed = { version = "1.28", default-features = false }
flatbuffers = "23.0"
futures-channel = "0.3"
futures-util = { version = "0.3", default-features = false }
Expand All @@ -192,7 +192,7 @@ image = { version = "0.25", default-features = false }
indent = "0.1"
indexmap = "2.1" # Version chosen to align with other dependencies
indicatif = "0.17.7" # Progress bar
infer = "0.15" # infer MIME type by checking the magic number signaturefer MIME type by checking the magic number signature
infer = "0.16" # infer MIME type by checking the magic number signaturefer MIME type by checking the magic number signature
insta = "1.23"
itertools = "0.13"
js-sys = "0.3"
Expand Down Expand Up @@ -223,7 +223,7 @@ pathdiff = "0.2"
pico-args = "0.5"
ply-rs = { version = "0.1", default-features = false }
poll-promise = "0.3"
polling = "2.2.0"
polling = "3.7.3"
pollster = "0.3"
prettyplease = "0.2"
proc-macro2 = { version = "1.0", default-features = false }
Expand Down Expand Up @@ -318,7 +318,7 @@ wgpu = { version = "22.1", default-features = false, features = [
wgpu-core = "22.1"
wgpu-types = "22.0"
xshell = "0.2"
zip = { version = "0.6", default-features = false }
zip = { version = "0.6", default-features = false } # We're stuck on 0.6 because https://crates.io/crates/protoc-prebuilt is still using 0.6


# ---------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion crates/build/re_types_builder/src/docs.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{codegen::Target, Objects};

/// A high-level representation of the contetns of a flatbuffer docstring.
/// A high-level representation of the contents of a flatbuffer docstring.
#[derive(Debug, Clone)]
pub struct Docs {
/// All docmentation lines, including the leading tag, if any.
Expand Down
4 changes: 2 additions & 2 deletions crates/store/re_entity_db/src/store_bundle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ impl StoreBundle {
/// One is created if it doesn't already exist.
pub fn entry(&mut self, id: &StoreId) -> &mut EntityDb {
self.entity_dbs.entry(id.clone()).or_insert_with(|| {
re_log::debug!("Creating new store: {id}");
re_log::trace!("Creating new store: '{id}'");
EntityDb::new(id.clone())
})
}
Expand All @@ -96,7 +96,7 @@ impl StoreBundle {

let mut blueprint_db = EntityDb::new(id.clone());

re_log::debug!("Creating a new blueprint {id}");
re_log::trace!("Creating a new blueprint '{id}'");

blueprint_db.set_store_info(re_log_types::SetStoreInfo {
row_id: *re_chunk::RowId::new(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@ service StorageNode {
rpc Query(QueryRequest) returns (stream QueryResponse) {}
rpc FetchRecording(FetchRecordingRequest) returns (stream FetchRecordingResponse) {}
rpc GetRecordingMetadata(GetRecordingMetadataRequest) returns (GetRecordingMetadataResponse) {}
// TODO(zehiko) - should this be singular recording registration? Currently we can have 1 rrd => many recordings
rpc RegisterRecordings(RegisterRecordingsRequest) returns (RegisterRecordingsResponse) {}
rpc RegisterRecording(RegisterRecordingRequest) returns (RegisterRecordingResponse) {}
}

// ---------------- RegisterRecording ------------------

message RegisterRecordingsRequest {
message RegisterRecordingRequest {
// human readable description of the recording
string description = 1;
// information about recording's backing storage
// TODO(zehiko) add separate info about the "source" recording
ObjectStorage obj_storage = 2;
string url = 2;
// type of recording
RecordingType typ = 3;
// (optional) any additional metadata that should be associated with the recording
Expand All @@ -34,17 +33,12 @@ message RecordingMetadata {
bytes payload = 2;
}

message ObjectStorage {
string bucket_name = 1;
string url = 2;
}

message RegisterRecordingsResponse {
message RegisterRecordingResponse {
// Note / TODO(zehiko): this implies we read the record (for example go through entire .rrd file
// chunk by chunk) and extract the metadata. So we might want to 1/ not do this i.e.
// only do it as part of explicit GetMetadata request or 2/ do it if Request has "include_metadata=true"
// or 3/ do it always
repeated RecordingMetadata metadata = 2;
RecordingMetadata metadata = 2;
}

// Server can include details about the error as part of gRPC error (Status)
Expand Down
53 changes: 22 additions & 31 deletions crates/store/re_remote_store_types/src/v0/rerun.remote_store.v0.rs

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

13 changes: 10 additions & 3 deletions crates/store/re_ws_comms/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,15 @@ impl RerunServer {
// on the same poller.
let listener_poll_key = 1;

if let Err(err) = poller.add(listener_socket, Event::readable(listener_poll_key)) {
#[allow(unsafe_code)]
// SAFETY: `poller.add` requires a matching call to `poller.delete`, which we have below
if let Err(err) = unsafe { poller.add(listener_socket, Event::readable(listener_poll_key)) }
{
re_log::error!("Error when polling listener socket for incoming connections: {err}");
return;
}

let mut events = Vec::new();
let mut events = polling::Events::new();
loop {
if let Err(err) = poller.wait(&mut events, None) {
re_log::warn!("Error polling WebSocket server listener: {err}");
Expand All @@ -199,7 +202,7 @@ impl RerunServer {
break;
}

for event in events.drain(..) {
for event in events.iter() {
if event.key == listener_poll_key {
Self::accept_connection(
listener_socket,
Expand All @@ -210,7 +213,11 @@ impl RerunServer {
);
}
}
events.clear();
}

// This MUST be called before dropping `poller`!
poller.delete(listener_socket).ok();
}

fn accept_connection(
Expand Down
3 changes: 1 addition & 2 deletions crates/viewer/re_renderer/src/allocator/gpu_readback_belt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,7 @@ impl GpuReadbackBelt {
} else {
// Allocation might be bigger than a chunk!
let buffer_size = self.chunk_size.max(size_in_bytes);
// Happens relatively rarely, this is a noteworthy event!
re_log::debug!(
re_log::trace!(
"Allocating new GpuReadbackBelt chunk of size {:.1} MiB",
buffer_size as f32 / (1024.0 * 1024.0)
);
Expand Down
Loading
Loading