Skip to content

Commit 010a5d3

Browse files
authored
feat: Turn on health monitor (#14257)
Signed-off-by: Austin Littley <[email protected]>
1 parent efee883 commit 010a5d3

File tree

10 files changed

+26
-26
lines changed

10 files changed

+26
-26
lines changed

hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AccountsConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ public record AccountsConfig(
3636
@ConfigProperty(defaultValue = "2") @NetworkProperty long treasury,
3737
@ConfigProperty(defaultValue = "true") @NetworkProperty boolean storeOnDisk,
3838
@ConfigProperty(defaultValue = "true") @NetworkProperty boolean releaseAliasAfterDeletion,
39-
@ConfigProperty(defaultValue = "40000000") @NetworkProperty long maxNumber,
39+
@ConfigProperty(defaultValue = "20000000") @NetworkProperty long maxNumber,
4040
@ConfigProperty(value = "blocklist.enabled", defaultValue = "false") @NetworkProperty boolean blocklistEnabled,
4141
@ConfigProperty(value = "blocklist.path", defaultValue = "") @NetworkProperty String blocklistResource) {}

hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/TokensConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public record TokensConfig(
3939
@ConfigProperty(value = "nfts.maxBatchSizeBurn", defaultValue = "10") @NetworkProperty int nftsMaxBatchSizeBurn,
4040
@ConfigProperty(value = "nfts.maxBatchSizeWipe", defaultValue = "10") @NetworkProperty int nftsMaxBatchSizeWipe,
4141
@ConfigProperty(value = "nfts.maxBatchSizeMint", defaultValue = "10") @NetworkProperty int nftsMaxBatchSizeMint,
42-
@ConfigProperty(value = "nfts.maxAllowedMints", defaultValue = "40000000") @NetworkProperty
42+
@ConfigProperty(value = "nfts.maxAllowedMints", defaultValue = "20000000") @NetworkProperty
4343
long nftsMaxAllowedMints,
4444
@ConfigProperty(value = "nfts.maxQueryRange", defaultValue = "100") @NetworkProperty long nftsMaxQueryRange,
4545
@ConfigProperty(value = "nfts.useTreasuryWildcards", defaultValue = "true") @NetworkProperty

platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/WiringConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
*/
4242
@ConfigData("platform.wiring")
4343
public record WiringConfig(
44-
@ConfigProperty(defaultValue = "false") boolean healthMonitorEnabled,
45-
@ConfigProperty(defaultValue = "true") boolean hardBackpressureEnabled,
46-
@ConfigProperty(defaultValue = "1.0") double defaultPoolMultiplier,
47-
@ConfigProperty(defaultValue = "0") int defaultPoolConstant,
44+
@ConfigProperty(defaultValue = "true") boolean healthMonitorEnabled,
45+
@ConfigProperty(defaultValue = "false") boolean hardBackpressureEnabled,
46+
@ConfigProperty(defaultValue = "0") double defaultPoolMultiplier,
47+
@ConfigProperty(defaultValue = "8") int defaultPoolConstant,
4848
@ConfigProperty(defaultValue = "500") int healthMonitorSchedulerCapacity,
4949
@ConfigProperty(defaultValue = "100ms") Duration healthMonitorHeartbeatPeriod,
50-
@ConfigProperty(defaultValue = "5s") Duration healthLogThreshold,
50+
@ConfigProperty(defaultValue = "1s") Duration healthLogThreshold,
5151
@ConfigProperty(defaultValue = "10m") Duration healthLogPeriod) {}

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/consensus/ConsensusConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@
3636
@ConfigData("consensus")
3737
public record ConsensusConfig(
3838
@ConfigProperty(defaultValue = "26") int roundsNonAncient,
39-
@ConfigProperty(defaultValue = "1500") int roundsExpired,
39+
@ConfigProperty(defaultValue = "500") int roundsExpired,
4040
@ConfigProperty(defaultValue = "12") int coinFreq) {}

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/creation/EventCreationConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ public record EventCreationConfig(
5454
@ConfigProperty(defaultValue = "10") double antiSelfishnessFactor,
5555
@ConfigProperty(defaultValue = "10") int tipsetSnapshotHistorySize,
5656
@ConfigProperty(defaultValue = "1024") int eventIntakeThrottle,
57-
@ConfigProperty(defaultValue = "true") boolean useLegacyBackpressure,
58-
@ConfigProperty(defaultValue = "5s") Duration maximumPermissibleUnhealthyDuration) {}
57+
@ConfigProperty(defaultValue = "false") boolean useLegacyBackpressure,
58+
@ConfigProperty(defaultValue = "1s") Duration maximumPermissibleUnhealthyDuration) {}

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/PcesConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,4 @@ public record PcesConfig(
105105
@ConfigProperty(defaultValue = "false") boolean forceIgnorePcesSignatures,
106106
@ConfigProperty(defaultValue = "1m") Duration roundDurabilityBufferHeartbeatPeriod,
107107
@ConfigProperty(defaultValue = "1m") Duration suspiciousRoundDurabilityDuration,
108-
@ConfigProperty(defaultValue = "5s") Duration replayHealthThreshold) {}
108+
@ConfigProperty(defaultValue = "1ms") Duration replayHealthThreshold) {}

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/eventhandling/EventConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public record EventConfig(
4444
@ConfigProperty(defaultValue = "/opt/hgcapp/eventsStreams") String eventsLogDir,
4545
@ConfigProperty(defaultValue = "true") boolean enableEventStreaming,
4646
@ConfigProperty(defaultValue = "false") boolean useBirthRoundAncientThreshold,
47-
@ConfigProperty(defaultValue = "true") boolean useOldStyleIntakeQueue) {
47+
@ConfigProperty(defaultValue = "false") boolean useOldStyleIntakeQueue) {
4848

4949
/**
5050
* @return the {@link AncientMode} based on useBirthRoundAncientThreshold

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/gossip/sync/config/SyncConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@
5555
public record SyncConfig(
5656
@ConfigProperty(defaultValue = "25") int syncSleepAfterFailedNegotiation,
5757
@ConfigProperty(defaultValue = "17") int syncProtocolPermitCount,
58-
@ConfigProperty(defaultValue = "false") boolean onePermitPerPeer,
58+
@ConfigProperty(defaultValue = "true") boolean onePermitPerPeer,
5959
@ConfigProperty(defaultValue = "1000") int syncProtocolHeartbeatPeriod,
6060
@ConfigProperty(defaultValue = "true") boolean waitForEventsInIntake,
6161
@ConfigProperty(defaultValue = "true") boolean filterLikelyDuplicates,
6262
@ConfigProperty(defaultValue = "3s") Duration nonAncestorFilterThreshold,
6363
@ConfigProperty(defaultValue = "500ms") Duration syncKeepalivePeriod,
6464
@ConfigProperty(defaultValue = "1m") Duration maxSyncTime,
65-
@ConfigProperty(defaultValue = "0") int maxSyncEventCount,
66-
@ConfigProperty(defaultValue = "5s") Duration unhealthyGracePeriod,
65+
@ConfigProperty(defaultValue = "5000") int maxSyncEventCount,
66+
@ConfigProperty(defaultValue = "1s") Duration unhealthyGracePeriod,
6767
@ConfigProperty(defaultValue = "5") double permitsRevokedPerSecond,
6868
@ConfigProperty(defaultValue = "0.1") double permitsReturnedPerSecond,
6969
@ConfigProperty(defaultValue = "1") int minimumHealthyUnrevokedPermitCount) {}

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/PlatformSchedulersConfig.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,19 @@
6565
@ConfigData("platformSchedulers")
6666
public record PlatformSchedulersConfig(
6767
@ConfigProperty(defaultValue = "500") int eventHasherUnhandledCapacity,
68-
@ConfigProperty(defaultValue = "SEQUENTIAL CAPACITY(500) FLUSHABLE UNHANDLED_TASK_METRIC")
68+
@ConfigProperty(defaultValue = "CONCURRENT CAPACITY(500) FLUSHABLE UNHANDLED_TASK_METRIC")
6969
TaskSchedulerConfiguration internalEventValidator,
70-
@ConfigProperty(defaultValue = "SEQUENTIAL CAPACITY(500) FLUSHABLE UNHANDLED_TASK_METRIC")
70+
@ConfigProperty(defaultValue = "SEQUENTIAL CAPACITY(5000) FLUSHABLE UNHANDLED_TASK_METRIC")
7171
TaskSchedulerConfiguration eventDeduplicator,
72-
@ConfigProperty(defaultValue = "SEQUENTIAL CAPACITY(500) FLUSHABLE UNHANDLED_TASK_METRIC")
72+
@ConfigProperty(defaultValue = "CONCURRENT CAPACITY(500) FLUSHABLE UNHANDLED_TASK_METRIC")
7373
TaskSchedulerConfiguration eventSignatureValidator,
7474
@ConfigProperty(defaultValue = "SEQUENTIAL CAPACITY(500) FLUSHABLE UNHANDLED_TASK_METRIC")
7575
TaskSchedulerConfiguration orphanBuffer,
7676
@ConfigProperty(
7777
defaultValue =
7878
"SEQUENTIAL_THREAD CAPACITY(500) FLUSHABLE SQUELCHABLE UNHANDLED_TASK_METRIC BUSY_FRACTION_METRIC")
7979
TaskSchedulerConfiguration consensusEngine,
80-
@ConfigProperty(defaultValue = "SEQUENTIAL CAPACITY(5000) FLUSHABLE SQUELCHABLE UNHANDLED_TASK_METRIC")
80+
@ConfigProperty(defaultValue = "SEQUENTIAL CAPACITY(500) FLUSHABLE SQUELCHABLE UNHANDLED_TASK_METRIC")
8181
TaskSchedulerConfiguration eventCreationManager,
8282
@ConfigProperty(defaultValue = "DIRECT") TaskSchedulerConfiguration selfEventSigner,
8383
@ConfigProperty(defaultValue = "SEQUENTIAL_THREAD CAPACITY(20) UNHANDLED_TASK_METRIC")
@@ -93,7 +93,7 @@ public record PlatformSchedulersConfig(
9393
TaskSchedulerConfiguration stateSignatureCollector,
9494
@ConfigProperty(
9595
defaultValue =
96-
"SEQUENTIAL_THREAD CAPACITY(5) FLUSHABLE SQUELCHABLE UNHANDLED_TASK_METRIC BUSY_FRACTION_METRIC")
96+
"SEQUENTIAL_THREAD CAPACITY(30) FLUSHABLE SQUELCHABLE UNHANDLED_TASK_METRIC BUSY_FRACTION_METRIC")
9797
TaskSchedulerConfiguration transactionHandler,
9898
@ConfigProperty(defaultValue = "SEQUENTIAL CAPACITY(500) UNHANDLED_TASK_METRIC")
9999
TaskSchedulerConfiguration issDetector,
@@ -126,12 +126,12 @@ public record PlatformSchedulersConfig(
126126
@ConfigProperty(defaultValue = "DIRECT_THREADSAFE") TaskSchedulerConfiguration transactionPool,
127127
@ConfigProperty(defaultValue = "SEQUENTIAL CAPACITY(500) FLUSHABLE UNHANDLED_TASK_METRIC")
128128
TaskSchedulerConfiguration gossip,
129-
@ConfigProperty(defaultValue = "CONCURRENT CAPACITY(-1) UNHANDLED_TASK_METRIC")
129+
@ConfigProperty(defaultValue = "CONCURRENT CAPACITY(5000) UNHANDLED_TASK_METRIC")
130130
TaskSchedulerConfiguration eventHasher,
131131
@ConfigProperty(defaultValue = "SEQUENTIAL CAPACITY(-1) UNHANDLED_TASK_METRIC")
132132
TaskSchedulerConfiguration postHashCollector,
133133
@ConfigProperty(defaultValue = "SEQUENTIAL CAPACITY(500) FLUSHABLE UNHANDLED_TASK_METRIC")
134134
TaskSchedulerConfiguration branchDetector,
135135
@ConfigProperty(defaultValue = "SEQUENTIAL CAPACITY(500) FLUSHABLE UNHANDLED_TASK_METRIC")
136136
TaskSchedulerConfiguration branchReporter,
137-
@ConfigProperty(defaultValue = "true") boolean hashCollectorEnabled) {}
137+
@ConfigProperty(defaultValue = "false") boolean hashCollectorEnabled) {}

platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/test/java/com/swirlds/platform/test/event/tipset/EventCreationManagerTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ void statusPreventsCreation() {
116116
assertSame(eventsToCreate.get(1), e1);
117117
}
118118

119+
/**
120+
* This form of backpressure is not currently enabled.
121+
*/
122+
@Disabled
119123
@Test
120124
void backpressurePreventsCreation() {
121125
final UnsignedEvent e0 = manager.maybeCreateEvent();
@@ -159,10 +163,6 @@ void ratePreventsCreation() {
159163
assertSame(eventsToCreate.get(1), e1);
160164
}
161165

162-
/**
163-
* This form of backpressure is not currently enabled.
164-
*/
165-
@Disabled
166166
@Test
167167
void unhealthyNodePreventsCreation() {
168168
final UnsignedEvent e0 = manager.maybeCreateEvent();

0 commit comments

Comments
 (0)