[cp 1.24] fix deadlock on nested DropHelper

[msmouse]

cherry-pick https://github.com/aptos-labs/aptos-core/pull/15322 to v1.24 release branch

[trunk-io[bot]]

⏱️ 1h 39m total CI duration on this PR

| Slowest 15 Jobs | Cumulative Duration | Recent Runs | |---|---|---| | [rust-unit-tests](https://github.com/aptos-labs/aptos-core/actions/runs/11925366912/job/33237331470) | 23m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11925366912/job/33237331470)  | | [rust-unit-tests](https://github.com/aptos-labs/aptos-core/actions/runs/11924424374/job/33234734754) | 22m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11924424374/job/33234734754)  | | [rust-move-tests](https://github.com/aptos-labs/aptos-core/actions/runs/11925366901/job/33237330813) | 10m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11925366901/job/33237330813)  | | [rust-move-tests](https://github.com/aptos-labs/aptos-core/actions/runs/11924424365/job/33234734163) | 9m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11924424365/job/33234734163)  | | [execution-performance / single-node-performance](https://github.com/aptos-labs/aptos-core/actions/runs/11925366936/job/33237473591) | 7m | [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/11925366936/job/33237473591)  | | [execution-performance / test-target-determinator](https://github.com/aptos-labs/aptos-core/actions/runs/11925366936/job/33237330670) | 5m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11925366936/job/33237330670)  | | [test-target-determinator](https://github.com/aptos-labs/aptos-core/actions/runs/11925367012/job/33237335735) | 5m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11925367012/job/33237335735)  | | [rust-doc-tests](https://github.com/aptos-labs/aptos-core/actions/runs/11925366912/job/33237331327) | 5m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11925366912/job/33237331327)  | | [rust-cargo-deny](https://github.com/aptos-labs/aptos-core/actions/runs/11925366912/job/33237337058) | 4m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11924424374/job/33234741460) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11925366912/job/33237337058)  | | [check](https://github.com/aptos-labs/aptos-core/actions/runs/11925366919/job/33237330613) | 3m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11925366919/job/33237330613)  | | [check-dynamic-deps](https://github.com/aptos-labs/aptos-core/actions/runs/11925366917/job/33237330310) | 2m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11924424368/job/33234733441) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11925366917/job/33237330310)  | | [fetch-last-released-docker-image-tag](https://github.com/aptos-labs/aptos-core/actions/runs/11925367012/job/33237335896) | 2m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11925367012/job/33237335896)  | | [general-lints](https://github.com/aptos-labs/aptos-core/actions/runs/11925366912/job/33237337485) | 56s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11924424374/job/33234741300) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11925366912/job/33237337485)  | | [semgrep/ci](https://github.com/aptos-labs/aptos-core/actions/runs/11925366924/job/33237330246) | 46s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11924424381/job/33234733505) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11925366924/job/33237330246)  | | [file_change_determinator](https://github.com/aptos-labs/aptos-core/actions/runs/11925366912/job/33237330856) | 18s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11924424374/job/33234734224) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/11925366912/job/33237330856)  |

_{settings ⋅ feedback ⋅ docs ⋅ learn more about trunk.io}

[github-actions[bot]]

Forge is running suite realistic_env_max_load on ac41f1f4edac66d16fcc4445a1a876c6fd6543c3

• Grafana dashboard (auto-refresh)
• Humio Logs
• Axiom Logs
• Validator CPU Profile
• Fullnode CPU Profile
• Test runner output
• Test run is land-blocking

[github-actions[bot]]

Forge is running suite framework_upgrade on a0ec6ba11bfe4cfc5b586edc9e227aba4909e8fe ==> ac41f1f4edac66d16fcc4445a1a876c6fd6543c3

• Grafana dashboard (auto-refresh)
• Humio Logs
• Axiom Logs
• Validator CPU Profile
• Fullnode CPU Profile
• Test runner output
• Test run is land-blocking

[github-actions[bot]]

Forge is running suite compat on a0ec6ba11bfe4cfc5b586edc9e227aba4909e8fe ==> ac41f1f4edac66d16fcc4445a1a876c6fd6543c3

• Grafana dashboard (auto-refresh)
• Humio Logs
• Axiom Logs
• Validator CPU Profile
• Fullnode CPU Profile
• Test runner output
• Test run is land-blocking

[github-actions[bot]]

:white_check_mark: Forge suite realistic_env_max_load success on ac41f1f4edac66d16fcc4445a1a876c6fd6543c3

two traffics test: inner traffic : committed: 14623.01 txn/s, latency: 2718.87 ms, (p50: 2700 ms, p70: 2700, p90: 2700 ms, p99: 3000 ms), latency samples: 5560060
two traffics test : committed: 99.92 txn/s, latency: 1551.07 ms, (p50: 1400 ms, p70: 1400, p90: 1500 ms, p99: 9500 ms), latency samples: 1780
Latency breakdown for phase 0: ["MempoolToBlockCreation: max: 1.968, avg: 1.516", "ConsensusProposalToOrdered: max: 0.308, avg: 0.290", "ConsensusOrderedToCommit: max: 0.379, avg: 0.367", "ConsensusProposalToCommit: max: 0.670, avg: 0.658"]
Max non-epoch-change gap was: 0 rounds at version 0 (avg 0.00) [limit 4], 0.94s no progress at version 2574394 (avg 0.20s) [limit 15].
Max epoch-change gap was: 0 rounds at version 0 (avg 0.00) [limit 4], 8.64s no progress at version 2574392 (avg 8.64s) [limit 15].
Test Ok

• Grafana dashboard
• Humio Logs
• Axiom Logs
• Validator CPU Profile
• Fullnode CPU Profile
• Test runner output
• Test run is land-blocking

[github-actions[bot]]

:white_check_mark: Forge suite framework_upgrade success on a0ec6ba11bfe4cfc5b586edc9e227aba4909e8fe ==> ac41f1f4edac66d16fcc4445a1a876c6fd6543c3

Compatibility test results for a0ec6ba11bfe4cfc5b586edc9e227aba4909e8fe ==> ac41f1f4edac66d16fcc4445a1a876c6fd6543c3 (PR)
Upgrade the nodes to version: ac41f1f4edac66d16fcc4445a1a876c6fd6543c3
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1418.77 txn/s, submitted: 1421.04 txn/s, failed submission: 2.27 txn/s, expired: 2.27 txn/s, latency: 2189.26 ms, (p50: 2100 ms, p70: 2200, p90: 3500 ms, p99: 5100 ms), latency samples: 124860
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1418.20 txn/s, submitted: 1421.83 txn/s, failed submission: 3.63 txn/s, expired: 3.63 txn/s, latency: 2149.60 ms, (p50: 2100 ms, p70: 2200, p90: 3300 ms, p99: 4800 ms), latency samples: 124920
5. check swarm health
Compatibility test for a0ec6ba11bfe4cfc5b586edc9e227aba4909e8fe ==> ac41f1f4edac66d16fcc4445a1a876c6fd6543c3 passed
Upgrade the remaining nodes to version: ac41f1f4edac66d16fcc4445a1a876c6fd6543c3
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1352.16 txn/s, submitted: 1355.67 txn/s, failed submission: 3.51 txn/s, expired: 3.51 txn/s, latency: 2201.72 ms, (p50: 2100 ms, p70: 2400, p90: 3300 ms, p99: 4800 ms), latency samples: 123220
Test Ok

• Grafana dashboard
• Humio Logs
• Axiom Logs
• Validator CPU Profile
• Fullnode CPU Profile
• Test runner output
• Test run is land-blocking

[github-actions[bot]]

:white_check_mark: Forge suite compat success on a0ec6ba11bfe4cfc5b586edc9e227aba4909e8fe ==> ac41f1f4edac66d16fcc4445a1a876c6fd6543c3

Compatibility test results for a0ec6ba11bfe4cfc5b586edc9e227aba4909e8fe ==> ac41f1f4edac66d16fcc4445a1a876c6fd6543c3 (PR)
1. Check liveness of validators at old version: a0ec6ba11bfe4cfc5b586edc9e227aba4909e8fe
compatibility::simple-validator-upgrade::liveness-check : committed: 16720.98 txn/s, latency: 2026.58 ms, (p50: 1900 ms, p70: 2100, p90: 2300 ms, p99: 4200 ms), latency samples: 537200
2. Upgrading first Validator to new version: ac41f1f4edac66d16fcc4445a1a876c6fd6543c3
compatibility::simple-validator-upgrade::single-validator-upgrading : committed: 7635.29 txn/s, latency: 3693.49 ms, (p50: 4000 ms, p70: 4200, p90: 4500 ms, p99: 4600 ms), latency samples: 143220
compatibility::simple-validator-upgrade::single-validator-upgrade : committed: 7627.99 txn/s, latency: 4247.22 ms, (p50: 4500 ms, p70: 4700, p90: 5800 ms, p99: 6100 ms), latency samples: 254180
3. Upgrading rest of first batch to new version: ac41f1f4edac66d16fcc4445a1a876c6fd6543c3
compatibility::simple-validator-upgrade::half-validator-upgrading : committed: 8065.04 txn/s, latency: 3570.52 ms, (p50: 4000 ms, p70: 4100, p90: 4300 ms, p99: 4300 ms), latency samples: 148920
compatibility::simple-validator-upgrade::half-validator-upgrade : committed: 7209.25 txn/s, latency: 4100.82 ms, (p50: 4300 ms, p70: 4300, p90: 4400 ms, p99: 6100 ms), latency samples: 273500
4. upgrading second batch to new version: ac41f1f4edac66d16fcc4445a1a876c6fd6543c3
compatibility::simple-validator-upgrade::rest-validator-upgrading : committed: 10666.80 txn/s, latency: 2542.21 ms, (p50: 2500 ms, p70: 2800, p90: 4000 ms, p99: 4200 ms), latency samples: 185340
compatibility::simple-validator-upgrade::rest-validator-upgrade : committed: 11083.30 txn/s, latency: 2820.24 ms, (p50: 2600 ms, p70: 2800, p90: 5300 ms, p99: 6500 ms), latency samples: 359040
5. check swarm health
Compatibility test for a0ec6ba11bfe4cfc5b586edc9e227aba4909e8fe ==> ac41f1f4edac66d16fcc4445a1a876c6fd6543c3 passed
Test Ok

• Grafana dashboard
• Humio Logs
• Axiom Logs
• Validator CPU Profile
• Fullnode CPU Profile
• Test runner output
• Test run is land-blocking