Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix node shutdown and cleanup Docker #485

Merged
merged 4 commits into from
Nov 2, 2023
Merged

Fix node shutdown and cleanup Docker #485

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf40c20
Generate a snapshot with current timestamp.
piotrm50 Nov 2, 2023
763e768
Fix node shutdown.
piotrm50 Nov 2, 2023
f56c9d1
Cleanup run.sh script
piotrm50 Nov 2, 2023
d9c93ab
Fix run.sh after review.
piotrm50 Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/metrics/collector/metric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ func (m *Metric) schedulePruning(labelValues []string) {

func (m *Metric) shutdown() {
if m.pruningExecutor != nil {
m.pruningExecutor.Shutdown()
m.pruningExecutor.Shutdown(timed.CancelPendingElements)
}
}

Expand Down
7 changes: 3 additions & 4 deletions tools/docker-network/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
#!/bin/bash
set -e


# Create a function to join an array of strings by a given character
function join { local IFS="$1"; shift; echo "$*"; }

# All parameters can be optional now, just make sure we don't have too many
if [[ $# -gt 4 ]] ; then
piotrm50 marked this conversation as resolved.
Show resolved Hide resolved
echo 'Call with ./run [replicas=1|2|3|...] [monitoring=0|1] [feature=0|1]'
echo 'Call with ./run [monitoring=0|1]'
exit 0
fi

REPLICAS=${1:-1}
MONITORING=${2:-0}
MONITORING=${1:-0}

export DOCKER_BUILDKIT=1
export COMPOSE_DOCKER_CLI_BUILD=1
Expand Down
2 changes: 1 addition & 1 deletion tools/genesis-snapshot/presets/presets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ var Feature = []options.Option[snapshotcreator.Options]{
iotago.NewV3ProtocolParameters(
iotago.WithNetworkOptions("feature", "rms"),
iotago.WithSupplyOptions(4_600_000_000_000_000, 100, 1, 10, 100, 100, 100),
iotago.WithTimeProviderOptions(1697631694, 10, 13),
iotago.WithTimeProviderOptions(time.Now().Unix(), 10, 13),
iotago.WithLivenessOptions(30, 30, 10, 20, 30),
// increase/decrease threshold = fraction * slotDurationInSeconds * schedulerRate
iotago.WithCongestionControlOptions(500, 500, 500, 800000, 500000, 100000, 1000, 100),
Expand Down
Loading