Skip to content

Commit 56ce7d5

Browse files
authored
Merge pull request #5190 from stacks-network/test/prlimit
Test prlimit
2 parents dd3f094 + b602455 commit 56ce7d5

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

.github/workflows/bitcoin-tests.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@ jobs:
140140
with:
141141
btc-version: "25.0"
142142

143+
## Increase open file descriptors limit
144+
- name: Increase Open File Descriptors
145+
run: |
146+
sudo prlimit --nofile=4096:4096
147+
143148
## Run test matrix using restored cache of archive file
144149
## - Test will timeout after env.TEST_TIMEOUT minutes
145150
- name: Run Tests

stacks-signer/src/chainstate.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,18 @@ impl SortitionsView {
194194
.cur_sortition
195195
.is_timed_out(self.config.block_proposal_timeout, signer_db)?
196196
{
197+
info!(
198+
"Current miner timed out, marking as invalid.";
199+
"current_sortition_consensus_hash" => ?self.cur_sortition.consensus_hash,
200+
);
197201
self.cur_sortition.miner_status = SortitionMinerStatus::InvalidatedBeforeFirstBlock;
198202
}
199203
if let Some(last_sortition) = self.last_sortition.as_mut() {
200204
if last_sortition.is_timed_out(self.config.block_proposal_timeout, signer_db)? {
205+
info!(
206+
"Last miner timed out, marking as invalid.";
207+
"last_sortition_consensus_hash" => ?last_sortition.consensus_hash,
208+
);
201209
last_sortition.miner_status = SortitionMinerStatus::InvalidatedBeforeFirstBlock;
202210
}
203211
}

stacks-signer/src/v0/signer.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,7 @@ impl Signer {
400400
"{self}: received a block proposal for a new block. Submit block for validation. ";
401401
"signer_sighash" => %signer_signature_hash,
402402
"block_id" => %block_proposal.block.block_id(),
403+
"burn_height" => block_proposal.burn_height,
403404
);
404405
crate::monitoring::increment_block_proposals_received();
405406
let mut block_info = BlockInfo::from(block_proposal.clone());

testnet/stacks-node/src/config.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,7 +1460,7 @@ impl BurnchainConfig {
14601460
rpc_ssl: false,
14611461
username: None,
14621462
password: None,
1463-
timeout: 300,
1463+
timeout: 60,
14641464
magic_bytes: BLOCKSTACK_MAGIC_MAINNET.clone(),
14651465
local_mining_public_key: None,
14661466
process_exit_at_block_height: None,
@@ -2376,7 +2376,7 @@ impl Default for MinerConfig {
23762376
first_attempt_time_ms: 10,
23772377
subsequent_attempt_time_ms: 120_000,
23782378
microblock_attempt_time_ms: 30_000,
2379-
nakamoto_attempt_time_ms: 20_000,
2379+
nakamoto_attempt_time_ms: 5_000,
23802380
probability_pick_no_estimate_tx: 25,
23812381
block_reward_recipient: None,
23822382
segwit: false,

0 commit comments

Comments
 (0)