From ed3dc7eb7b2237ea3215c816cfd6c687a7219a37 Mon Sep 17 00:00:00 2001 From: Shreyan Gupta Date: Fri, 17 Nov 2023 22:48:59 +0530 Subject: [PATCH] [resharding] Revert call to clear_resharding_data (#10207) Reverting the GC code for resharding till we figure out what's wrong... Context: https://near.zulipchat.com/#narrow/stream/295558-pagoda.2Fcore/topic/Master.20binary.20Can't.20clear.20old.20data/near/402240517 --- chain/chain/src/chain.rs | 11 ++++++----- integration-tests/src/tests/client/resharding.rs | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/chain/chain/src/chain.rs b/chain/chain/src/chain.rs index e0b364a2142..a4216689100 100644 --- a/chain/chain/src/chain.rs +++ b/chain/chain/src/chain.rs @@ -1003,11 +1003,12 @@ impl Chain { *block_hash, GCMode::Canonical(tries.clone()), )?; - chain_store_update.clear_resharding_data( - self.runtime_adapter.as_ref(), - self.epoch_manager.as_ref(), - *block_hash, - )?; + // TODO(resharding): Call clear_resharding_data once we figure out what's wrong + // chain_store_update.clear_resharding_data( + // self.runtime_adapter.as_ref(), + // self.epoch_manager.as_ref(), + // *block_hash, + // )?; gc_blocks_remaining -= 1; } else { return Err(Error::GCError( diff --git a/integration-tests/src/tests/client/resharding.rs b/integration-tests/src/tests/client/resharding.rs index 97cc92d2404..e8433ca398b 100644 --- a/integration-tests/src/tests/client/resharding.rs +++ b/integration-tests/src/tests/client/resharding.rs @@ -1059,11 +1059,13 @@ fn test_shard_layout_upgrade_gc_impl(resharding_type: ReshardingType, rng_seed: } #[test] +#[ignore] fn test_shard_layout_upgrade_gc() { test_shard_layout_upgrade_gc_impl(ReshardingType::V1, 44); } #[test] +#[ignore] fn test_shard_layout_upgrade_gc_v2() { // TODO(resharding) remove those checks once rolled out if checked_feature!("stable", SimpleNightshadeV2, PROTOCOL_VERSION) {