From 1f7de51c83c7f85280cec63c6a9a8f50d13912ed Mon Sep 17 00:00:00 2001 From: Ruediger Klaehn Date: Mon, 24 Jun 2024 13:05:18 +0300 Subject: [PATCH 1/3] panic on Expected header frame --- iroh/src/client/blobs.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/iroh/src/client/blobs.rs b/iroh/src/client/blobs.rs index 861060b751..7246436ddf 100644 --- a/iroh/src/client/blobs.rs +++ b/iroh/src/client/blobs.rs @@ -798,7 +798,11 @@ impl Reader { let (size, is_complete) = match stream.next().await { Some(Ok(BlobReadAtResponse::Entry { size, is_complete })) => (size, is_complete), Some(Err(err)) => return Err(err), - None | Some(Ok(_)) => return Err(anyhow!("Expected header frame")), + None | Some(Ok(_)) => { + println!("{}", std::backtrace::Backtrace::capture()); + panic!("Expected header frame"); + // return Err(anyhow!("Expected header frame")) + } }; let stream = stream.map(|item| match item { From 9ea93614a9c068bc1b448f8eefeba10e66d2244d Mon Sep 17 00:00:00 2001 From: Ruediger Klaehn Date: Mon, 24 Jun 2024 13:12:56 +0300 Subject: [PATCH 2/3] disable all but netsim is this how it works? --- .github/workflows/ci.yml | 448 +++++++++++++++++++-------------------- 1 file changed, 224 insertions(+), 224 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d027f93ccf..006be63bcd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,230 +20,230 @@ env: SCCACHE_CACHE_SIZE: "50G" jobs: - tests: - name: CI Test Suite - if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')" - uses: './.github/workflows/tests.yaml' - - cross_build: - name: Cross Build Only - if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')" - timeout-minutes: 30 - runs-on: [self-hosted, linux, X64] - strategy: - fail-fast: false - matrix: - target: - # cross tests are currently broken vor armv7 and aarch64 - # see https://github.com/cross-rs/cross/issues/1311 - - armv7-linux-androideabi - - aarch64-linux-android - # Freebsd execution fails in cross - # - i686-unknown-freebsd # Linking fails :/ - - x86_64-unknown-freebsd - - x86_64-unknown-netbsd - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Install rust stable - uses: dtolnay/rust-toolchain@stable - - - name: Cleanup Docker - continue-on-error: true - run: | - docker kill $(docker ps -q) - - - name: Install cross - # See https://github.com/cross-rs/cross/issues/1222 - run: cargo install cross --git https://github.com/cross-rs/cross - - - name: build - # cross tests are currently broken vor armv7 and aarch64 - # see https://github.com/cross-rs/cross/issues/1311. So on - # those platforms we only build but do not run tests. - run: cross build --all --target ${{ matrix.target }} - env: - RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG'}} - - cross_test: - name: Cross Test - if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')" - timeout-minutes: 30 - runs-on: [self-hosted, linux, X64] - strategy: - fail-fast: false - matrix: - target: - - i686-unknown-linux-gnu - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Install rust stable - uses: dtolnay/rust-toolchain@stable - - - name: Cleanup Docker - continue-on-error: true - run: | - docker kill $(docker ps -q) - - - name: Install cross - # See https://github.com/cross-rs/cross/issues/1222 - run: cargo install cross --git https://github.com/cross-rs/cross - - - name: test - run: cross test --all --target ${{ matrix.target }} -- --test-threads=12 - env: - RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG' }} - - - wasm_build: - name: Build wasm32 - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v4 - - - name: Install stable toolchain - uses: dtolnay/rust-toolchain@stable - - - name: Add wasm target - run: rustup target add wasm32-unknown-unknown - - - name: wasm32 build (iroh-base) - run: cargo build -p iroh-base --all-features --target wasm32-unknown-unknown - - check_semver: - runs-on: ubuntu-latest - env: - RUSTC_WRAPPER: "sccache" - SCCACHE_GHA_ENABLED: "on" - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.4 - - - name: Setup Environment (PR) - if: ${{ github.event_name == 'pull_request' }} - shell: bash - run: | - echo "HEAD_COMMIT_SHA=$(git rev-parse origin/${{ github.base_ref }})" >> ${GITHUB_ENV} - - name: Setup Environment (Push) - if: ${{ github.event_name == 'push' || github.event_name == 'merge_group' }} - shell: bash - run: | - echo "HEAD_COMMIT_SHA=$(git rev-parse origin/main)" >> ${GITHUB_ENV} - - name: Check semver - # uses: obi1kenobi/cargo-semver-checks-action@v2 - uses: n0-computer/cargo-semver-checks-action@feat-baseline - with: - package: iroh, iroh-base, iroh-blobs, iroh-cli, iroh-dns-server, iroh-gossip, iroh-metrics, iroh-net, iroh-net-bench, iroh-docs - baseline-rev: ${{ env.HEAD_COMMIT_SHA }} - use-cache: false - - check_fmt: - timeout-minutes: 30 - name: Checking fmt - runs-on: ubuntu-latest - env: - RUSTC_WRAPPER: "sccache" - SCCACHE_GHA_ENABLED: "on" - steps: - - uses: actions/checkout@v4 - - - uses: dtolnay/rust-toolchain@stable - with: - components: rustfmt - - - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.4 - - - name: fmt - run: cargo fmt --all -- --check - - check_docs: - timeout-minutes: 30 - name: Checking docs - runs-on: ubuntu-latest - env: - RUSTC_WRAPPER: "sccache" - SCCACHE_GHA_ENABLED: "on" - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@master - with: - toolchain: nightly-2024-05-02 - - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.4 - - - name: Docs - run: cargo doc --workspace --all-features --no-deps --document-private-items - env: - RUSTDOCFLAGS: --cfg docsrs - - clippy_check: - timeout-minutes: 30 - runs-on: ubuntu-latest - env: - RUSTC_WRAPPER: "sccache" - SCCACHE_GHA_ENABLED: "on" - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - with: - components: clippy - - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.4 - - # TODO: We have a bunch of platform-dependent code so should - # probably run this job on the full platform matrix - - name: clippy check (all features) - run: cargo clippy --workspace --all-features --all-targets --bins --tests --benches - - - name: clippy check (no features) - run: cargo clippy --workspace --no-default-features --lib --bins --tests - - - name: clippy check (default features) - run: cargo clippy --workspace --all-targets - - msrv: - if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')" - timeout-minutes: 30 - name: Minimal Supported Rust Version - runs-on: ubuntu-latest - env: - RUSTC_WRAPPER: "sccache" - SCCACHE_GHA_ENABLED: "on" - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ env.MSRV }} - - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.4 - - - name: Check MSRV all features - run: | - cargo +$MSRV check --workspace --all-targets - - cargo_deny: - timeout-minutes: 30 - name: cargo deny - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: EmbarkStudios/cargo-deny-action@v1 - with: - arguments: --workspace --all-features - command: check - command-arguments: "-Dwarnings" + # tests: + # name: CI Test Suite + # if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')" + # uses: './.github/workflows/tests.yaml' + + # cross_build: + # name: Cross Build Only + # if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')" + # timeout-minutes: 30 + # runs-on: [self-hosted, linux, X64] + # strategy: + # fail-fast: false + # matrix: + # target: + # # cross tests are currently broken vor armv7 and aarch64 + # # see https://github.com/cross-rs/cross/issues/1311 + # - armv7-linux-androideabi + # - aarch64-linux-android + # # Freebsd execution fails in cross + # # - i686-unknown-freebsd # Linking fails :/ + # - x86_64-unknown-freebsd + # - x86_64-unknown-netbsd + # steps: + # - name: Checkout + # uses: actions/checkout@v4 + # with: + # submodules: recursive + + # - name: Install rust stable + # uses: dtolnay/rust-toolchain@stable + + # - name: Cleanup Docker + # continue-on-error: true + # run: | + # docker kill $(docker ps -q) + + # - name: Install cross + # # See https://github.com/cross-rs/cross/issues/1222 + # run: cargo install cross --git https://github.com/cross-rs/cross + + # - name: build + # # cross tests are currently broken vor armv7 and aarch64 + # # see https://github.com/cross-rs/cross/issues/1311. So on + # # those platforms we only build but do not run tests. + # run: cross build --all --target ${{ matrix.target }} + # env: + # RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG'}} + + # cross_test: + # name: Cross Test + # if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')" + # timeout-minutes: 30 + # runs-on: [self-hosted, linux, X64] + # strategy: + # fail-fast: false + # matrix: + # target: + # - i686-unknown-linux-gnu + # steps: + # - name: Checkout + # uses: actions/checkout@v4 + # with: + # submodules: recursive + + # - name: Install rust stable + # uses: dtolnay/rust-toolchain@stable + + # - name: Cleanup Docker + # continue-on-error: true + # run: | + # docker kill $(docker ps -q) + + # - name: Install cross + # # See https://github.com/cross-rs/cross/issues/1222 + # run: cargo install cross --git https://github.com/cross-rs/cross + + # - name: test + # run: cross test --all --target ${{ matrix.target }} -- --test-threads=12 + # env: + # RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG' }} + + + # wasm_build: + # name: Build wasm32 + # runs-on: ubuntu-latest + # steps: + # - name: Checkout sources + # uses: actions/checkout@v4 + + # - name: Install stable toolchain + # uses: dtolnay/rust-toolchain@stable + + # - name: Add wasm target + # run: rustup target add wasm32-unknown-unknown + + # - name: wasm32 build (iroh-base) + # run: cargo build -p iroh-base --all-features --target wasm32-unknown-unknown + + # check_semver: + # runs-on: ubuntu-latest + # env: + # RUSTC_WRAPPER: "sccache" + # SCCACHE_GHA_ENABLED: "on" + # steps: + # - uses: actions/checkout@v4 + # with: + # fetch-depth: 0 + # - name: Install sccache + # uses: mozilla-actions/sccache-action@v0.0.4 + + # - name: Setup Environment (PR) + # if: ${{ github.event_name == 'pull_request' }} + # shell: bash + # run: | + # echo "HEAD_COMMIT_SHA=$(git rev-parse origin/${{ github.base_ref }})" >> ${GITHUB_ENV} + # - name: Setup Environment (Push) + # if: ${{ github.event_name == 'push' || github.event_name == 'merge_group' }} + # shell: bash + # run: | + # echo "HEAD_COMMIT_SHA=$(git rev-parse origin/main)" >> ${GITHUB_ENV} + # - name: Check semver + # # uses: obi1kenobi/cargo-semver-checks-action@v2 + # uses: n0-computer/cargo-semver-checks-action@feat-baseline + # with: + # package: iroh, iroh-base, iroh-blobs, iroh-cli, iroh-dns-server, iroh-gossip, iroh-metrics, iroh-net, iroh-net-bench, iroh-docs + # baseline-rev: ${{ env.HEAD_COMMIT_SHA }} + # use-cache: false + + # check_fmt: + # timeout-minutes: 30 + # name: Checking fmt + # runs-on: ubuntu-latest + # env: + # RUSTC_WRAPPER: "sccache" + # SCCACHE_GHA_ENABLED: "on" + # steps: + # - uses: actions/checkout@v4 + + # - uses: dtolnay/rust-toolchain@stable + # with: + # components: rustfmt + + # - name: Install sccache + # uses: mozilla-actions/sccache-action@v0.0.4 + + # - name: fmt + # run: cargo fmt --all -- --check + + # check_docs: + # timeout-minutes: 30 + # name: Checking docs + # runs-on: ubuntu-latest + # env: + # RUSTC_WRAPPER: "sccache" + # SCCACHE_GHA_ENABLED: "on" + # steps: + # - uses: actions/checkout@v4 + # - uses: dtolnay/rust-toolchain@master + # with: + # toolchain: nightly-2024-05-02 + # - name: Install sccache + # uses: mozilla-actions/sccache-action@v0.0.4 + + # - name: Docs + # run: cargo doc --workspace --all-features --no-deps --document-private-items + # env: + # RUSTDOCFLAGS: --cfg docsrs + + # clippy_check: + # timeout-minutes: 30 + # runs-on: ubuntu-latest + # env: + # RUSTC_WRAPPER: "sccache" + # SCCACHE_GHA_ENABLED: "on" + # steps: + # - uses: actions/checkout@v4 + # - uses: dtolnay/rust-toolchain@stable + # with: + # components: clippy + # - name: Install sccache + # uses: mozilla-actions/sccache-action@v0.0.4 + + # # TODO: We have a bunch of platform-dependent code so should + # # probably run this job on the full platform matrix + # - name: clippy check (all features) + # run: cargo clippy --workspace --all-features --all-targets --bins --tests --benches + + # - name: clippy check (no features) + # run: cargo clippy --workspace --no-default-features --lib --bins --tests + + # - name: clippy check (default features) + # run: cargo clippy --workspace --all-targets + + # msrv: + # if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')" + # timeout-minutes: 30 + # name: Minimal Supported Rust Version + # runs-on: ubuntu-latest + # env: + # RUSTC_WRAPPER: "sccache" + # SCCACHE_GHA_ENABLED: "on" + # steps: + # - uses: actions/checkout@v4 + # - uses: dtolnay/rust-toolchain@master + # with: + # toolchain: ${{ env.MSRV }} + # - name: Install sccache + # uses: mozilla-actions/sccache-action@v0.0.4 + + # - name: Check MSRV all features + # run: | + # cargo +$MSRV check --workspace --all-targets + + # cargo_deny: + # timeout-minutes: 30 + # name: cargo deny + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - uses: EmbarkStudios/cargo-deny-action@v1 + # with: + # arguments: --workspace --all-features + # command: check + # command-arguments: "-Dwarnings" netsim-integration-tests: if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')" From 8c706f7f3d8b8563d026536a36af43eb69b9c62e Mon Sep 17 00:00:00 2001 From: Ruediger Klaehn Date: Mon, 24 Jun 2024 13:39:30 +0300 Subject: [PATCH 3/3] wip --- iroh/src/client/blobs.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iroh/src/client/blobs.rs b/iroh/src/client/blobs.rs index 7246436ddf..303635622e 100644 --- a/iroh/src/client/blobs.rs +++ b/iroh/src/client/blobs.rs @@ -800,7 +800,7 @@ impl Reader { Some(Err(err)) => return Err(err), None | Some(Ok(_)) => { println!("{}", std::backtrace::Backtrace::capture()); - panic!("Expected header frame"); + panic!("Expected header frame!"); // return Err(anyhow!("Expected header frame")) } };